Grsec/PaX: 2.2.2-2.6.32.48-201111161802 + 2.2.2-3.1.1-20111117003720111117

15 files changed, 7002 insertions, 19619 deletions

diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index b6de0e5..09a7a03 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.48-201111152003.patch
+Patch:	4420_grsecurity-2.2.2-2.6.32.48-201111161802.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.48-201111152003.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.48-201111161802.patch
index 7ed3623..8c18994 100644
--- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.48-201111152003.patch
+++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.48-201111161802.patch
@@ -47259,7 +47259,7 @@ diff -urNp linux-2.6.32.48/fs/mbcache.c linux-2.6.32.48/fs/mbcache.c
  #ifdef MB_CACHE_INDEXES_COUNT
 diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
 --- linux-2.6.32.48/fs/namei.c	2011-11-08 19:02:43.000000000 -0500
-+++ linux-2.6.32.48/fs/namei.c	2011-11-15 19:59:43.000000000 -0500
++++ linux-2.6.32.48/fs/namei.c	2011-11-16 17:53:55.000000000 -0500
 @@ -224,14 +224,6 @@ int generic_permission(struct inode *ino
  		return ret;
  
@@ -47536,16 +47536,14 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2250,6 +2359,19 @@ static long do_rmdir(int dfd, const char
+@@ -2250,6 +2359,17 @@ static long do_rmdir(int dfd, const char
  	error = PTR_ERR(dentry);
  	if (IS_ERR(dentry))
  		goto exit2;
 +
 +	if (dentry->d_inode != NULL) {
-+		if (dentry->d_inode->i_nlink <= 1) {
-+			saved_ino = dentry->d_inode->i_ino;
-+			saved_dev = gr_get_dev_from_dentry(dentry);
-+		}
++		saved_ino = dentry->d_inode->i_ino;
++		saved_dev = gr_get_dev_from_dentry(dentry);
 +
 +		if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
 +			error = -EACCES;
@@ -47556,7 +47554,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto exit3;
-@@ -2257,6 +2379,8 @@ static long do_rmdir(int dfd, const char
+@@ -2257,6 +2377,8 @@ static long do_rmdir(int dfd, const char
  	if (error)
  		goto exit4;
  	error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -47565,7 +47563,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  exit4:
  	mnt_drop_write(nd.path.mnt);
  exit3:
-@@ -2318,6 +2442,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2318,6 +2440,8 @@ static long do_unlinkat(int dfd, const c
  	struct dentry *dentry;
  	struct nameidata nd;
  	struct inode *inode = NULL;
@@ -47574,7 +47572,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2337,8 +2463,19 @@ static long do_unlinkat(int dfd, const c
+@@ -2337,8 +2461,19 @@ static long do_unlinkat(int dfd, const c
  		if (nd.last.name[nd.last.len])
  			goto slashes;
  		inode = dentry->d_inode;
@@ -47595,7 +47593,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  		error = mnt_want_write(nd.path.mnt);
  		if (error)
  			goto exit2;
-@@ -2346,6 +2483,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2346,6 +2481,8 @@ static long do_unlinkat(int dfd, const c
  		if (error)
  			goto exit3;
  		error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -47604,7 +47602,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  exit3:
  		mnt_drop_write(nd.path.mnt);
  	exit2:
-@@ -2424,6 +2563,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2424,6 +2561,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
  	if (IS_ERR(dentry))
  		goto out_unlock;
  
@@ -47616,7 +47614,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2431,6 +2575,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2431,6 +2573,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
  	if (error)
  		goto out_drop_write;
  	error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
@@ -47625,7 +47623,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -2524,6 +2670,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2524,6 +2668,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
  	error = PTR_ERR(new_dentry);
  	if (IS_ERR(new_dentry))
  		goto out_unlock;
@@ -47646,7 +47644,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2531,6 +2691,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2531,6 +2689,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);
@@ -47655,7 +47653,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -2708,6 +2870,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2708,6 +2868,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  	char *to;
  	int error;
  
@@ -47664,7 +47662,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  	error = user_path_parent(olddfd, oldname, &oldnd, &from);
  	if (error)
  		goto exit;
-@@ -2764,6 +2928,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2764,6 +2926,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  	if (new_dentry == trap)
  		goto exit5;
  
@@ -47677,7 +47675,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  	error = mnt_want_write(oldnd.path.mnt);
  	if (error)
  		goto exit5;
-@@ -2773,6 +2943,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2773,6 +2941,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  		goto exit6;
  	error = vfs_rename(old_dir->d_inode, old_dentry,
  				   new_dir->d_inode, new_dentry);
@@ -47687,7 +47685,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  exit6:
  	mnt_drop_write(oldnd.path.mnt);
  exit5:
-@@ -2798,6 +2971,8 @@ SYSCALL_DEFINE2(rename, const char __use
+@@ -2798,6 +2969,8 @@ SYSCALL_DEFINE2(rename, const char __use
  
  int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
  {
@@ -47696,7 +47694,7 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
  	int len;
  
  	len = PTR_ERR(link);
-@@ -2807,7 +2982,14 @@ int vfs_readlink(struct dentry *dentry, 
+@@ -2807,7 +2980,14 @@ int vfs_readlink(struct dentry *dentry, 
  	len = strlen(link);
  	if (len > (unsigned) buflen)
  		len = buflen;
@@ -50637,8 +50635,8 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl_alloc.c linux-2.6.32.48/grsecurity/g
 +}
 diff -urNp linux-2.6.32.48/grsecurity/gracl.c linux-2.6.32.48/grsecurity/gracl.c
 --- linux-2.6.32.48/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/gracl.c	2011-11-15 19:59:43.000000000 -0500
-@@ -0,0 +1,4140 @@
++++ linux-2.6.32.48/grsecurity/gracl.c	2011-11-16 17:55:28.000000000 -0500
+@@ -0,0 +1,4141 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -53460,6 +53458,7 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl.c linux-2.6.32.48/grsecurity/gracl.c
 +{
 +	struct name_entry *matchn;
 +	struct inodev_entry *inodev;
++	struct inode *inode = new_dentry->d_inode;
 +	ino_t oldinode = old_dentry->d_inode->i_ino;
 +	dev_t olddev = __get_dev(old_dentry);
 +
@@ -53482,16 +53481,16 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl.c linux-2.6.32.48/grsecurity/gracl.c
 +	 */
 +
 +	write_lock(&gr_inode_lock);
-+	if (unlikely(replace && new_dentry->d_inode)) {
-+		ino_t newinode = new_dentry->d_inode->i_ino;
++	if (unlikely(replace && inode)) {
++		ino_t newinode = inode->i_ino;
 +		dev_t newdev = __get_dev(new_dentry);
 +		inodev = lookup_inodev_entry(newinode, newdev);
-+		if (inodev != NULL && (new_dentry->d_inode->i_nlink <= 1))
++		if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
 +			do_handle_delete(inodev, newinode, newdev);
 +	}
 +
 +	inodev = lookup_inodev_entry(oldinode, olddev);
-+	if (inodev != NULL && (old_dentry->d_inode->i_nlink <= 1))
++	if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
 +		do_handle_delete(inodev, oldinode, olddev);
 +
 +	if (unlikely((unsigned long)matchn))
diff --git a/3.0.9/1007_linux-3.0.8.patch b/3.0.9/1007_linux-3.0.8.patch
deleted file mode 100644
index 62a4bb6..0000000
--- a/3.0.9/1007_linux-3.0.8.patch
+++ /dev/null
@@ -1,1472 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 11c4249..9f6e3cd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- VERSION = 3
- PATCHLEVEL = 0
--SUBLEVEL = 7
-+SUBLEVEL = 8
- EXTRAVERSION =
- NAME = Sneaky Weasel
- 
-diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c
-index 4960686..4372763 100644
---- a/arch/arm/kernel/perf_event_v7.c
-+++ b/arch/arm/kernel/perf_event_v7.c
-@@ -264,8 +264,8 @@ static const unsigned armv7_a9_perf_map[PERF_COUNT_HW_MAX] = {
- 	[PERF_COUNT_HW_CPU_CYCLES]	    = ARMV7_PERFCTR_CPU_CYCLES,
- 	[PERF_COUNT_HW_INSTRUCTIONS]	    =
- 					ARMV7_PERFCTR_INST_OUT_OF_RENAME_STAGE,
--	[PERF_COUNT_HW_CACHE_REFERENCES]    = ARMV7_PERFCTR_COHERENT_LINE_HIT,
--	[PERF_COUNT_HW_CACHE_MISSES]	    = ARMV7_PERFCTR_COHERENT_LINE_MISS,
-+	[PERF_COUNT_HW_CACHE_REFERENCES]    = ARMV7_PERFCTR_DCACHE_ACCESS,
-+	[PERF_COUNT_HW_CACHE_MISSES]	    = ARMV7_PERFCTR_DCACHE_REFILL,
- 	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV7_PERFCTR_PC_WRITE,
- 	[PERF_COUNT_HW_BRANCH_MISSES]	    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
- 	[PERF_COUNT_HW_BUS_CYCLES]	    = ARMV7_PERFCTR_CLOCK_CYCLES,
-diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
-index c19571c..4a4eba5 100644
---- a/arch/arm/mm/init.c
-+++ b/arch/arm/mm/init.c
-@@ -473,6 +473,13 @@ static void __init free_unused_memmap(struct meminfo *mi)
- 		 */
- 		bank_start = min(bank_start,
- 				 ALIGN(prev_bank_end, PAGES_PER_SECTION));
-+#else
-+		/*
-+		 * Align down here since the VM subsystem insists that the
-+		 * memmap entries are valid from the bank start aligned to
-+		 * MAX_ORDER_NR_PAGES.
-+		 */
-+		bank_start = round_down(bank_start, MAX_ORDER_NR_PAGES);
- #endif
- 		/*
- 		 * If we had a previous bank, and there is a space
-diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
-index 3032644..87488b9 100644
---- a/arch/x86/mm/init.c
-+++ b/arch/x86/mm/init.c
-@@ -63,9 +63,8 @@ static void __init find_early_table_space(unsigned long end, int use_pse,
- #ifdef CONFIG_X86_32
- 	/* for fixmap */
- 	tables += roundup(__end_of_fixed_addresses * sizeof(pte_t), PAGE_SIZE);
--
--	good_end = max_pfn_mapped << PAGE_SHIFT;
- #endif
-+	good_end = max_pfn_mapped << PAGE_SHIFT;
- 
- 	base = memblock_find_in_range(start, good_end, tables, PAGE_SIZE);
- 	if (base == MEMBLOCK_ERROR)
-diff --git a/crypto/ghash-generic.c b/crypto/ghash-generic.c
-index be44256..7835b8f 100644
---- a/crypto/ghash-generic.c
-+++ b/crypto/ghash-generic.c
-@@ -67,6 +67,9 @@ static int ghash_update(struct shash_desc *desc,
- 	struct ghash_ctx *ctx = crypto_shash_ctx(desc->tfm);
- 	u8 *dst = dctx->buffer;
- 
-+	if (!ctx->gf128)
-+		return -ENOKEY;
-+
- 	if (dctx->bytes) {
- 		int n = min(srclen, dctx->bytes);
- 		u8 *pos = dst + (GHASH_BLOCK_SIZE - dctx->bytes);
-@@ -119,6 +122,9 @@ static int ghash_final(struct shash_desc *desc, u8 *dst)
- 	struct ghash_ctx *ctx = crypto_shash_ctx(desc->tfm);
- 	u8 *buf = dctx->buffer;
- 
-+	if (!ctx->gf128)
-+		return -ENOKEY;
-+
- 	ghash_flush(ctx, dctx);
- 	memcpy(dst, buf, GHASH_BLOCK_SIZE);
- 
-diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c
-index 41841a3..17cef86 100644
---- a/drivers/firewire/sbp2.c
-+++ b/drivers/firewire/sbp2.c
-@@ -1198,6 +1198,10 @@ static int sbp2_remove(struct device *dev)
- {
- 	struct fw_unit *unit = fw_unit(dev);
- 	struct sbp2_target *tgt = dev_get_drvdata(&unit->device);
-+	struct sbp2_logical_unit *lu;
-+
-+	list_for_each_entry(lu, &tgt->lu_list, link)
-+		cancel_delayed_work_sync(&lu->work);
- 
- 	sbp2_target_put(tgt);
- 	return 0;
-diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
-index ebdb0fd..9a0aee2 100644
---- a/drivers/gpu/drm/radeon/atom.c
-+++ b/drivers/gpu/drm/radeon/atom.c
-@@ -277,7 +277,12 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr,
- 	case ATOM_ARG_FB:
- 		idx = U8(*ptr);
- 		(*ptr)++;
--		val = gctx->scratch[((gctx->fb_base + idx) / 4)];
-+		if ((gctx->fb_base + (idx * 4)) > gctx->scratch_size_bytes) {
-+			DRM_ERROR("ATOM: fb read beyond scratch region: %d vs. %d\n",
-+				  gctx->fb_base + (idx * 4), gctx->scratch_size_bytes);
-+			val = 0;
-+		} else
-+			val = gctx->scratch[(gctx->fb_base / 4) + idx];
- 		if (print)
- 			DEBUG("FB[0x%02X]", idx);
- 		break;
-@@ -531,7 +536,11 @@ static void atom_put_dst(atom_exec_context *ctx, int arg, uint8_t attr,
- 	case ATOM_ARG_FB:
- 		idx = U8(*ptr);
- 		(*ptr)++;
--		gctx->scratch[((gctx->fb_base + idx) / 4)] = val;
-+		if ((gctx->fb_base + (idx * 4)) > gctx->scratch_size_bytes) {
-+			DRM_ERROR("ATOM: fb write beyond scratch region: %d vs. %d\n",
-+				  gctx->fb_base + (idx * 4), gctx->scratch_size_bytes);
-+		} else
-+			gctx->scratch[(gctx->fb_base / 4) + idx] = val;
- 		DEBUG("FB[0x%02X]", idx);
- 		break;
- 	case ATOM_ARG_PLL:
-@@ -1367,11 +1376,13 @@ int atom_allocate_fb_scratch(struct atom_context *ctx)
- 
- 		usage_bytes = firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb * 1024;
- 	}
-+	ctx->scratch_size_bytes = 0;
- 	if (usage_bytes == 0)
- 		usage_bytes = 20 * 1024;
- 	/* allocate some scratch memory */
- 	ctx->scratch = kzalloc(usage_bytes, GFP_KERNEL);
- 	if (!ctx->scratch)
- 		return -ENOMEM;
-+	ctx->scratch_size_bytes = usage_bytes;
- 	return 0;
- }
-diff --git a/drivers/gpu/drm/radeon/atom.h b/drivers/gpu/drm/radeon/atom.h
-index a589a55..93cfe20 100644
---- a/drivers/gpu/drm/radeon/atom.h
-+++ b/drivers/gpu/drm/radeon/atom.h
-@@ -137,6 +137,7 @@ struct atom_context {
- 	int cs_equal, cs_above;
- 	int io_mode;
- 	uint32_t *scratch;
-+	int scratch_size_bytes;
- };
- 
- extern int atom_debug;
-diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
-index b7f0726..e2b2d78 100644
---- a/drivers/gpu/drm/ttm/ttm_bo.c
-+++ b/drivers/gpu/drm/ttm/ttm_bo.c
-@@ -392,10 +392,12 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
- 	 * Create and bind a ttm if required.
- 	 */
- 
--	if (!(new_man->flags & TTM_MEMTYPE_FLAG_FIXED) && (bo->ttm == NULL)) {
--		ret = ttm_bo_add_ttm(bo, false);
--		if (ret)
--			goto out_err;
-+	if (!(new_man->flags & TTM_MEMTYPE_FLAG_FIXED)) {
-+		if (bo->ttm == NULL) {
-+			ret = ttm_bo_add_ttm(bo, false);
-+			if (ret)
-+				goto out_err;
-+		}
- 
- 		ret = ttm_tt_set_placement_caching(bo->ttm, mem->placement);
- 		if (ret)
-diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
-index 77dbf40..ae3c6f5 100644
---- a/drivers/gpu/drm/ttm/ttm_bo_util.c
-+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
-@@ -635,13 +635,13 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
- 		if (ret)
- 			return ret;
- 
--		ttm_bo_free_old_node(bo);
- 		if ((man->flags & TTM_MEMTYPE_FLAG_FIXED) &&
- 		    (bo->ttm != NULL)) {
- 			ttm_tt_unbind(bo->ttm);
- 			ttm_tt_destroy(bo->ttm);
- 			bo->ttm = NULL;
- 		}
-+		ttm_bo_free_old_node(bo);
- 	} else {
- 		/**
- 		 * This should help pipeline ordinary buffer moves.
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index a756ee6..c946d90 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -568,6 +568,9 @@
- #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001
- #define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE	0x0600
- 
-+#define USB_VENDOR_ID_SIGMA_MICRO	0x1c4f
-+#define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD	0x0002
-+
- #define USB_VENDOR_ID_SKYCABLE			0x1223
- #define	USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER	0x3F07
- 
-diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
-index 0ec91c1..56d0539 100644
---- a/drivers/hid/hid-magicmouse.c
-+++ b/drivers/hid/hid-magicmouse.c
-@@ -501,9 +501,17 @@ static int magicmouse_probe(struct hid_device *hdev,
- 	}
- 	report->size = 6;
- 
-+	/*
-+	 * Some devices repond with 'invalid report id' when feature
-+	 * report switching it into multitouch mode is sent to it.
-+	 *
-+	 * This results in -EIO from the _raw low-level transport callback,
-+	 * but there seems to be no other way of switching the mode.
-+	 * Thus the super-ugly hacky success check below.
-+	 */
- 	ret = hdev->hid_output_raw_report(hdev, feature, sizeof(feature),
- 			HID_FEATURE_REPORT);
--	if (ret != sizeof(feature)) {
-+	if (ret != -EIO && ret != sizeof(feature)) {
- 		hid_err(hdev, "unable to request touch data (%d)\n", ret);
- 		goto err_stop_hw;
- 	}
-diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
-index 621959d..4bdb5d4 100644
---- a/drivers/hid/usbhid/hid-quirks.c
-+++ b/drivers/hid/usbhid/hid-quirks.c
-@@ -89,6 +89,7 @@ static const struct hid_blacklist {
- 
- 	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH, HID_QUIRK_MULTI_INPUT },
- 	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS, HID_QUIRK_MULTI_INPUT },
-+	{ USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD, HID_QUIRK_NO_INIT_REPORTS },
- 	{ 0, 0 }
- };
- 
-diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
-index f2b377c..36d7f27 100644
---- a/drivers/hwmon/w83627ehf.c
-+++ b/drivers/hwmon/w83627ehf.c
-@@ -390,7 +390,7 @@ temp_from_reg(u16 reg, s16 regval)
- {
- 	if (is_word_sized(reg))
- 		return LM75_TEMP_FROM_REG(regval);
--	return regval * 1000;
-+	return ((s8)regval) * 1000;
- }
- 
- static inline u16
-@@ -398,7 +398,8 @@ temp_to_reg(u16 reg, long temp)
- {
- 	if (is_word_sized(reg))
- 		return LM75_TEMP_TO_REG(temp);
--	return DIV_ROUND_CLOSEST(SENSORS_LIMIT(temp, -127000, 128000), 1000);
-+	return (s8)DIV_ROUND_CLOSEST(SENSORS_LIMIT(temp, -127000, 128000),
-+				     1000);
- }
- 
- /* Some of analog inputs have internal scaling (2x), 8mV is ADC LSB */
-@@ -1715,7 +1716,8 @@ static void w83627ehf_device_remove_files(struct device *dev)
- }
- 
- /* Get the monitoring functions started */
--static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data)
-+static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,
-+						   enum kinds kind)
- {
- 	int i;
- 	u8 tmp, diode;
-@@ -1746,10 +1748,16 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data)
- 		w83627ehf_write_value(data, W83627EHF_REG_VBAT, tmp | 0x01);
- 
- 	/* Get thermal sensor types */
--	diode = w83627ehf_read_value(data, W83627EHF_REG_DIODE);
-+	switch (kind) {
-+	case w83627ehf:
-+		diode = w83627ehf_read_value(data, W83627EHF_REG_DIODE);
-+		break;
-+	default:
-+		diode = 0x70;
-+	}
- 	for (i = 0; i < 3; i++) {
- 		if ((tmp & (0x02 << i)))
--			data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 2;
-+			data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3;
- 		else
- 			data->temp_type[i] = 4; /* thermistor */
- 	}
-@@ -2016,7 +2024,7 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
- 	}
- 
- 	/* Initialize the chip */
--	w83627ehf_init_device(data);
-+	w83627ehf_init_device(data, sio_data->kind);
- 
- 	data->vrm = vid_which_vrm();
- 	superio_enter(sio_data->sioreg);
-diff --git a/drivers/media/video/uvc/uvc_entity.c b/drivers/media/video/uvc/uvc_entity.c
-index 48fea37..29e2399 100644
---- a/drivers/media/video/uvc/uvc_entity.c
-+++ b/drivers/media/video/uvc/uvc_entity.c
-@@ -49,7 +49,7 @@ static int uvc_mc_register_entity(struct uvc_video_chain *chain,
- 		if (remote == NULL)
- 			return -EINVAL;
- 
--		source = (UVC_ENTITY_TYPE(remote) != UVC_TT_STREAMING)
-+		source = (UVC_ENTITY_TYPE(remote) == UVC_TT_STREAMING)
- 		       ? (remote->vdev ? &remote->vdev->entity : NULL)
- 		       : &remote->subdev.entity;
- 		if (source == NULL)
-diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
-index d347116..1658575 100644
---- a/drivers/platform/x86/samsung-laptop.c
-+++ b/drivers/platform/x86/samsung-laptop.c
-@@ -601,6 +601,16 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = {
- 		.callback = dmi_check_cb,
- 	},
- 	{
-+		.ident = "N150/N210/N220",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR,
-+					"SAMSUNG ELECTRONICS CO., LTD."),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "N150/N210/N220"),
-+			DMI_MATCH(DMI_BOARD_NAME, "N150/N210/N220"),
-+		},
-+		.callback = dmi_check_cb,
-+	},
-+	{
- 		.ident = "N150/N210/N220/N230",
- 		.matches = {
- 			DMI_MATCH(DMI_SYS_VENDOR,
-diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
-index fc7e57b..53e7d72 100644
---- a/fs/cifs/cifsfs.c
-+++ b/fs/cifs/cifsfs.c
-@@ -566,6 +566,12 @@ cifs_get_root(struct smb_vol *vol, struct super_block *sb)
- 		struct inode *dir = dentry->d_inode;
- 		struct dentry *child;
- 
-+		if (!dir) {
-+			dput(dentry);
-+			dentry = ERR_PTR(-ENOENT);
-+			break;
-+		}
-+
- 		/* skip separators */
- 		while (*s == sep)
- 			s++;
-@@ -581,10 +587,6 @@ cifs_get_root(struct smb_vol *vol, struct super_block *sb)
- 		mutex_unlock(&dir->i_mutex);
- 		dput(dentry);
- 		dentry = child;
--		if (!dentry->d_inode) {
--			dput(dentry);
--			dentry = ERR_PTR(-ENOENT);
--		}
- 	} while (!IS_ERR(dentry));
- 	_FreeXid(xid);
- 	kfree(full_path);
-diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index 168a80f..5cb8614 100644
---- a/fs/fuse/dev.c
-+++ b/fs/fuse/dev.c
-@@ -258,10 +258,14 @@ void fuse_queue_forget(struct fuse_conn *fc, struct fuse_forget_link *forget,
- 	forget->forget_one.nlookup = nlookup;
- 
- 	spin_lock(&fc->lock);
--	fc->forget_list_tail->next = forget;
--	fc->forget_list_tail = forget;
--	wake_up(&fc->waitq);
--	kill_fasync(&fc->fasync, SIGIO, POLL_IN);
-+	if (fc->connected) {
-+		fc->forget_list_tail->next = forget;
-+		fc->forget_list_tail = forget;
-+		wake_up(&fc->waitq);
-+		kill_fasync(&fc->fasync, SIGIO, POLL_IN);
-+	} else {
-+		kfree(forget);
-+	}
- 	spin_unlock(&fc->lock);
- }
- 
-diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
-index d685752..4e7f64b 100644
---- a/fs/hfsplus/hfsplus_fs.h
-+++ b/fs/hfsplus/hfsplus_fs.h
-@@ -13,6 +13,7 @@
- #include <linux/fs.h>
- #include <linux/mutex.h>
- #include <linux/buffer_head.h>
-+#include <linux/blkdev.h>
- #include "hfsplus_raw.h"
- 
- #define DBG_BNODE_REFS	0x00000001
-@@ -110,7 +111,9 @@ struct hfsplus_vh;
- struct hfs_btree;
- 
- struct hfsplus_sb_info {
-+	void *s_vhdr_buf;
- 	struct hfsplus_vh *s_vhdr;
-+	void *s_backup_vhdr_buf;
- 	struct hfsplus_vh *s_backup_vhdr;
- 	struct hfs_btree *ext_tree;
- 	struct hfs_btree *cat_tree;
-@@ -258,6 +261,15 @@ struct hfsplus_readdir_data {
- 	struct hfsplus_cat_key key;
- };
- 
-+/*
-+ * Find minimum acceptible I/O size for an hfsplus sb.
-+ */
-+static inline unsigned short hfsplus_min_io_size(struct super_block *sb)
-+{
-+	return max_t(unsigned short, bdev_logical_block_size(sb->s_bdev),
-+		     HFSPLUS_SECTOR_SIZE);
-+}
-+
- #define hfs_btree_open hfsplus_btree_open
- #define hfs_btree_close hfsplus_btree_close
- #define hfs_btree_write hfsplus_btree_write
-@@ -436,8 +448,8 @@ int hfsplus_compare_dentry(const struct dentry *parent,
- /* wrapper.c */
- int hfsplus_read_wrapper(struct super_block *);
- int hfs_part_find(struct super_block *, sector_t *, sector_t *);
--int hfsplus_submit_bio(struct block_device *bdev, sector_t sector,
--		void *data, int rw);
-+int hfsplus_submit_bio(struct super_block *sb, sector_t sector,
-+		void *buf, void **data, int rw);
- 
- /* time macros */
- #define __hfsp_mt2ut(t)		(be32_to_cpu(t) - 2082844800U)
-diff --git a/fs/hfsplus/part_tbl.c b/fs/hfsplus/part_tbl.c
-index 40ad88c..eb355d8 100644
---- a/fs/hfsplus/part_tbl.c
-+++ b/fs/hfsplus/part_tbl.c
-@@ -88,11 +88,12 @@ static int hfs_parse_old_pmap(struct super_block *sb, struct old_pmap *pm,
- 	return -ENOENT;
- }
- 
--static int hfs_parse_new_pmap(struct super_block *sb, struct new_pmap *pm,
--		sector_t *part_start, sector_t *part_size)
-+static int hfs_parse_new_pmap(struct super_block *sb, void *buf,
-+		struct new_pmap *pm, sector_t *part_start, sector_t *part_size)
- {
- 	struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);
- 	int size = be32_to_cpu(pm->pmMapBlkCnt);
-+	int buf_size = hfsplus_min_io_size(sb);
- 	int res;
- 	int i = 0;
- 
-@@ -107,11 +108,14 @@ static int hfs_parse_new_pmap(struct super_block *sb, struct new_pmap *pm,
- 		if (++i >= size)
- 			return -ENOENT;
- 
--		res = hfsplus_submit_bio(sb->s_bdev,
--					 *part_start + HFS_PMAP_BLK + i,
--					 pm, READ);
--		if (res)
--			return res;
-+		pm = (struct new_pmap *)((u8 *)pm + HFSPLUS_SECTOR_SIZE);
-+		if ((u8 *)pm - (u8 *)buf >= buf_size) {
-+			res = hfsplus_submit_bio(sb,
-+						 *part_start + HFS_PMAP_BLK + i,
-+						 buf, (void **)&pm, READ);
-+			if (res)
-+				return res;
-+		}
- 	} while (pm->pmSig == cpu_to_be16(HFS_NEW_PMAP_MAGIC));
- 
- 	return -ENOENT;
-@@ -124,15 +128,15 @@ static int hfs_parse_new_pmap(struct super_block *sb, struct new_pmap *pm,
- int hfs_part_find(struct super_block *sb,
- 		sector_t *part_start, sector_t *part_size)
- {
--	void *data;
-+	void *buf, *data;
- 	int res;
- 
--	data = kmalloc(HFSPLUS_SECTOR_SIZE, GFP_KERNEL);
--	if (!data)
-+	buf = kmalloc(hfsplus_min_io_size(sb), GFP_KERNEL);
-+	if (!buf)
- 		return -ENOMEM;
- 
--	res = hfsplus_submit_bio(sb->s_bdev, *part_start + HFS_PMAP_BLK,
--				 data, READ);
-+	res = hfsplus_submit_bio(sb, *part_start + HFS_PMAP_BLK,
-+				 buf, &data, READ);
- 	if (res)
- 		goto out;
- 
-@@ -141,13 +145,13 @@ int hfs_part_find(struct super_block *sb,
- 		res = hfs_parse_old_pmap(sb, data, part_start, part_size);
- 		break;
- 	case HFS_NEW_PMAP_MAGIC:
--		res = hfs_parse_new_pmap(sb, data, part_start, part_size);
-+		res = hfs_parse_new_pmap(sb, buf, data, part_start, part_size);
- 		break;
- 	default:
- 		res = -ENOENT;
- 		break;
- 	}
- out:
--	kfree(data);
-+	kfree(buf);
- 	return res;
- }
-diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
-index 84a47b7..c3a76fd 100644
---- a/fs/hfsplus/super.c
-+++ b/fs/hfsplus/super.c
-@@ -197,17 +197,17 @@ int hfsplus_sync_fs(struct super_block *sb, int wait)
- 		write_backup = 1;
- 	}
- 
--	error2 = hfsplus_submit_bio(sb->s_bdev,
-+	error2 = hfsplus_submit_bio(sb,
- 				   sbi->part_start + HFSPLUS_VOLHEAD_SECTOR,
--				   sbi->s_vhdr, WRITE_SYNC);
-+				   sbi->s_vhdr_buf, NULL, WRITE_SYNC);
- 	if (!error)
- 		error = error2;
- 	if (!write_backup)
- 		goto out;
- 
--	error2 = hfsplus_submit_bio(sb->s_bdev,
-+	error2 = hfsplus_submit_bio(sb,
- 				  sbi->part_start + sbi->sect_count - 2,
--				  sbi->s_backup_vhdr, WRITE_SYNC);
-+				  sbi->s_backup_vhdr_buf, NULL, WRITE_SYNC);
- 	if (!error)
- 		error2 = error;
- out:
-@@ -251,8 +251,8 @@ static void hfsplus_put_super(struct super_block *sb)
- 	hfs_btree_close(sbi->ext_tree);
- 	iput(sbi->alloc_file);
- 	iput(sbi->hidden_dir);
--	kfree(sbi->s_vhdr);
--	kfree(sbi->s_backup_vhdr);
-+	kfree(sbi->s_vhdr_buf);
-+	kfree(sbi->s_backup_vhdr_buf);
- 	unload_nls(sbi->nls);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
-@@ -508,8 +508,8 @@ out_close_cat_tree:
- out_close_ext_tree:
- 	hfs_btree_close(sbi->ext_tree);
- out_free_vhdr:
--	kfree(sbi->s_vhdr);
--	kfree(sbi->s_backup_vhdr);
-+	kfree(sbi->s_vhdr_buf);
-+	kfree(sbi->s_backup_vhdr_buf);
- out_unload_nls:
- 	unload_nls(sbi->nls);
- 	unload_nls(nls);
-diff --git a/fs/hfsplus/wrapper.c b/fs/hfsplus/wrapper.c
-index 4ac88ff..7b8112d 100644
---- a/fs/hfsplus/wrapper.c
-+++ b/fs/hfsplus/wrapper.c
-@@ -31,25 +31,67 @@ static void hfsplus_end_io_sync(struct bio *bio, int err)
- 	complete(bio->bi_private);
- }
- 
--int hfsplus_submit_bio(struct block_device *bdev, sector_t sector,
--		void *data, int rw)
-+/*
-+ * hfsplus_submit_bio - Perfrom block I/O
-+ * @sb: super block of volume for I/O
-+ * @sector: block to read or write, for blocks of HFSPLUS_SECTOR_SIZE bytes
-+ * @buf: buffer for I/O
-+ * @data: output pointer for location of requested data
-+ * @rw: direction of I/O
-+ *
-+ * The unit of I/O is hfsplus_min_io_size(sb), which may be bigger than
-+ * HFSPLUS_SECTOR_SIZE, and @buf must be sized accordingly. On reads
-+ * @data will return a pointer to the start of the requested sector,
-+ * which may not be the same location as @buf.
-+ *
-+ * If @sector is not aligned to the bdev logical block size it will
-+ * be rounded down. For writes this means that @buf should contain data
-+ * that starts at the rounded-down address. As long as the data was
-+ * read using hfsplus_submit_bio() and the same buffer is used things
-+ * will work correctly.
-+ */
-+int hfsplus_submit_bio(struct super_block *sb, sector_t sector,
-+		void *buf, void **data, int rw)
- {
- 	DECLARE_COMPLETION_ONSTACK(wait);
- 	struct bio *bio;
- 	int ret = 0;
-+	unsigned int io_size;
-+	loff_t start;
-+	int offset;
-+
-+	/*
-+	 * Align sector to hardware sector size and find offset. We
-+	 * assume that io_size is a power of two, which _should_
-+	 * be true.
-+	 */
-+	io_size = hfsplus_min_io_size(sb);
-+	start = (loff_t)sector << HFSPLUS_SECTOR_SHIFT;
-+	offset = start & (io_size - 1);
-+	sector &= ~((io_size >> HFSPLUS_SECTOR_SHIFT) - 1);
- 
- 	bio = bio_alloc(GFP_NOIO, 1);
- 	bio->bi_sector = sector;
--	bio->bi_bdev = bdev;
-+	bio->bi_bdev = sb->s_bdev;
- 	bio->bi_end_io = hfsplus_end_io_sync;
- 	bio->bi_private = &wait;
- 
--	/*
--	 * We always submit one sector at a time, so bio_add_page must not fail.
--	 */
--	if (bio_add_page(bio, virt_to_page(data), HFSPLUS_SECTOR_SIZE,
--			 offset_in_page(data)) != HFSPLUS_SECTOR_SIZE)
--		BUG();
-+	if (!(rw & WRITE) && data)
-+		*data = (u8 *)buf + offset;
-+
-+	while (io_size > 0) {
-+		unsigned int page_offset = offset_in_page(buf);
-+		unsigned int len = min_t(unsigned int, PAGE_SIZE - page_offset,
-+					 io_size);
-+
-+		ret = bio_add_page(bio, virt_to_page(buf), len, page_offset);
-+		if (ret != len) {
-+			ret = -EIO;
-+			goto out;
-+		}
-+		io_size -= len;
-+		buf = (u8 *)buf + len;
-+	}
- 
- 	submit_bio(rw, bio);
- 	wait_for_completion(&wait);
-@@ -57,8 +99,9 @@ int hfsplus_submit_bio(struct block_device *bdev, sector_t sector,
- 	if (!bio_flagged(bio, BIO_UPTODATE))
- 		ret = -EIO;
- 
-+out:
- 	bio_put(bio);
--	return ret;
-+	return ret < 0 ? ret : 0;
- }
- 
- static int hfsplus_read_mdb(void *bufptr, struct hfsplus_wd *wd)
-@@ -147,17 +190,17 @@ int hfsplus_read_wrapper(struct super_block *sb)
- 	}
- 
- 	error = -ENOMEM;
--	sbi->s_vhdr = kmalloc(HFSPLUS_SECTOR_SIZE, GFP_KERNEL);
--	if (!sbi->s_vhdr)
-+	sbi->s_vhdr_buf = kmalloc(hfsplus_min_io_size(sb), GFP_KERNEL);
-+	if (!sbi->s_vhdr_buf)
- 		goto out;
--	sbi->s_backup_vhdr = kmalloc(HFSPLUS_SECTOR_SIZE, GFP_KERNEL);
--	if (!sbi->s_backup_vhdr)
-+	sbi->s_backup_vhdr_buf = kmalloc(hfsplus_min_io_size(sb), GFP_KERNEL);
-+	if (!sbi->s_backup_vhdr_buf)
- 		goto out_free_vhdr;
- 
- reread:
--	error = hfsplus_submit_bio(sb->s_bdev,
--				   part_start + HFSPLUS_VOLHEAD_SECTOR,
--				   sbi->s_vhdr, READ);
-+	error = hfsplus_submit_bio(sb, part_start + HFSPLUS_VOLHEAD_SECTOR,
-+				   sbi->s_vhdr_buf, (void **)&sbi->s_vhdr,
-+				   READ);
- 	if (error)
- 		goto out_free_backup_vhdr;
- 
-@@ -186,9 +229,9 @@ reread:
- 		goto reread;
- 	}
- 
--	error = hfsplus_submit_bio(sb->s_bdev,
--				   part_start + part_size - 2,
--				   sbi->s_backup_vhdr, READ);
-+	error = hfsplus_submit_bio(sb, part_start + part_size - 2,
-+				   sbi->s_backup_vhdr_buf,
-+				   (void **)&sbi->s_backup_vhdr, READ);
- 	if (error)
- 		goto out_free_backup_vhdr;
- 
-@@ -232,9 +275,9 @@ reread:
- 	return 0;
- 
- out_free_backup_vhdr:
--	kfree(sbi->s_backup_vhdr);
-+	kfree(sbi->s_backup_vhdr_buf);
- out_free_vhdr:
--	kfree(sbi->s_vhdr);
-+	kfree(sbi->s_vhdr_buf);
- out:
- 	return error;
- }
-diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h
-index 8633521..8731516 100644
---- a/fs/xfs/linux-2.6/xfs_linux.h
-+++ b/fs/xfs/linux-2.6/xfs_linux.h
-@@ -70,6 +70,8 @@
- #include <linux/ctype.h>
- #include <linux/writeback.h>
- #include <linux/capability.h>
-+#include <linux/kthread.h>
-+#include <linux/freezer.h>
- #include <linux/list_sort.h>
- 
- #include <asm/page.h>
-diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
-index a1a881e..347cae9 100644
---- a/fs/xfs/linux-2.6/xfs_super.c
-+++ b/fs/xfs/linux-2.6/xfs_super.c
-@@ -1412,37 +1412,35 @@ xfs_fs_fill_super(
- 	sb->s_time_gran = 1;
- 	set_posix_acl_flag(sb);
- 
--	error = xfs_syncd_init(mp);
--	if (error)
--		goto out_filestream_unmount;
--
- 	xfs_inode_shrinker_register(mp);
- 
- 	error = xfs_mountfs(mp);
- 	if (error)
--		goto out_syncd_stop;
-+		goto out_filestream_unmount;
-+
-+	error = xfs_syncd_init(mp);
-+	if (error)
-+		goto out_unmount;
- 
- 	root = igrab(VFS_I(mp->m_rootip));
- 	if (!root) {
- 		error = ENOENT;
--		goto fail_unmount;
-+		goto out_syncd_stop;
- 	}
- 	if (is_bad_inode(root)) {
- 		error = EINVAL;
--		goto fail_vnrele;
-+		goto out_syncd_stop;
- 	}
- 	sb->s_root = d_alloc_root(root);
- 	if (!sb->s_root) {
- 		error = ENOMEM;
--		goto fail_vnrele;
-+		goto out_iput;
- 	}
- 
- 	return 0;
- 
-- out_syncd_stop:
--	xfs_inode_shrinker_unregister(mp);
--	xfs_syncd_stop(mp);
-  out_filestream_unmount:
-+	xfs_inode_shrinker_unregister(mp);
- 	xfs_filestream_unmount(mp);
-  out_free_sb:
- 	xfs_freesb(mp);
-@@ -1456,17 +1454,12 @@ xfs_fs_fill_super(
-  out:
- 	return -error;
- 
-- fail_vnrele:
--	if (sb->s_root) {
--		dput(sb->s_root);
--		sb->s_root = NULL;
--	} else {
--		iput(root);
--	}
--
-- fail_unmount:
--	xfs_inode_shrinker_unregister(mp);
-+ out_iput:
-+	iput(root);
-+ out_syncd_stop:
- 	xfs_syncd_stop(mp);
-+ out_unmount:
-+	xfs_inode_shrinker_unregister(mp);
- 
- 	/*
- 	 * Blow away any referenced inode in the filestreams cache.
-@@ -1667,24 +1660,13 @@ xfs_init_workqueues(void)
- 	 */
- 	xfs_syncd_wq = alloc_workqueue("xfssyncd", WQ_CPU_INTENSIVE, 8);
- 	if (!xfs_syncd_wq)
--		goto out;
--
--	xfs_ail_wq = alloc_workqueue("xfsail", WQ_CPU_INTENSIVE, 8);
--	if (!xfs_ail_wq)
--		goto out_destroy_syncd;
--
-+		return -ENOMEM;
- 	return 0;
--
--out_destroy_syncd:
--	destroy_workqueue(xfs_syncd_wq);
--out:
--	return -ENOMEM;
- }
- 
- STATIC void
- xfs_destroy_workqueues(void)
- {
--	destroy_workqueue(xfs_ail_wq);
- 	destroy_workqueue(xfs_syncd_wq);
- }
- 
-diff --git a/fs/xfs/quota/xfs_dquot_item.c b/fs/xfs/quota/xfs_dquot_item.c
-index 9e0e2fa..8126fc2 100644
---- a/fs/xfs/quota/xfs_dquot_item.c
-+++ b/fs/xfs/quota/xfs_dquot_item.c
-@@ -183,13 +183,14 @@ xfs_qm_dqunpin_wait(
-  * search the buffer cache can be a time consuming thing, and AIL lock is a
-  * spinlock.
-  */
--STATIC void
-+STATIC bool
- xfs_qm_dquot_logitem_pushbuf(
- 	struct xfs_log_item	*lip)
- {
- 	struct xfs_dq_logitem	*qlip = DQUOT_ITEM(lip);
- 	struct xfs_dquot	*dqp = qlip->qli_dquot;
- 	struct xfs_buf		*bp;
-+	bool			ret = true;
- 
- 	ASSERT(XFS_DQ_IS_LOCKED(dqp));
- 
-@@ -201,17 +202,20 @@ xfs_qm_dquot_logitem_pushbuf(
- 	if (completion_done(&dqp->q_flush) ||
- 	    !(lip->li_flags & XFS_LI_IN_AIL)) {
- 		xfs_dqunlock(dqp);
--		return;
-+		return true;
- 	}
- 
- 	bp = xfs_incore(dqp->q_mount->m_ddev_targp, qlip->qli_format.qlf_blkno,
- 			dqp->q_mount->m_quotainfo->qi_dqchunklen, XBF_TRYLOCK);
- 	xfs_dqunlock(dqp);
- 	if (!bp)
--		return;
-+		return true;
- 	if (XFS_BUF_ISDELAYWRITE(bp))
- 		xfs_buf_delwri_promote(bp);
-+	if (XFS_BUF_ISPINNED(bp))
-+		ret = false;
- 	xfs_buf_relse(bp);
-+	return ret;
- }
- 
- /*
-diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
-index 7b7e005..a7342e8 100644
---- a/fs/xfs/xfs_buf_item.c
-+++ b/fs/xfs/xfs_buf_item.c
-@@ -632,7 +632,7 @@ xfs_buf_item_push(
-  * the xfsbufd to get this buffer written. We have to unlock the buffer
-  * to allow the xfsbufd to write it, too.
-  */
--STATIC void
-+STATIC bool
- xfs_buf_item_pushbuf(
- 	struct xfs_log_item	*lip)
- {
-@@ -646,6 +646,7 @@ xfs_buf_item_pushbuf(
- 
- 	xfs_buf_delwri_promote(bp);
- 	xfs_buf_relse(bp);
-+	return true;
- }
- 
- STATIC void
-diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
-index b1e88d5..391044c 100644
---- a/fs/xfs/xfs_inode_item.c
-+++ b/fs/xfs/xfs_inode_item.c
-@@ -713,13 +713,14 @@ xfs_inode_item_committed(
-  * marked delayed write. If that's the case, we'll promote it and that will
-  * allow the caller to write the buffer by triggering the xfsbufd to run.
-  */
--STATIC void
-+STATIC bool
- xfs_inode_item_pushbuf(
- 	struct xfs_log_item	*lip)
- {
- 	struct xfs_inode_log_item *iip = INODE_ITEM(lip);
- 	struct xfs_inode	*ip = iip->ili_inode;
- 	struct xfs_buf		*bp;
-+	bool			ret = true;
- 
- 	ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED));
- 
-@@ -730,7 +731,7 @@ xfs_inode_item_pushbuf(
- 	if (completion_done(&ip->i_flush) ||
- 	    !(lip->li_flags & XFS_LI_IN_AIL)) {
- 		xfs_iunlock(ip, XFS_ILOCK_SHARED);
--		return;
-+		return true;
- 	}
- 
- 	bp = xfs_incore(ip->i_mount->m_ddev_targp, iip->ili_format.ilf_blkno,
-@@ -738,10 +739,13 @@ xfs_inode_item_pushbuf(
- 
- 	xfs_iunlock(ip, XFS_ILOCK_SHARED);
- 	if (!bp)
--		return;
-+		return true;
- 	if (XFS_BUF_ISDELAYWRITE(bp))
- 		xfs_buf_delwri_promote(bp);
-+	if (XFS_BUF_ISPINNED(bp))
-+		ret = false;
- 	xfs_buf_relse(bp);
-+	return ret;
- }
- 
- /*
-diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
-index c83f63b..efc147f 100644
---- a/fs/xfs/xfs_trans.c
-+++ b/fs/xfs/xfs_trans.c
-@@ -1426,6 +1426,7 @@ xfs_trans_committed(
- static inline void
- xfs_log_item_batch_insert(
- 	struct xfs_ail		*ailp,
-+	struct xfs_ail_cursor	*cur,
- 	struct xfs_log_item	**log_items,
- 	int			nr_items,
- 	xfs_lsn_t		commit_lsn)
-@@ -1434,7 +1435,7 @@ xfs_log_item_batch_insert(
- 
- 	spin_lock(&ailp->xa_lock);
- 	/* xfs_trans_ail_update_bulk drops ailp->xa_lock */
--	xfs_trans_ail_update_bulk(ailp, log_items, nr_items, commit_lsn);
-+	xfs_trans_ail_update_bulk(ailp, cur, log_items, nr_items, commit_lsn);
- 
- 	for (i = 0; i < nr_items; i++)
- 		IOP_UNPIN(log_items[i], 0);
-@@ -1452,6 +1453,13 @@ xfs_log_item_batch_insert(
-  * as an iclog write error even though we haven't started any IO yet. Hence in
-  * this case all we need to do is IOP_COMMITTED processing, followed by an
-  * IOP_UNPIN(aborted) call.
-+ *
-+ * The AIL cursor is used to optimise the insert process. If commit_lsn is not
-+ * at the end of the AIL, the insert cursor avoids the need to walk
-+ * the AIL to find the insertion point on every xfs_log_item_batch_insert()
-+ * call. This saves a lot of needless list walking and is a net win, even
-+ * though it slightly increases that amount of AIL lock traffic to set it up
-+ * and tear it down.
-  */
- void
- xfs_trans_committed_bulk(
-@@ -1463,8 +1471,13 @@ xfs_trans_committed_bulk(
- #define LOG_ITEM_BATCH_SIZE	32
- 	struct xfs_log_item	*log_items[LOG_ITEM_BATCH_SIZE];
- 	struct xfs_log_vec	*lv;
-+	struct xfs_ail_cursor	cur;
- 	int			i = 0;
- 
-+	spin_lock(&ailp->xa_lock);
-+	xfs_trans_ail_cursor_last(ailp, &cur, commit_lsn);
-+	spin_unlock(&ailp->xa_lock);
-+
- 	/* unpin all the log items */
- 	for (lv = log_vector; lv; lv = lv->lv_next ) {
- 		struct xfs_log_item	*lip = lv->lv_item;
-@@ -1493,7 +1506,9 @@ xfs_trans_committed_bulk(
- 			/*
- 			 * Not a bulk update option due to unusual item_lsn.
- 			 * Push into AIL immediately, rechecking the lsn once
--			 * we have the ail lock. Then unpin the item.
-+			 * we have the ail lock. Then unpin the item. This does
-+			 * not affect the AIL cursor the bulk insert path is
-+			 * using.
- 			 */
- 			spin_lock(&ailp->xa_lock);
- 			if (XFS_LSN_CMP(item_lsn, lip->li_lsn) > 0)
-@@ -1507,7 +1522,7 @@ xfs_trans_committed_bulk(
- 		/* Item is a candidate for bulk AIL insert.  */
- 		log_items[i++] = lv->lv_item;
- 		if (i >= LOG_ITEM_BATCH_SIZE) {
--			xfs_log_item_batch_insert(ailp, log_items,
-+			xfs_log_item_batch_insert(ailp, &cur, log_items,
- 					LOG_ITEM_BATCH_SIZE, commit_lsn);
- 			i = 0;
- 		}
-@@ -1515,7 +1530,11 @@ xfs_trans_committed_bulk(
- 
- 	/* make sure we insert the remainder! */
- 	if (i)
--		xfs_log_item_batch_insert(ailp, log_items, i, commit_lsn);
-+		xfs_log_item_batch_insert(ailp, &cur, log_items, i, commit_lsn);
-+
-+	spin_lock(&ailp->xa_lock);
-+	xfs_trans_ail_cursor_done(ailp, &cur);
-+	spin_unlock(&ailp->xa_lock);
- }
- 
- /*
-diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
-index 06a9759..53597f4 100644
---- a/fs/xfs/xfs_trans.h
-+++ b/fs/xfs/xfs_trans.h
-@@ -350,7 +350,7 @@ typedef struct xfs_item_ops {
- 	void (*iop_unlock)(xfs_log_item_t *);
- 	xfs_lsn_t (*iop_committed)(xfs_log_item_t *, xfs_lsn_t);
- 	void (*iop_push)(xfs_log_item_t *);
--	void (*iop_pushbuf)(xfs_log_item_t *);
-+	bool (*iop_pushbuf)(xfs_log_item_t *);
- 	void (*iop_committing)(xfs_log_item_t *, xfs_lsn_t);
- } xfs_item_ops_t;
- 
-diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
-index 5fc2380..a4c281b 100644
---- a/fs/xfs/xfs_trans_ail.c
-+++ b/fs/xfs/xfs_trans_ail.c
-@@ -28,8 +28,6 @@
- #include "xfs_trans_priv.h"
- #include "xfs_error.h"
- 
--struct workqueue_struct	*xfs_ail_wq;	/* AIL workqueue */
--
- #ifdef DEBUG
- /*
-  * Check that the list is sorted as it should be.
-@@ -272,9 +270,9 @@ xfs_trans_ail_cursor_clear(
- }
- 
- /*
-- * Return the item in the AIL with the current lsn.
-- * Return the current tree generation number for use
-- * in calls to xfs_trans_next_ail().
-+ * Initialise the cursor to the first item in the AIL with the given @lsn.
-+ * This searches the list from lowest LSN to highest. Pass a @lsn of zero
-+ * to initialise the cursor to the first item in the AIL.
-  */
- xfs_log_item_t *
- xfs_trans_ail_cursor_first(
-@@ -300,31 +298,97 @@ out:
- }
- 
- /*
-- * splice the log item list into the AIL at the given LSN.
-+ * Initialise the cursor to the last item in the AIL with the given @lsn.
-+ * This searches the list from highest LSN to lowest. If there is no item with
-+ * the value of @lsn, then it sets the cursor to the last item with an LSN lower
-+ * than @lsn.
-+ */
-+static struct xfs_log_item *
-+__xfs_trans_ail_cursor_last(
-+	struct xfs_ail		*ailp,
-+	xfs_lsn_t		lsn)
-+{
-+	xfs_log_item_t		*lip;
-+
-+	list_for_each_entry_reverse(lip, &ailp->xa_ail, li_ail) {
-+		if (XFS_LSN_CMP(lip->li_lsn, lsn) <= 0)
-+			return lip;
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * Initialise the cursor to the last item in the AIL with the given @lsn.
-+ * This searches the list from highest LSN to lowest.
-+ */
-+struct xfs_log_item *
-+xfs_trans_ail_cursor_last(
-+	struct xfs_ail		*ailp,
-+	struct xfs_ail_cursor	*cur,
-+	xfs_lsn_t		lsn)
-+{
-+	xfs_trans_ail_cursor_init(ailp, cur);
-+	cur->item = __xfs_trans_ail_cursor_last(ailp, lsn);
-+	return cur->item;
-+}
-+
-+/*
-+ * splice the log item list into the AIL at the given LSN. We splice to the
-+ * tail of the given LSN to maintain insert order for push traversals. The
-+ * cursor is optional, allowing repeated updates to the same LSN to avoid
-+ * repeated traversals.
-  */
- static void
- xfs_ail_splice(
--	struct xfs_ail  *ailp,
--	struct list_head *list,
--	xfs_lsn_t       lsn)
-+	struct xfs_ail		*ailp,
-+	struct xfs_ail_cursor	*cur,
-+	struct list_head	*list,
-+	xfs_lsn_t		lsn)
- {
--	xfs_log_item_t  *next_lip;
-+	struct xfs_log_item	*lip = cur ? cur->item : NULL;
-+	struct xfs_log_item	*next_lip;
- 
--	/* If the list is empty, just insert the item.  */
--	if (list_empty(&ailp->xa_ail)) {
--		list_splice(list, &ailp->xa_ail);
--		return;
-+	/*
-+	 * Get a new cursor if we don't have a placeholder or the existing one
-+	 * has been invalidated.
-+	 */
-+	if (!lip || (__psint_t)lip & 1) {
-+		lip = __xfs_trans_ail_cursor_last(ailp, lsn);
-+
-+		if (!lip) {
-+			/* The list is empty, so just splice and return.  */
-+			if (cur)
-+				cur->item = NULL;
-+			list_splice(list, &ailp->xa_ail);
-+			return;
-+		}
- 	}
- 
--	list_for_each_entry_reverse(next_lip, &ailp->xa_ail, li_ail) {
--		if (XFS_LSN_CMP(next_lip->li_lsn, lsn) <= 0)
--			break;
-+	/*
-+	 * Our cursor points to the item we want to insert _after_, so we have
-+	 * to update the cursor to point to the end of the list we are splicing
-+	 * in so that it points to the correct location for the next splice.
-+	 * i.e. before the splice
-+	 *
-+	 *  lsn -> lsn -> lsn + x -> lsn + x ...
-+	 *          ^
-+	 *          | cursor points here
-+	 *
-+	 * After the splice we have:
-+	 *
-+	 *  lsn -> lsn -> lsn -> lsn -> .... -> lsn -> lsn + x -> lsn + x ...
-+	 *          ^                            ^
-+	 *          | cursor points here         | needs to move here
-+	 *
-+	 * So we set the cursor to the last item in the list to be spliced
-+	 * before we execute the splice, resulting in the cursor pointing to
-+	 * the correct item after the splice occurs.
-+	 */
-+	if (cur) {
-+		next_lip = list_entry(list->prev, struct xfs_log_item, li_ail);
-+		cur->item = next_lip;
- 	}
--
--	ASSERT(&next_lip->li_ail == &ailp->xa_ail ||
--	       XFS_LSN_CMP(next_lip->li_lsn, lsn) <= 0);
--
--	list_splice_init(list, &next_lip->li_ail);
-+	list_splice(list, &lip->li_ail);
- }
- 
- /*
-@@ -340,16 +404,10 @@ xfs_ail_delete(
- 	xfs_trans_ail_cursor_clear(ailp, lip);
- }
- 
--/*
-- * xfs_ail_worker does the work of pushing on the AIL. It will requeue itself
-- * to run at a later time if there is more work to do to complete the push.
-- */
--STATIC void
--xfs_ail_worker(
--	struct work_struct	*work)
-+static long
-+xfsaild_push(
-+	struct xfs_ail		*ailp)
- {
--	struct xfs_ail		*ailp = container_of(to_delayed_work(work),
--					struct xfs_ail, xa_work);
- 	xfs_mount_t		*mp = ailp->xa_mount;
- 	struct xfs_ail_cursor	*cur = &ailp->xa_cursors;
- 	xfs_log_item_t		*lip;
-@@ -412,8 +470,13 @@ xfs_ail_worker(
- 
- 		case XFS_ITEM_PUSHBUF:
- 			XFS_STATS_INC(xs_push_ail_pushbuf);
--			IOP_PUSHBUF(lip);
--			ailp->xa_last_pushed_lsn = lsn;
-+
-+			if (!IOP_PUSHBUF(lip)) {
-+				stuck++;
-+				flush_log = 1;
-+			} else {
-+				ailp->xa_last_pushed_lsn = lsn;
-+			}
- 			push_xfsbufd = 1;
- 			break;
- 
-@@ -425,7 +488,6 @@ xfs_ail_worker(
- 
- 		case XFS_ITEM_LOCKED:
- 			XFS_STATS_INC(xs_push_ail_locked);
--			ailp->xa_last_pushed_lsn = lsn;
- 			stuck++;
- 			break;
- 
-@@ -486,20 +548,6 @@ out_done:
- 		/* We're past our target or empty, so idle */
- 		ailp->xa_last_pushed_lsn = 0;
- 
--		/*
--		 * We clear the XFS_AIL_PUSHING_BIT first before checking
--		 * whether the target has changed. If the target has changed,
--		 * this pushes the requeue race directly onto the result of the
--		 * atomic test/set bit, so we are guaranteed that either the
--		 * the pusher that changed the target or ourselves will requeue
--		 * the work (but not both).
--		 */
--		clear_bit(XFS_AIL_PUSHING_BIT, &ailp->xa_flags);
--		smp_rmb();
--		if (XFS_LSN_CMP(ailp->xa_target, target) == 0 ||
--		    test_and_set_bit(XFS_AIL_PUSHING_BIT, &ailp->xa_flags))
--			return;
--
- 		tout = 50;
- 	} else if (XFS_LSN_CMP(lsn, target) >= 0) {
- 		/*
-@@ -522,9 +570,30 @@ out_done:
- 		tout = 20;
- 	}
- 
--	/* There is more to do, requeue us.  */
--	queue_delayed_work(xfs_syncd_wq, &ailp->xa_work,
--					msecs_to_jiffies(tout));
-+	return tout;
-+}
-+
-+static int
-+xfsaild(
-+	void		*data)
-+{
-+	struct xfs_ail	*ailp = data;
-+	long		tout = 0;	/* milliseconds */
-+
-+	while (!kthread_should_stop()) {
-+		if (tout && tout <= 20)
-+			__set_current_state(TASK_KILLABLE);
-+		else
-+			__set_current_state(TASK_INTERRUPTIBLE);
-+		schedule_timeout(tout ?
-+				 msecs_to_jiffies(tout) : MAX_SCHEDULE_TIMEOUT);
-+
-+		try_to_freeze();
-+
-+		tout = xfsaild_push(ailp);
-+	}
-+
-+	return 0;
- }
- 
- /*
-@@ -559,8 +628,9 @@ xfs_ail_push(
- 	 */
- 	smp_wmb();
- 	xfs_trans_ail_copy_lsn(ailp, &ailp->xa_target, &threshold_lsn);
--	if (!test_and_set_bit(XFS_AIL_PUSHING_BIT, &ailp->xa_flags))
--		queue_delayed_work(xfs_syncd_wq, &ailp->xa_work, 0);
-+	smp_wmb();
-+
-+	wake_up_process(ailp->xa_task);
- }
- 
- /*
-@@ -645,6 +715,7 @@ xfs_trans_unlocked_item(
- void
- xfs_trans_ail_update_bulk(
- 	struct xfs_ail		*ailp,
-+	struct xfs_ail_cursor	*cur,
- 	struct xfs_log_item	**log_items,
- 	int			nr_items,
- 	xfs_lsn_t		lsn) __releases(ailp->xa_lock)
-@@ -674,7 +745,7 @@ xfs_trans_ail_update_bulk(
- 		list_add(&lip->li_ail, &tmp);
- 	}
- 
--	xfs_ail_splice(ailp, &tmp, lsn);
-+	xfs_ail_splice(ailp, cur, &tmp, lsn);
- 
- 	if (!mlip_changed) {
- 		spin_unlock(&ailp->xa_lock);
-@@ -794,9 +865,18 @@ xfs_trans_ail_init(
- 	ailp->xa_mount = mp;
- 	INIT_LIST_HEAD(&ailp->xa_ail);
- 	spin_lock_init(&ailp->xa_lock);
--	INIT_DELAYED_WORK(&ailp->xa_work, xfs_ail_worker);
-+
-+	ailp->xa_task = kthread_run(xfsaild, ailp, "xfsaild/%s",
-+			ailp->xa_mount->m_fsname);
-+	if (IS_ERR(ailp->xa_task))
-+		goto out_free_ailp;
-+
- 	mp->m_ail = ailp;
- 	return 0;
-+
-+out_free_ailp:
-+	kmem_free(ailp);
-+	return ENOMEM;
- }
- 
- void
-@@ -805,6 +885,6 @@ xfs_trans_ail_destroy(
- {
- 	struct xfs_ail	*ailp = mp->m_ail;
- 
--	cancel_delayed_work_sync(&ailp->xa_work);
-+	kthread_stop(ailp->xa_task);
- 	kmem_free(ailp);
- }
-diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h
-index 6b164e9..fe2e3cb 100644
---- a/fs/xfs/xfs_trans_priv.h
-+++ b/fs/xfs/xfs_trans_priv.h
-@@ -64,24 +64,19 @@ struct xfs_ail_cursor {
-  */
- struct xfs_ail {
- 	struct xfs_mount	*xa_mount;
-+	struct task_struct	*xa_task;
- 	struct list_head	xa_ail;
- 	xfs_lsn_t		xa_target;
- 	struct xfs_ail_cursor	xa_cursors;
- 	spinlock_t		xa_lock;
--	struct delayed_work	xa_work;
- 	xfs_lsn_t		xa_last_pushed_lsn;
--	unsigned long		xa_flags;
- };
- 
--#define XFS_AIL_PUSHING_BIT	0
--
- /*
-  * From xfs_trans_ail.c
-  */
--
--extern struct workqueue_struct	*xfs_ail_wq;	/* AIL workqueue */
--
- void	xfs_trans_ail_update_bulk(struct xfs_ail *ailp,
-+				struct xfs_ail_cursor *cur,
- 				struct xfs_log_item **log_items, int nr_items,
- 				xfs_lsn_t lsn) __releases(ailp->xa_lock);
- static inline void
-@@ -90,7 +85,7 @@ xfs_trans_ail_update(
- 	struct xfs_log_item	*lip,
- 	xfs_lsn_t		lsn) __releases(ailp->xa_lock)
- {
--	xfs_trans_ail_update_bulk(ailp, &lip, 1, lsn);
-+	xfs_trans_ail_update_bulk(ailp, NULL, &lip, 1, lsn);
- }
- 
- void	xfs_trans_ail_delete_bulk(struct xfs_ail *ailp,
-@@ -111,10 +106,13 @@ xfs_lsn_t		xfs_ail_min_lsn(struct xfs_ail *ailp);
- void			xfs_trans_unlocked_item(struct xfs_ail *,
- 					xfs_log_item_t *);
- 
--struct xfs_log_item	*xfs_trans_ail_cursor_first(struct xfs_ail *ailp,
-+struct xfs_log_item *	xfs_trans_ail_cursor_first(struct xfs_ail *ailp,
-+					struct xfs_ail_cursor *cur,
-+					xfs_lsn_t lsn);
-+struct xfs_log_item *	xfs_trans_ail_cursor_last(struct xfs_ail *ailp,
- 					struct xfs_ail_cursor *cur,
- 					xfs_lsn_t lsn);
--struct xfs_log_item	*xfs_trans_ail_cursor_next(struct xfs_ail *ailp,
-+struct xfs_log_item *	xfs_trans_ail_cursor_next(struct xfs_ail *ailp,
- 					struct xfs_ail_cursor *cur);
- void			xfs_trans_ail_cursor_done(struct xfs_ail *ailp,
- 					struct xfs_ail_cursor *cur);
-diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
-index c8008dd..640ded8 100644
---- a/kernel/posix-cpu-timers.c
-+++ b/kernel/posix-cpu-timers.c
-@@ -274,9 +274,7 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times)
- 	struct task_cputime sum;
- 	unsigned long flags;
- 
--	spin_lock_irqsave(&cputimer->lock, flags);
- 	if (!cputimer->running) {
--		cputimer->running = 1;
- 		/*
- 		 * The POSIX timer interface allows for absolute time expiry
- 		 * values through the TIMER_ABSTIME flag, therefore we have
-@@ -284,8 +282,11 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times)
- 		 * it.
- 		 */
- 		thread_group_cputime(tsk, &sum);
-+		spin_lock_irqsave(&cputimer->lock, flags);
-+		cputimer->running = 1;
- 		update_gt_cputime(&cputimer->cputime, &sum);
--	}
-+	} else
-+		spin_lock_irqsave(&cputimer->lock, flags);
- 	*times = cputimer->cputime;
- 	spin_unlock_irqrestore(&cputimer->lock, flags);
- }
-diff --git a/kernel/sys.c b/kernel/sys.c
-index 5c942cf..f88dadc 100644
---- a/kernel/sys.c
-+++ b/kernel/sys.c
-@@ -1135,7 +1135,7 @@ DECLARE_RWSEM(uts_sem);
- static int override_release(char __user *release, int len)
- {
- 	int ret = 0;
--	char buf[len];
-+	char buf[65];
- 
- 	if (current->personality & UNAME26) {
- 		char *rest = UTS_RELEASE;
-diff --git a/mm/migrate.c b/mm/migrate.c
-index 666e4e6..14d0a6a 100644
---- a/mm/migrate.c
-+++ b/mm/migrate.c
-@@ -120,10 +120,10 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma,
- 
- 		ptep = pte_offset_map(pmd, addr);
- 
--		if (!is_swap_pte(*ptep)) {
--			pte_unmap(ptep);
--			goto out;
--		}
-+		/*
-+		 * Peek to check is_swap_pte() before taking ptlock?  No, we
-+		 * can race mremap's move_ptes(), which skips anon_vma lock.
-+		 */
- 
- 		ptl = pte_lockptr(mm, pmd);
- 	}
-diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
-index 4680b1e..373e14f 100644
---- a/net/x25/af_x25.c
-+++ b/net/x25/af_x25.c
-@@ -295,7 +295,8 @@ static struct sock *x25_find_listener(struct x25_address *addr,
- 			 * Found a listening socket, now check the incoming
- 			 * call user data vs this sockets call user data
- 			 */
--			if(skb->len > 0 && x25_sk(s)->cudmatchlength > 0) {
-+			if (x25_sk(s)->cudmatchlength > 0 &&
-+				skb->len >= x25_sk(s)->cudmatchlength) {
- 				if((memcmp(x25_sk(s)->calluserdata.cuddata,
- 					skb->data,
- 					x25_sk(s)->cudmatchlength)) == 0) {
-diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
-index 486f6de..981b6fd 100644
---- a/sound/pci/hda/hda_intel.c
-+++ b/sound/pci/hda/hda_intel.c
-@@ -2352,6 +2352,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
- 	SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),
- 	SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),
- 	SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),
-+	SND_PCI_QUIRK(0x1028, 0x02c6, "Dell Inspiron 1010", POS_FIX_LPIB),
- 	SND_PCI_QUIRK(0x1028, 0x0470, "Dell Inspiron 1120", POS_FIX_LPIB),
- 	SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),
- 	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
-diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
-index 7bbc5f2..cf1fa36 100644
---- a/sound/pci/hda/patch_conexant.c
-+++ b/sound/pci/hda/patch_conexant.c
-@@ -3097,6 +3097,7 @@ static const struct snd_pci_quirk cxt5066_cfg_tbl[] = {
- 	SND_PCI_QUIRK(0x17aa, 0x21c5, "Thinkpad Edge 13", CXT5066_THINKPAD),
- 	SND_PCI_QUIRK(0x17aa, 0x21c6, "Thinkpad Edge 13", CXT5066_ASUS),
-  	SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),
-+	SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520 & W520", CXT5066_AUTO),
- 	SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT5066_THINKPAD),
- 	SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT5066_THINKPAD),
- 	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo U350", CXT5066_ASUS),
diff --git a/3.0.9/1008_linux-3.0.9.patch b/3.0.9/1008_linux-3.0.9.patch
deleted file mode 100644
index 1679a52..0000000
--- a/3.0.9/1008_linux-3.0.9.patch
+++ /dev/null
@@ -1,10991 +0,0 @@
-diff --git a/Documentation/hwspinlock.txt b/Documentation/hwspinlock.txt
-index 7dcd1a4..6996681 100644
---- a/Documentation/hwspinlock.txt
-+++ b/Documentation/hwspinlock.txt
-@@ -39,23 +39,20 @@ independent, drivers.
-      in case an unused hwspinlock isn't available. Users of this
-      API will usually want to communicate the lock's id to the remote core
-      before it can be used to achieve synchronization.
--     Can be called from an atomic context (this function will not sleep) but
--     not from within interrupt context.
-+     Should be called from a process context (might sleep).
- 
-   struct hwspinlock *hwspin_lock_request_specific(unsigned int id);
-    - assign a specific hwspinlock id and return its address, or NULL
-      if that hwspinlock is already in use. Usually board code will
-      be calling this function in order to reserve specific hwspinlock
-      ids for predefined purposes.
--     Can be called from an atomic context (this function will not sleep) but
--     not from within interrupt context.
-+     Should be called from a process context (might sleep).
- 
-   int hwspin_lock_free(struct hwspinlock *hwlock);
-    - free a previously-assigned hwspinlock; returns 0 on success, or an
-      appropriate error code on failure (e.g. -EINVAL if the hwspinlock
-      is already free).
--     Can be called from an atomic context (this function will not sleep) but
--     not from within interrupt context.
-+     Should be called from a process context (might sleep).
- 
-   int hwspin_lock_timeout(struct hwspinlock *hwlock, unsigned int timeout);
-    - lock a previously-assigned hwspinlock with a timeout limit (specified in
-@@ -232,15 +229,14 @@ int hwspinlock_example2(void)
- 
-   int hwspin_lock_register(struct hwspinlock *hwlock);
-    - to be called from the underlying platform-specific implementation, in
--     order to register a new hwspinlock instance. Can be called from an atomic
--     context (this function will not sleep) but not from within interrupt
--     context. Returns 0 on success, or appropriate error code on failure.
-+     order to register a new hwspinlock instance. Should be called from
-+     a process context (this function might sleep).
-+     Returns 0 on success, or appropriate error code on failure.
- 
-   struct hwspinlock *hwspin_lock_unregister(unsigned int id);
-    - to be called from the underlying vendor-specific implementation, in order
-      to unregister an existing (and unused) hwspinlock instance.
--     Can be called from an atomic context (will not sleep) but not from
--     within interrupt context.
-+     Should be called from a process context (this function might sleep).
-      Returns the address of hwspinlock on success, or NULL on error (e.g.
-      if the hwspinlock is sill in use).
- 
-diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt
-index b24875b..6ade987 100644
---- a/Documentation/power/runtime_pm.txt
-+++ b/Documentation/power/runtime_pm.txt
-@@ -708,6 +708,16 @@ will behave normally, not taking the autosuspend delay into account.
- Similarly, if the power.use_autosuspend field isn't set then the autosuspend
- helper functions will behave just like the non-autosuspend counterparts.
- 
-+Under some circumstances a driver or subsystem may want to prevent a device
-+from autosuspending immediately, even though the usage counter is zero and the
-+autosuspend delay time has expired.  If the ->runtime_suspend() callback
-+returns -EAGAIN or -EBUSY, and if the next autosuspend delay expiration time is
-+in the future (as it normally would be if the callback invoked
-+pm_runtime_mark_last_busy()), the PM core will automatically reschedule the
-+autosuspend.  The ->runtime_suspend() callback can't do this rescheduling
-+itself because no suspend requests of any kind are accepted while the device is
-+suspending (i.e., while the callback is running).
-+
- The implementation is well suited for asynchronous use in interrupt contexts.
- However such use inevitably involves races, because the PM core can't
- synchronize ->runtime_suspend() callbacks with the arrival of I/O requests.
-diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt
-index e213f45..21fd05c 100644
---- a/Documentation/stable_kernel_rules.txt
-+++ b/Documentation/stable_kernel_rules.txt
-@@ -24,10 +24,10 @@ Rules on what kind of patches are accepted, and which ones are not, into the
- Procedure for submitting patches to the -stable tree:
- 
-  - Send the patch, after verifying that it follows the above rules, to
--   stable@kernel.org.  You must note the upstream commit ID in the changelog
--   of your submission.
-+   stable@vger.kernel.org.  You must note the upstream commit ID in the
-+   changelog of your submission.
-  - To have the patch automatically included in the stable tree, add the tag
--     Cc: stable@kernel.org
-+     Cc: stable@vger.kernel.org
-    in the sign-off area. Once the patch is merged it will be applied to
-    the stable tree without anything else needing to be done by the author
-    or subsystem maintainer.
-@@ -35,10 +35,10 @@ Procedure for submitting patches to the -stable tree:
-    cherry-picked than this can be specified in the following format in
-    the sign-off area:
- 
--     Cc: <stable@kernel.org> # .32.x: a1f84a3: sched: Check for idle
--     Cc: <stable@kernel.org> # .32.x: 1b9508f: sched: Rate-limit newidle
--     Cc: <stable@kernel.org> # .32.x: fd21073: sched: Fix affinity logic
--     Cc: <stable@kernel.org> # .32.x
-+     Cc: <stable@vger.kernel.org> # .32.x: a1f84a3: sched: Check for idle
-+     Cc: <stable@vger.kernel.org> # .32.x: 1b9508f: sched: Rate-limit newidle
-+     Cc: <stable@vger.kernel.org> # .32.x: fd21073: sched: Fix affinity logic
-+     Cc: <stable@vger.kernel.org> # .32.x
-     Signed-off-by: Ingo Molnar <mingo@elte.hu>
- 
-    The tag sequence has the meaning of:
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 187282d..34e2418 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -1221,7 +1221,7 @@ F:	Documentation/aoe/
- F:	drivers/block/aoe/
- 
- ATHEROS ATH GENERIC UTILITIES
--M:	"Luis R. Rodriguez" <lrodriguez@atheros.com>
-+M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
- L:	linux-wireless@vger.kernel.org
- S:	Supported
- F:	drivers/net/wireless/ath/*
-@@ -1229,7 +1229,7 @@ F:	drivers/net/wireless/ath/*
- ATHEROS ATH5K WIRELESS DRIVER
- M:	Jiri Slaby <jirislaby@gmail.com>
- M:	Nick Kossifidis <mickflemm@gmail.com>
--M:	"Luis R. Rodriguez" <lrodriguez@atheros.com>
-+M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
- M:	Bob Copeland <me@bobcopeland.com>
- L:	linux-wireless@vger.kernel.org
- L:	ath5k-devel@lists.ath5k.org
-@@ -1238,10 +1238,10 @@ S:	Maintained
- F:	drivers/net/wireless/ath/ath5k/
- 
- ATHEROS ATH9K WIRELESS DRIVER
--M:	"Luis R. Rodriguez" <lrodriguez@atheros.com>
--M:	Jouni Malinen <jmalinen@atheros.com>
--M:	Vasanthakumar Thiagarajan <vasanth@atheros.com>
--M:	Senthil Balasubramanian <senthilkumar@atheros.com>
-+M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
-+M:	Jouni Malinen <jouni@qca.qualcomm.com>
-+M:	Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
-+M:	Senthil Balasubramanian <senthilb@qca.qualcomm.com>
- L:	linux-wireless@vger.kernel.org
- L:	ath9k-devel@lists.ath9k.org
- W:	http://wireless.kernel.org/en/users/Drivers/ath9k
-@@ -1269,7 +1269,7 @@ F:	drivers/input/misc/ati_remote2.c
- ATLX ETHERNET DRIVERS
- M:	Jay Cliburn <jcliburn@gmail.com>
- M:	Chris Snook <chris.snook@gmail.com>
--M:	Jie Yang <jie.yang@atheros.com>
-+M:	Jie Yang <yangjie@qca.qualcomm.com>
- L:	netdev@vger.kernel.org
- W:	http://sourceforge.net/projects/atl1
- W:	http://atl1.sourceforge.net
-diff --git a/Makefile b/Makefile
-index 9f6e3cd..438c11a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- VERSION = 3
- PATCHLEVEL = 0
--SUBLEVEL = 8
-+SUBLEVEL = 9
- EXTRAVERSION =
- NAME = Sneaky Weasel
- 
-diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
-index 1da23bb..8aa104a 100644
---- a/arch/arm/mach-ux500/cpu.c
-+++ b/arch/arm/mach-ux500/cpu.c
-@@ -99,7 +99,27 @@ static void ux500_l2x0_inv_all(void)
- 	ux500_cache_sync();
- }
- 
--static int ux500_l2x0_init(void)
-+static int __init ux500_l2x0_unlock(void)
-+{
-+	int i;
-+
-+	/*
-+	 * Unlock Data and Instruction Lock if locked. Ux500 U-Boot versions
-+	 * apparently locks both caches before jumping to the kernel. The
-+	 * l2x0 core will not touch the unlock registers if the l2x0 is
-+	 * already enabled, so we do it right here instead. The PL310 has
-+	 * 8 sets of registers, one per possible CPU.
-+	 */
-+	for (i = 0; i < 8; i++) {
-+		writel_relaxed(0x0, l2x0_base + L2X0_LOCKDOWN_WAY_D_BASE +
-+			       i * L2X0_LOCKDOWN_STRIDE);
-+		writel_relaxed(0x0, l2x0_base + L2X0_LOCKDOWN_WAY_I_BASE +
-+			       i * L2X0_LOCKDOWN_STRIDE);
-+	}
-+	return 0;
-+}
-+
-+static int __init ux500_l2x0_init(void)
- {
- 	if (cpu_is_u5500())
- 		l2x0_base = __io_address(U5500_L2CC_BASE);
-@@ -108,6 +128,9 @@ static int ux500_l2x0_init(void)
- 	else
- 		ux500_unknown_soc();
- 
-+	/* Unlock before init */
-+	ux500_l2x0_unlock();
-+
- 	/* 64KB way size, 8 way associativity, force WA */
- 	l2x0_init(l2x0_base, 0x3e060000, 0xc0000fff);
- 
-diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h
-index ebbce33..4509956 100644
---- a/arch/arm/plat-mxc/include/mach/iomux-v3.h
-+++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h
-@@ -89,11 +89,11 @@ typedef u64 iomux_v3_cfg_t;
- #define PAD_CTL_HYS			(1 << 8)
- 
- #define PAD_CTL_PKE			(1 << 7)
--#define PAD_CTL_PUE			(1 << 6)
--#define PAD_CTL_PUS_100K_DOWN		(0 << 4)
--#define PAD_CTL_PUS_47K_UP		(1 << 4)
--#define PAD_CTL_PUS_100K_UP		(2 << 4)
--#define PAD_CTL_PUS_22K_UP		(3 << 4)
-+#define PAD_CTL_PUE			(1 << 6 | PAD_CTL_PKE)
-+#define PAD_CTL_PUS_100K_DOWN		(0 << 4 | PAD_CTL_PUE)
-+#define PAD_CTL_PUS_47K_UP		(1 << 4 | PAD_CTL_PUE)
-+#define PAD_CTL_PUS_100K_UP		(2 << 4 | PAD_CTL_PUE)
-+#define PAD_CTL_PUS_22K_UP		(3 << 4 | PAD_CTL_PUE)
- 
- #define PAD_CTL_ODE			(1 << 3)
- 
-diff --git a/arch/powerpc/include/asm/sparsemem.h b/arch/powerpc/include/asm/sparsemem.h
-index 54a47ea..0c5fa31 100644
---- a/arch/powerpc/include/asm/sparsemem.h
-+++ b/arch/powerpc/include/asm/sparsemem.h
-@@ -16,7 +16,7 @@
- #endif /* CONFIG_SPARSEMEM */
- 
- #ifdef CONFIG_MEMORY_HOTPLUG
--extern void create_section_mapping(unsigned long start, unsigned long end);
-+extern int create_section_mapping(unsigned long start, unsigned long end);
- extern int remove_section_mapping(unsigned long start, unsigned long end);
- #ifdef CONFIG_NUMA
- extern int hot_add_scn_to_nid(unsigned long scn_addr);
-diff --git a/arch/powerpc/mm/gup.c b/arch/powerpc/mm/gup.c
-index fec1320..d7efdbf 100644
---- a/arch/powerpc/mm/gup.c
-+++ b/arch/powerpc/mm/gup.c
-@@ -16,16 +16,6 @@
- 
- #ifdef __HAVE_ARCH_PTE_SPECIAL
- 
--static inline void get_huge_page_tail(struct page *page)
--{
--	/*
--	 * __split_huge_page_refcount() cannot run
--	 * from under us.
--	 */
--	VM_BUG_ON(atomic_read(&page->_count) < 0);
--	atomic_inc(&page->_count);
--}
--
- /*
-  * The performance critical leaf functions are made noinline otherwise gcc
-  * inlines everything into a single function which results in too much
-@@ -57,8 +47,6 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr,
- 			put_page(page);
- 			return 0;
- 		}
--		if (PageTail(page))
--			get_huge_page_tail(page);
- 		pages[*nr] = page;
- 		(*nr)++;
- 
-diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
-index 26b2872..07f9e9f 100644
---- a/arch/powerpc/mm/hash_utils_64.c
-+++ b/arch/powerpc/mm/hash_utils_64.c
-@@ -534,11 +534,11 @@ static unsigned long __init htab_get_table_size(void)
- }
- 
- #ifdef CONFIG_MEMORY_HOTPLUG
--void create_section_mapping(unsigned long start, unsigned long end)
-+int create_section_mapping(unsigned long start, unsigned long end)
- {
--	BUG_ON(htab_bolt_mapping(start, end, __pa(start),
-+	return htab_bolt_mapping(start, end, __pa(start),
- 				 pgprot_val(PAGE_KERNEL), mmu_linear_psize,
--				 mmu_kernel_ssize));
-+				 mmu_kernel_ssize);
- }
- 
- int remove_section_mapping(unsigned long start, unsigned long end)
-diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
-index 0b9a5c1..da5eb38 100644
---- a/arch/powerpc/mm/hugetlbpage.c
-+++ b/arch/powerpc/mm/hugetlbpage.c
-@@ -390,7 +390,7 @@ static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long add
- {
- 	unsigned long mask;
- 	unsigned long pte_end;
--	struct page *head, *page;
-+	struct page *head, *page, *tail;
- 	pte_t pte;
- 	int refs;
- 
-@@ -413,6 +413,7 @@ static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long add
- 	head = pte_page(pte);
- 
- 	page = head + ((addr & (sz-1)) >> PAGE_SHIFT);
-+	tail = page;
- 	do {
- 		VM_BUG_ON(compound_head(page) != head);
- 		pages[*nr] = page;
-@@ -428,10 +429,20 @@ static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long add
- 
- 	if (unlikely(pte_val(pte) != pte_val(*ptep))) {
- 		/* Could be optimized better */
--		while (*nr) {
--			put_page(page);
--			(*nr)--;
--		}
-+		*nr -= refs;
-+		while (refs--)
-+			put_page(head);
-+		return 0;
-+	}
-+
-+	/*
-+	 * Any tail page need their mapcount reference taken before we
-+	 * return.
-+	 */
-+	while (refs--) {
-+		if (PageTail(tail))
-+			get_huge_page_tail(tail);
-+		tail++;
- 	}
- 
- 	return 1;
-diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
-index 29d4dde..278ec8e 100644
---- a/arch/powerpc/mm/mem.c
-+++ b/arch/powerpc/mm/mem.c
-@@ -123,7 +123,8 @@ int arch_add_memory(int nid, u64 start, u64 size)
- 	pgdata = NODE_DATA(nid);
- 
- 	start = (unsigned long)__va(start);
--	create_section_mapping(start, start + size);
-+	if (create_section_mapping(start, start + size))
-+		return -EINVAL;
- 
- 	/* this should work for most non-highmem platforms */
- 	zone = pgdata->node_zones;
-diff --git a/arch/powerpc/mm/mmu_context_hash64.c b/arch/powerpc/mm/mmu_context_hash64.c
-index 3bafc3d..4ff587e 100644
---- a/arch/powerpc/mm/mmu_context_hash64.c
-+++ b/arch/powerpc/mm/mmu_context_hash64.c
-@@ -136,8 +136,8 @@ int use_cop(unsigned long acop, struct mm_struct *mm)
- 	if (!mm || !acop)
- 		return -EINVAL;
- 
--	/* We need to make sure mm_users doesn't change */
--	down_read(&mm->mmap_sem);
-+	/* The page_table_lock ensures mm_users won't change under us */
-+	spin_lock(&mm->page_table_lock);
- 	spin_lock(mm->context.cop_lockp);
- 
- 	if (mm->context.cop_pid == COP_PID_NONE) {
-@@ -164,7 +164,7 @@ int use_cop(unsigned long acop, struct mm_struct *mm)
- 
- out:
- 	spin_unlock(mm->context.cop_lockp);
--	up_read(&mm->mmap_sem);
-+	spin_unlock(&mm->page_table_lock);
- 
- 	return ret;
- }
-@@ -185,8 +185,8 @@ void drop_cop(unsigned long acop, struct mm_struct *mm)
- 	if (WARN_ON_ONCE(!mm))
- 		return;
- 
--	/* We need to make sure mm_users doesn't change */
--	down_read(&mm->mmap_sem);
-+	/* The page_table_lock ensures mm_users won't change under us */
-+	spin_lock(&mm->page_table_lock);
- 	spin_lock(mm->context.cop_lockp);
- 
- 	mm->context.acop &= ~acop;
-@@ -213,7 +213,7 @@ void drop_cop(unsigned long acop, struct mm_struct *mm)
- 	}
- 
- 	spin_unlock(mm->context.cop_lockp);
--	up_read(&mm->mmap_sem);
-+	spin_unlock(&mm->page_table_lock);
- }
- EXPORT_SYMBOL_GPL(drop_cop);
- 
-diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
-index 2164006..2c1ae7a 100644
---- a/arch/powerpc/mm/numa.c
-+++ b/arch/powerpc/mm/numa.c
-@@ -1214,11 +1214,12 @@ int hot_add_node_scn_to_nid(unsigned long scn_addr)
- 			break;
- 		}
- 
--		of_node_put(memory);
- 		if (nid >= 0)
- 			break;
- 	}
- 
-+	of_node_put(memory);
-+
- 	return nid;
- }
- 
-diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
-index 57ceb92..82766e5 100644
---- a/arch/powerpc/platforms/pseries/dlpar.c
-+++ b/arch/powerpc/platforms/pseries/dlpar.c
-@@ -112,6 +112,7 @@ void dlpar_free_cc_nodes(struct device_node *dn)
- 	dlpar_free_one_cc_node(dn);
- }
- 
-+#define COMPLETE	0
- #define NEXT_SIBLING    1
- #define NEXT_CHILD      2
- #define NEXT_PROPERTY   3
-@@ -158,6 +159,9 @@ struct device_node *dlpar_configure_connector(u32 drc_index)
- 		spin_unlock(&rtas_data_buf_lock);
- 
- 		switch (rc) {
-+		case COMPLETE:
-+			break;
-+
- 		case NEXT_SIBLING:
- 			dn = dlpar_parse_cc_node(ccwa);
- 			if (!dn)
-diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
-index 46b55cf..3608704 100644
---- a/arch/powerpc/platforms/pseries/eeh.c
-+++ b/arch/powerpc/platforms/pseries/eeh.c
-@@ -1338,7 +1338,7 @@ static const struct file_operations proc_eeh_operations = {
- static int __init eeh_init_proc(void)
- {
- 	if (machine_is(pseries))
--		proc_create("ppc64/eeh", 0, NULL, &proc_eeh_operations);
-+		proc_create("powerpc/eeh", 0, NULL, &proc_eeh_operations);
- 	return 0;
- }
- __initcall(eeh_init_proc);
-diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
-index ef86ad2..ae0e14b 100644
---- a/arch/s390/kernel/ptrace.c
-+++ b/arch/s390/kernel/ptrace.c
-@@ -47,29 +47,31 @@ enum s390_regset {
- 
- void update_per_regs(struct task_struct *task)
- {
--	static const struct per_regs per_single_step = {
--		.control = PER_EVENT_IFETCH,
--		.start = 0,
--		.end = PSW_ADDR_INSN,
--	};
- 	struct pt_regs *regs = task_pt_regs(task);
- 	struct thread_struct *thread = &task->thread;
--	const struct per_regs *new;
--	struct per_regs old;
--
--	/* TIF_SINGLE_STEP overrides the user specified PER registers. */
--	new = test_tsk_thread_flag(task, TIF_SINGLE_STEP) ?
--		&per_single_step : &thread->per_user;
-+	struct per_regs old, new;
-+
-+	/* Copy user specified PER registers */
-+	new.control = thread->per_user.control;
-+	new.start = thread->per_user.start;
-+	new.end = thread->per_user.end;
-+
-+	/* merge TIF_SINGLE_STEP into user specified PER registers. */
-+	if (test_tsk_thread_flag(task, TIF_SINGLE_STEP)) {
-+		new.control |= PER_EVENT_IFETCH;
-+		new.start = 0;
-+		new.end = PSW_ADDR_INSN;
-+	}
- 
- 	/* Take care of the PER enablement bit in the PSW. */
--	if (!(new->control & PER_EVENT_MASK)) {
-+	if (!(new.control & PER_EVENT_MASK)) {
- 		regs->psw.mask &= ~PSW_MASK_PER;
- 		return;
- 	}
- 	regs->psw.mask |= PSW_MASK_PER;
- 	__ctl_store(old, 9, 11);
--	if (memcmp(new, &old, sizeof(struct per_regs)) != 0)
--		__ctl_load(*new, 9, 11);
-+	if (memcmp(&new, &old, sizeof(struct per_regs)) != 0)
-+		__ctl_load(new, 9, 11);
- }
- 
- void user_enable_single_step(struct task_struct *task)
-diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
-index 67345ae..2ada634 100644
---- a/arch/s390/kvm/kvm-s390.c
-+++ b/arch/s390/kvm/kvm-s390.c
-@@ -301,11 +301,17 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
- struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
- 				      unsigned int id)
- {
--	struct kvm_vcpu *vcpu = kzalloc(sizeof(struct kvm_vcpu), GFP_KERNEL);
--	int rc = -ENOMEM;
-+	struct kvm_vcpu *vcpu;
-+	int rc = -EINVAL;
-+
-+	if (id >= KVM_MAX_VCPUS)
-+		goto out;
-+
-+	rc = -ENOMEM;
- 
-+	vcpu = kzalloc(sizeof(struct kvm_vcpu), GFP_KERNEL);
- 	if (!vcpu)
--		goto out_nomem;
-+		goto out;
- 
- 	vcpu->arch.sie_block = (struct kvm_s390_sie_block *)
- 					get_zeroed_page(GFP_KERNEL);
-@@ -341,7 +347,7 @@ out_free_sie_block:
- 	free_page((unsigned long)(vcpu->arch.sie_block));
- out_free_cpu:
- 	kfree(vcpu);
--out_nomem:
-+out:
- 	return ERR_PTR(rc);
- }
- 
-diff --git a/arch/s390/mm/gup.c b/arch/s390/mm/gup.c
-index 45b405c..65cb06e 100644
---- a/arch/s390/mm/gup.c
-+++ b/arch/s390/mm/gup.c
-@@ -52,7 +52,7 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr,
- 		unsigned long end, int write, struct page **pages, int *nr)
- {
- 	unsigned long mask, result;
--	struct page *head, *page;
-+	struct page *head, *page, *tail;
- 	int refs;
- 
- 	result = write ? 0 : _SEGMENT_ENTRY_RO;
-@@ -64,6 +64,7 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr,
- 	refs = 0;
- 	head = pmd_page(pmd);
- 	page = head + ((addr & ~PMD_MASK) >> PAGE_SHIFT);
-+	tail = page;
- 	do {
- 		VM_BUG_ON(compound_head(page) != head);
- 		pages[*nr] = page;
-@@ -81,6 +82,17 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr,
- 		*nr -= refs;
- 		while (refs--)
- 			put_page(head);
-+		return 0;
-+	}
-+
-+	/*
-+	 * Any tail page need their mapcount reference taken before we
-+	 * return.
-+	 */
-+	while (refs--) {
-+		if (PageTail(tail))
-+			get_huge_page_tail(tail);
-+		tail++;
- 	}
- 
- 	return 1;
-diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
-index 37a23c22..458893f 100644
---- a/arch/s390/mm/pgtable.c
-+++ b/arch/s390/mm/pgtable.c
-@@ -291,8 +291,9 @@ void page_table_free_rcu(struct mmu_gather *tlb, unsigned long *table)
- 
- void __tlb_remove_table(void *_table)
- {
--	void *table = (void *)((unsigned long) _table & PAGE_MASK);
--	unsigned type = (unsigned long) _table & ~PAGE_MASK;
-+	const unsigned long mask = (FRAG_MASK << 4) | FRAG_MASK;
-+	void *table = (void *)((unsigned long) _table & ~mask);
-+	unsigned type = (unsigned long) _table & mask;
- 
- 	if (type)
- 		__page_table_free_rcu(table, type);
-diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
-index 620f5b7..0491e40 100644
---- a/arch/um/drivers/ubd_kern.c
-+++ b/arch/um/drivers/ubd_kern.c
-@@ -513,8 +513,37 @@ __uml_exitcall(kill_io_thread);
- static inline int ubd_file_size(struct ubd *ubd_dev, __u64 *size_out)
- {
- 	char *file;
-+	int fd;
-+	int err;
-+
-+	__u32 version;
-+	__u32 align;
-+	char *backing_file;
-+	time_t mtime;
-+	unsigned long long size;
-+	int sector_size;
-+	int bitmap_offset;
-+
-+	if (ubd_dev->file && ubd_dev->cow.file) {
-+		file = ubd_dev->cow.file;
-+
-+		goto out;
-+	}
- 
--	file = ubd_dev->cow.file ? ubd_dev->cow.file : ubd_dev->file;
-+	fd = os_open_file(ubd_dev->file, global_openflags, 0);
-+	if (fd < 0)
-+		return fd;
-+
-+	err = read_cow_header(file_reader, &fd, &version, &backing_file, \
-+		&mtime, &size, &sector_size, &align, &bitmap_offset);
-+	os_close_file(fd);
-+
-+	if(err == -EINVAL)
-+		file = ubd_dev->file;
-+	else
-+		file = backing_file;
-+
-+out:
- 	return os_file_size(file, size_out);
- }
- 
-diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
-index 4a0b7c7..244ac77 100644
---- a/arch/x86/include/asm/apic.h
-+++ b/arch/x86/include/asm/apic.h
-@@ -495,7 +495,7 @@ static inline void default_wait_for_init_deassert(atomic_t *deassert)
- 	return;
- }
- 
--extern struct apic *generic_bigsmp_probe(void);
-+extern void generic_bigsmp_probe(void);
- 
- 
- #ifdef CONFIG_X86_LOCAL_APIC
-diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h
-index a291c40..5d62d65 100644
---- a/arch/x86/include/asm/uv/uv_bau.h
-+++ b/arch/x86/include/asm/uv/uv_bau.h
-@@ -55,6 +55,7 @@
- #define UV_BAU_TUNABLES_DIR		"sgi_uv"
- #define UV_BAU_TUNABLES_FILE		"bau_tunables"
- #define WHITESPACE			" \t\n"
-+#define uv_mmask			((1UL << uv_hub_info->m_val) - 1)
- #define uv_physnodeaddr(x)		((__pa((unsigned long)(x)) & uv_mmask))
- #define cpubit_isset(cpu, bau_local_cpumask) \
- 	test_bit((cpu), (bau_local_cpumask).bits)
-diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
-index f26544a..54a13aa 100644
---- a/arch/x86/include/asm/uv/uv_hub.h
-+++ b/arch/x86/include/asm/uv/uv_hub.h
-@@ -46,6 +46,13 @@
-  *	PNODE   - the low N bits of the GNODE. The PNODE is the most useful variant
-  *		  of the nasid for socket usage.
-  *
-+ *	GPA	- (global physical address) a socket physical address converted
-+ *		  so that it can be used by the GRU as a global address. Socket
-+ *		  physical addresses 1) need additional NASID (node) bits added
-+ *		  to the high end of the address, and 2) unaliased if the
-+ *		  partition does not have a physical address 0. In addition, on
-+ *		  UV2 rev 1, GPAs need the gnode left shifted to bits 39 or 40.
-+ *
-  *
-  *  NumaLink Global Physical Address Format:
-  *  +--------------------------------+---------------------+
-@@ -141,6 +148,8 @@ struct uv_hub_info_s {
- 	unsigned int		gnode_extra;
- 	unsigned char		hub_revision;
- 	unsigned char		apic_pnode_shift;
-+	unsigned char		m_shift;
-+	unsigned char		n_lshift;
- 	unsigned long		gnode_upper;
- 	unsigned long		lowmem_remap_top;
- 	unsigned long		lowmem_remap_base;
-@@ -177,6 +186,16 @@ static inline int is_uv2_hub(void)
- 	return uv_hub_info->hub_revision >= UV2_HUB_REVISION_BASE;
- }
- 
-+static inline int is_uv2_1_hub(void)
-+{
-+	return uv_hub_info->hub_revision == UV2_HUB_REVISION_BASE;
-+}
-+
-+static inline int is_uv2_2_hub(void)
-+{
-+	return uv_hub_info->hub_revision == UV2_HUB_REVISION_BASE + 1;
-+}
-+
- union uvh_apicid {
-     unsigned long       v;
-     struct uvh_apicid_s {
-@@ -276,7 +295,10 @@ static inline unsigned long uv_soc_phys_ram_to_gpa(unsigned long paddr)
- {
- 	if (paddr < uv_hub_info->lowmem_remap_top)
- 		paddr |= uv_hub_info->lowmem_remap_base;
--	return paddr | uv_hub_info->gnode_upper;
-+	paddr |= uv_hub_info->gnode_upper;
-+	paddr = ((paddr << uv_hub_info->m_shift) >> uv_hub_info->m_shift) |
-+		((paddr >> uv_hub_info->m_val) << uv_hub_info->n_lshift);
-+	return paddr;
- }
- 
- 
-@@ -300,16 +322,19 @@ static inline unsigned long uv_gpa_to_soc_phys_ram(unsigned long gpa)
- 	unsigned long remap_base = uv_hub_info->lowmem_remap_base;
- 	unsigned long remap_top =  uv_hub_info->lowmem_remap_top;
- 
-+	gpa = ((gpa << uv_hub_info->m_shift) >> uv_hub_info->m_shift) |
-+		((gpa >> uv_hub_info->n_lshift) << uv_hub_info->m_val);
-+	gpa = gpa & uv_hub_info->gpa_mask;
- 	if (paddr >= remap_base && paddr < remap_base + remap_top)
- 		paddr -= remap_base;
- 	return paddr;
- }
- 
- 
--/* gnode -> pnode */
-+/* gpa -> pnode */
- static inline unsigned long uv_gpa_to_gnode(unsigned long gpa)
- {
--	return gpa >> uv_hub_info->m_val;
-+	return gpa >> uv_hub_info->n_lshift;
- }
- 
- /* gpa -> pnode */
-@@ -320,6 +345,12 @@ static inline int uv_gpa_to_pnode(unsigned long gpa)
- 	return uv_gpa_to_gnode(gpa) & n_mask;
- }
- 
-+/* gpa -> node offset*/
-+static inline unsigned long uv_gpa_to_offset(unsigned long gpa)
-+{
-+	return (gpa << uv_hub_info->m_shift) >> uv_hub_info->m_shift;
-+}
-+
- /* pnode, offset --> socket virtual */
- static inline void *uv_pnode_offset_to_vaddr(int pnode, unsigned long offset)
- {
-diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
-index d3d9d50..bfd75ff 100644
---- a/arch/x86/kernel/amd_iommu.c
-+++ b/arch/x86/kernel/amd_iommu.c
-@@ -1203,7 +1203,7 @@ static int alloc_new_range(struct dma_ops_domain *dma_dom,
- 		if (!pte || !IOMMU_PTE_PRESENT(*pte))
- 			continue;
- 
--		dma_ops_reserve_addresses(dma_dom, i << PAGE_SHIFT, 1);
-+		dma_ops_reserve_addresses(dma_dom, i >> PAGE_SHIFT, 1);
- 	}
- 
- 	update_domain(&dma_dom->domain);
-diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
-index efd737e..521bead 100644
---- a/arch/x86/kernel/apic/bigsmp_32.c
-+++ b/arch/x86/kernel/apic/bigsmp_32.c
-@@ -255,12 +255,24 @@ static struct apic apic_bigsmp = {
- 	.x86_32_early_logical_apicid	= bigsmp_early_logical_apicid,
- };
- 
--struct apic * __init generic_bigsmp_probe(void)
-+void __init generic_bigsmp_probe(void)
- {
--	if (probe_bigsmp())
--		return &apic_bigsmp;
-+	unsigned int cpu;
- 
--	return NULL;
-+	if (!probe_bigsmp())
-+		return;
-+
-+	apic = &apic_bigsmp;
-+
-+	for_each_possible_cpu(cpu) {
-+		if (early_per_cpu(x86_cpu_to_logical_apicid,
-+				  cpu) == BAD_APICID)
-+			continue;
-+		early_per_cpu(x86_cpu_to_logical_apicid, cpu) =
-+			bigsmp_early_logical_apicid(cpu);
-+	}
-+
-+	pr_info("Overriding APIC driver with %s\n", apic_bigsmp.name);
- }
- 
- apic_driver(apic_bigsmp);
-diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
-index b5254ad..0787bb3 100644
---- a/arch/x86/kernel/apic/probe_32.c
-+++ b/arch/x86/kernel/apic/probe_32.c
-@@ -200,14 +200,8 @@ void __init default_setup_apic_routing(void)
- 	 * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support
- 	 */
- 
--	if (!cmdline_apic && apic == &apic_default) {
--		struct apic *bigsmp = generic_bigsmp_probe();
--		if (bigsmp) {
--			apic = bigsmp;
--			printk(KERN_INFO "Overriding APIC driver with %s\n",
--			       apic->name);
--		}
--	}
-+	if (!cmdline_apic && apic == &apic_default)
-+		generic_bigsmp_probe();
- #endif
- 
- 	if (apic->setup_apic_routing)
-diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
-index 34b1859..cfeb978 100644
---- a/arch/x86/kernel/apic/x2apic_uv_x.c
-+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
-@@ -832,6 +832,10 @@ void __init uv_system_init(void)
- 		uv_cpu_hub_info(cpu)->apic_pnode_shift = uvh_apicid.s.pnode_shift;
- 		uv_cpu_hub_info(cpu)->hub_revision = uv_hub_info->hub_revision;
- 
-+		uv_cpu_hub_info(cpu)->m_shift = 64 - m_val;
-+		uv_cpu_hub_info(cpu)->n_lshift = is_uv2_1_hub() ?
-+				(m_val == 40 ? 40 : 39) : m_val;
-+
- 		pnode = uv_apicid_to_pnode(apicid);
- 		blade = boot_pnode_to_blade(pnode);
- 		lcpu = uv_blade_info[blade].nr_possible_cpus;
-@@ -862,8 +866,7 @@ void __init uv_system_init(void)
- 		if (uv_node_to_blade[nid] >= 0)
- 			continue;
- 		paddr = node_start_pfn(nid) << PAGE_SHIFT;
--		paddr = uv_soc_phys_ram_to_gpa(paddr);
--		pnode = (paddr >> m_val) & pnode_mask;
-+		pnode = uv_gpa_to_pnode(uv_soc_phys_ram_to_gpa(paddr));
- 		blade = boot_pnode_to_blade(pnode);
- 		uv_node_to_blade[nid] = blade;
- 	}
-diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
-index f1a6244..794bc95 100644
---- a/arch/x86/kernel/kprobes.c
-+++ b/arch/x86/kernel/kprobes.c
-@@ -75,8 +75,10 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
- 	/*
- 	 * Undefined/reserved opcodes, conditional jump, Opcode Extension
- 	 * Groups, and some special opcodes can not boost.
-+	 * This is non-const to keep gcc from statically optimizing it out, as
-+	 * variable_test_bit makes gcc think only *(unsigned long*) is used.
- 	 */
--static const u32 twobyte_is_boostable[256 / 32] = {
-+static u32 twobyte_is_boostable[256 / 32] = {
- 	/*      0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f          */
- 	/*      ----------------------------------------------          */
- 	W(0x00, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0) | /* 00 */
-diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
-index dbe34b9..ea30585 100644
---- a/arch/x86/mm/gup.c
-+++ b/arch/x86/mm/gup.c
-@@ -108,16 +108,6 @@ static inline void get_head_page_multiple(struct page *page, int nr)
- 	SetPageReferenced(page);
- }
- 
--static inline void get_huge_page_tail(struct page *page)
--{
--	/*
--	 * __split_huge_page_refcount() cannot run
--	 * from under us.
--	 */
--	VM_BUG_ON(atomic_read(&page->_count) < 0);
--	atomic_inc(&page->_count);
--}
--
- static noinline int gup_huge_pmd(pmd_t pmd, unsigned long addr,
- 		unsigned long end, int write, struct page **pages, int *nr)
- {
-diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
-index 68e467f..82cff4a 100644
---- a/arch/x86/platform/uv/tlb_uv.c
-+++ b/arch/x86/platform/uv/tlb_uv.c
-@@ -115,9 +115,6 @@ early_param("nobau", setup_nobau);
- 
- /* base pnode in this partition */
- static int uv_base_pnode __read_mostly;
--/* position of pnode (which is nasid>>1): */
--static int uv_nshift __read_mostly;
--static unsigned long uv_mmask __read_mostly;
- 
- static DEFINE_PER_CPU(struct ptc_stats, ptcstats);
- static DEFINE_PER_CPU(struct bau_control, bau_control);
-@@ -1426,7 +1423,7 @@ static void activation_descriptor_init(int node, int pnode, int base_pnode)
- {
- 	int i;
- 	int cpu;
--	unsigned long pa;
-+	unsigned long gpa;
- 	unsigned long m;
- 	unsigned long n;
- 	size_t dsize;
-@@ -1442,9 +1439,9 @@ static void activation_descriptor_init(int node, int pnode, int base_pnode)
- 	bau_desc = kmalloc_node(dsize, GFP_KERNEL, node);
- 	BUG_ON(!bau_desc);
- 
--	pa = uv_gpa(bau_desc); /* need the real nasid*/
--	n = pa >> uv_nshift;
--	m = pa & uv_mmask;
-+	gpa = uv_gpa(bau_desc);
-+	n = uv_gpa_to_gnode(gpa);
-+	m = uv_gpa_to_offset(gpa);
- 
- 	/* the 14-bit pnode */
- 	write_mmr_descriptor_base(pnode, (n << UV_DESC_PSHIFT | m));
-@@ -1516,9 +1513,9 @@ static void pq_init(int node, int pnode)
- 		bcp->queue_last		= pqp + (DEST_Q_SIZE - 1);
- 	}
- 	/*
--	 * need the pnode of where the memory was really allocated
-+	 * need the gnode of where the memory was really allocated
- 	 */
--	pn = uv_gpa(pqp) >> uv_nshift;
-+	pn = uv_gpa_to_gnode(uv_gpa(pqp));
- 	first = uv_physnodeaddr(pqp);
- 	pn_first = ((unsigned long)pn << UV_PAYLOADQ_PNODE_SHIFT) | first;
- 	last = uv_physnodeaddr(pqp + (DEST_Q_SIZE - 1));
-@@ -1812,8 +1809,6 @@ static int __init uv_bau_init(void)
- 		zalloc_cpumask_var_node(mask, GFP_KERNEL, cpu_to_node(cur_cpu));
- 	}
- 
--	uv_nshift = uv_hub_info->m_val;
--	uv_mmask = (1UL << uv_hub_info->m_val) - 1;
- 	nuvhubs = uv_num_possible_blades();
- 	spin_lock_init(&disable_lock);
- 	congested_cycles = usec_2_cycles(congested_respns_us);
-diff --git a/block/genhd.c b/block/genhd.c
-index 3608289..8c0829a 100644
---- a/block/genhd.c
-+++ b/block/genhd.c
-@@ -611,6 +611,12 @@ void add_disk(struct gendisk *disk)
- 	register_disk(disk);
- 	blk_register_queue(disk);
- 
-+	/*
-+	 * Take an extra ref on queue which will be put on disk_release()
-+	 * so that it sticks around as long as @disk is there.
-+	 */
-+	WARN_ON_ONCE(blk_get_queue(disk->queue));
-+
- 	retval = sysfs_create_link(&disk_to_dev(disk)->kobj, &bdi->dev->kobj,
- 				   "bdi");
- 	WARN_ON(retval);
-@@ -1103,6 +1109,8 @@ static void disk_release(struct device *dev)
- 	disk_replace_part_tbl(disk, NULL);
- 	free_part_stats(&disk->part0);
- 	free_part_info(&disk->part0);
-+	if (disk->queue)
-+		blk_put_queue(disk->queue);
- 	kfree(disk);
- }
- struct class block_class = {
-diff --git a/crypto/cryptd.c b/crypto/cryptd.c
-index e46d21a..671d4d6 100644
---- a/crypto/cryptd.c
-+++ b/crypto/cryptd.c
-@@ -945,7 +945,7 @@ static void __exit cryptd_exit(void)
- 	crypto_unregister_template(&cryptd_tmpl);
- }
- 
--module_init(cryptd_init);
-+subsys_initcall(cryptd_init);
- module_exit(cryptd_exit);
- 
- MODULE_LICENSE("GPL");
-diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c
-index 7489b89..f151afe 100644
---- a/drivers/acpi/atomicio.c
-+++ b/drivers/acpi/atomicio.c
-@@ -76,7 +76,7 @@ static void __iomem *__acpi_ioremap_fast(phys_addr_t paddr,
- {
- 	struct acpi_iomap *map;
- 
--	map = __acpi_find_iomap(paddr, size);
-+	map = __acpi_find_iomap(paddr, size/8);
- 	if (map)
- 		return map->vaddr + (paddr - map->paddr);
- 	else
-diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
-index 6f6e771..6da6deb 100644
---- a/drivers/ata/ata_piix.c
-+++ b/drivers/ata/ata_piix.c
-@@ -113,6 +113,8 @@ enum {
- 	PIIX_PATA_FLAGS		= ATA_FLAG_SLAVE_POSS,
- 	PIIX_SATA_FLAGS		= ATA_FLAG_SATA | PIIX_FLAG_CHECKINTR,
- 
-+	PIIX_FLAG_PIO16		= (1 << 30), /*support 16bit PIO only*/
-+
- 	PIIX_80C_PRI		= (1 << 5) | (1 << 4),
- 	PIIX_80C_SEC		= (1 << 7) | (1 << 6),
- 
-@@ -147,6 +149,7 @@ enum piix_controller_ids {
- 	ich8m_apple_sata,	/* locks up on second port enable */
- 	tolapai_sata,
- 	piix_pata_vmw,			/* PIIX4 for VMware, spurious DMA_ERR */
-+	ich8_sata_snb,
- };
- 
- struct piix_map_db {
-@@ -177,6 +180,7 @@ static int piix_sidpr_scr_write(struct ata_link *link,
- static int piix_sidpr_set_lpm(struct ata_link *link, enum ata_lpm_policy policy,
- 			      unsigned hints);
- static bool piix_irq_check(struct ata_port *ap);
-+static int piix_port_start(struct ata_port *ap);
- #ifdef CONFIG_PM
- static int piix_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);
- static int piix_pci_device_resume(struct pci_dev *pdev);
-@@ -298,21 +302,21 @@ static const struct pci_device_id piix_pci_tbl[] = {
- 	/* SATA Controller IDE (PCH) */
- 	{ 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
- 	/* SATA Controller IDE (CPT) */
--	{ 0x8086, 0x1c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
-+	{ 0x8086, 0x1c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
- 	/* SATA Controller IDE (CPT) */
--	{ 0x8086, 0x1c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
-+	{ 0x8086, 0x1c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
- 	/* SATA Controller IDE (CPT) */
- 	{ 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
- 	/* SATA Controller IDE (CPT) */
- 	{ 0x8086, 0x1c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
- 	/* SATA Controller IDE (PBG) */
--	{ 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
-+	{ 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
- 	/* SATA Controller IDE (PBG) */
- 	{ 0x8086, 0x1d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
- 	/* SATA Controller IDE (Panther Point) */
--	{ 0x8086, 0x1e00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
-+	{ 0x8086, 0x1e00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
- 	/* SATA Controller IDE (Panther Point) */
--	{ 0x8086, 0x1e01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
-+	{ 0x8086, 0x1e01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
- 	/* SATA Controller IDE (Panther Point) */
- 	{ 0x8086, 0x1e08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
- 	/* SATA Controller IDE (Panther Point) */
-@@ -338,6 +342,7 @@ static struct scsi_host_template piix_sht = {
- static struct ata_port_operations piix_sata_ops = {
- 	.inherits		= &ata_bmdma32_port_ops,
- 	.sff_irq_check		= piix_irq_check,
-+	.port_start		= piix_port_start,
- };
- 
- static struct ata_port_operations piix_pata_ops = {
-@@ -478,6 +483,7 @@ static const struct piix_map_db *piix_map_db_table[] = {
- 	[ich8_2port_sata]	= &ich8_2port_map_db,
- 	[ich8m_apple_sata]	= &ich8m_apple_map_db,
- 	[tolapai_sata]		= &tolapai_map_db,
-+	[ich8_sata_snb]		= &ich8_map_db,
- };
- 
- static struct ata_port_info piix_port_info[] = {
-@@ -606,6 +612,19 @@ static struct ata_port_info piix_port_info[] = {
- 		.port_ops	= &piix_vmw_ops,
- 	},
- 
-+	/*
-+	 * some Sandybridge chipsets have broken 32 mode up to now,
-+	 * see https://bugzilla.kernel.org/show_bug.cgi?id=40592
-+	 */
-+	[ich8_sata_snb] =
-+	{
-+		.flags		= PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR | PIIX_FLAG_PIO16,
-+		.pio_mask	= ATA_PIO4,
-+		.mwdma_mask	= ATA_MWDMA2,
-+		.udma_mask	= ATA_UDMA6,
-+		.port_ops	= &piix_sata_ops,
-+	},
-+
- };
- 
- static struct pci_bits piix_enable_bits[] = {
-@@ -649,6 +668,14 @@ static const struct ich_laptop ich_laptop[] = {
- 	{ 0, }
- };
- 
-+static int piix_port_start(struct ata_port *ap)
-+{
-+	if (!(ap->flags & PIIX_FLAG_PIO16))
-+		ap->pflags |= ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE;
-+
-+	return ata_bmdma_port_start(ap);
-+}
-+
- /**
-  *	ich_pata_cable_detect - Probe host controller cable detect info
-  *	@ap: Port for which cable detect info is desired
-diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
-index 0d4587b..1023392 100644
---- a/drivers/base/power/runtime.c
-+++ b/drivers/base/power/runtime.c
-@@ -278,6 +278,9 @@ static int rpm_callback(int (*cb)(struct device *), struct device *dev)
-  * If a deferred resume was requested while the callback was running then carry
-  * it out; otherwise send an idle notification for the device (if the suspend
-  * failed) or for its parent (if the suspend succeeded).
-+ * If ->runtime_suspend failed with -EAGAIN or -EBUSY, and if the RPM_AUTO
-+ * flag is set and the next autosuspend-delay expiration time is in the
-+ * future, schedule another autosuspend attempt.
-  *
-  * This function must be called under dev->power.lock with interrupts disabled.
-  */
-@@ -389,10 +392,21 @@ static int rpm_suspend(struct device *dev, int rpmflags)
- 	if (retval) {
- 		__update_runtime_status(dev, RPM_ACTIVE);
- 		dev->power.deferred_resume = 0;
--		if (retval == -EAGAIN || retval == -EBUSY)
-+		if (retval == -EAGAIN || retval == -EBUSY) {
- 			dev->power.runtime_error = 0;
--		else
-+
-+			/*
-+			 * If the callback routine failed an autosuspend, and
-+			 * if the last_busy time has been updated so that there
-+			 * is a new autosuspend expiration time, automatically
-+			 * reschedule another autosuspend.
-+			 */
-+			if ((rpmflags & RPM_AUTO) &&
-+			    pm_runtime_autosuspend_expiration(dev) != 0)
-+				goto repeat;
-+		} else {
- 			pm_runtime_cancel_pending(dev);
-+		}
- 	} else {
-  no_callback:
- 		__update_runtime_status(dev, RPM_SUSPENDED);
-diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
-index 8f4ef65..c2f9b3e 100644
---- a/drivers/block/cciss.c
-+++ b/drivers/block/cciss.c
-@@ -4533,6 +4533,13 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev,
- 		pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
- 		pmcsr |= PCI_D0;
- 		pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr);
-+
-+		/*
-+		 * The P600 requires a small delay when changing states.
-+		 * Otherwise we may think the board did not reset and we bail.
-+		 * This for kdump only and is particular to the P600.
-+		 */
-+		msleep(500);
- 	}
- 	return 0;
- }
-diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
-index 5cf2993..54139d0 100644
---- a/drivers/block/xen-blkback/blkback.c
-+++ b/drivers/block/xen-blkback/blkback.c
-@@ -667,7 +667,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
- 
- 	if (operation == READ)
- 		blkif->st_rd_sect += preq.nr_sects;
--	else if (operation == WRITE || operation == WRITE_FLUSH)
-+	else if (operation & WRITE)
- 		blkif->st_wr_sect += preq.nr_sects;
- 
- 	return 0;
-diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
-index 6bacef3..db7cb81 100644
---- a/drivers/bluetooth/ath3k.c
-+++ b/drivers/bluetooth/ath3k.c
-@@ -63,6 +63,7 @@ static struct usb_device_id ath3k_table[] = {
- 	/* Atheros AR3011 with sflash firmware*/
- 	{ USB_DEVICE(0x0CF3, 0x3002) },
- 	{ USB_DEVICE(0x13d3, 0x3304) },
-+	{ USB_DEVICE(0x0930, 0x0215) },
- 
- 	/* Atheros AR9285 Malbec with sflash firmware */
- 	{ USB_DEVICE(0x03F0, 0x311D) },
-@@ -375,6 +376,11 @@ static int ath3k_probe(struct usb_interface *intf,
- 
- 	/* load patch and sysconfig files for AR3012 */
- 	if (id->driver_info & BTUSB_ATH3012) {
-+
-+		/* New firmware with patch and sysconfig files already loaded */
-+		if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x0001)
-+			return -ENODEV;
-+
- 		ret = ath3k_load_patch(udev);
- 		if (ret < 0) {
- 			BT_ERR("Loading patch file failed");
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index c2de895..b9af6db 100644
---- a/drivers/bluetooth/btusb.c
-+++ b/drivers/bluetooth/btusb.c
-@@ -54,11 +54,15 @@ static struct usb_driver btusb_driver;
- #define BTUSB_BCM92035		0x10
- #define BTUSB_BROKEN_ISOC	0x20
- #define BTUSB_WRONG_SCO_MTU	0x40
-+#define BTUSB_ATH3012		0x80
- 
- static struct usb_device_id btusb_table[] = {
- 	/* Generic Bluetooth USB device */
- 	{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) },
- 
-+	/* Broadcom SoftSailing reporting vendor specific */
-+	{ USB_DEVICE(0x05ac, 0x21e1) },
-+
- 	/* Apple MacBookPro 7,1 */
- 	{ USB_DEVICE(0x05ac, 0x8213) },
- 
-@@ -71,9 +75,15 @@ static struct usb_device_id btusb_table[] = {
- 	/* Apple MacBookAir3,1, MacBookAir3,2 */
- 	{ USB_DEVICE(0x05ac, 0x821b) },
- 
-+	/* Apple MacBookAir4,1 */
-+	{ USB_DEVICE(0x05ac, 0x821f) },
-+
- 	/* Apple MacBookPro8,2 */
- 	{ USB_DEVICE(0x05ac, 0x821a) },
- 
-+	/* Apple MacMini5,1 */
-+	{ USB_DEVICE(0x05ac, 0x8281) },
-+
- 	/* AVM BlueFRITZ! USB v2.0 */
- 	{ USB_DEVICE(0x057c, 0x3800) },
- 
-@@ -105,12 +115,13 @@ static struct usb_device_id blacklist_table[] = {
- 	/* Atheros 3011 with sflash firmware */
- 	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
- 	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
-+	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
- 
- 	/* Atheros AR9285 Malbec with sflash firmware */
- 	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
- 
- 	/* Atheros 3012 with sflash firmware */
--	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_IGNORE },
-+	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
- 
- 	/* Atheros AR5BBU12 with sflash firmware */
- 	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
-@@ -914,6 +925,15 @@ static int btusb_probe(struct usb_interface *intf,
- 	if (ignore_sniffer && id->driver_info & BTUSB_SNIFFER)
- 		return -ENODEV;
- 
-+	if (id->driver_info & BTUSB_ATH3012) {
-+		struct usb_device *udev = interface_to_usbdev(intf);
-+
-+		/* Old firmware would otherwise let ath3k driver load
-+		 * patch and sysconfig files */
-+		if (le16_to_cpu(udev->descriptor.bcdDevice) <= 0x0001)
-+			return -ENODEV;
-+	}
-+
- 	data = kzalloc(sizeof(*data), GFP_KERNEL);
- 	if (!data)
- 		return -ENOMEM;
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index e2aced6..14264a8 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -1658,6 +1658,31 @@ g4x_dp_detect(struct intel_dp *intel_dp)
- 	return status;
- }
- 
-+static struct edid *
-+intel_dp_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
-+{
-+	struct intel_dp *intel_dp = intel_attached_dp(connector);
-+	struct edid	*edid;
-+
-+	ironlake_edp_panel_vdd_on(intel_dp);
-+	edid = drm_get_edid(connector, adapter);
-+	ironlake_edp_panel_vdd_off(intel_dp);
-+	return edid;
-+}
-+
-+static int
-+intel_dp_get_edid_modes(struct drm_connector *connector, struct i2c_adapter *adapter)
-+{
-+	struct intel_dp *intel_dp = intel_attached_dp(connector);
-+	int	ret;
-+
-+	ironlake_edp_panel_vdd_on(intel_dp);
-+	ret = intel_ddc_get_modes(connector, adapter);
-+	ironlake_edp_panel_vdd_off(intel_dp);
-+	return ret;
-+}
-+
-+
- /**
-  * Uses CRT_HOTPLUG_EN and CRT_HOTPLUG_STAT to detect DP connection.
-  *
-@@ -1684,7 +1709,7 @@ intel_dp_detect(struct drm_connector *connector, bool force)
- 	if (intel_dp->force_audio) {
- 		intel_dp->has_audio = intel_dp->force_audio > 0;
- 	} else {
--		edid = drm_get_edid(connector, &intel_dp->adapter);
-+		edid = intel_dp_get_edid(connector, &intel_dp->adapter);
- 		if (edid) {
- 			intel_dp->has_audio = drm_detect_monitor_audio(edid);
- 			connector->display_info.raw_edid = NULL;
-@@ -1705,7 +1730,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)
- 	/* We should parse the EDID data and find out if it has an audio sink
- 	 */
- 
--	ret = intel_ddc_get_modes(connector, &intel_dp->adapter);
-+	ret = intel_dp_get_edid_modes(connector, &intel_dp->adapter);
- 	if (ret) {
- 		if (is_edp(intel_dp) && !dev_priv->panel_fixed_mode) {
- 			struct drm_display_mode *newmode;
-@@ -1741,7 +1766,7 @@ intel_dp_detect_audio(struct drm_connector *connector)
- 	struct edid *edid;
- 	bool has_audio = false;
- 
--	edid = drm_get_edid(connector, &intel_dp->adapter);
-+	edid = intel_dp_get_edid(connector, &intel_dp->adapter);
- 	if (edid) {
- 		has_audio = drm_detect_monitor_audio(edid);
- 
-diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
-index 05f500c..f8aa821 100644
---- a/drivers/gpu/drm/i915/intel_panel.c
-+++ b/drivers/gpu/drm/i915/intel_panel.c
-@@ -226,7 +226,7 @@ static void intel_pch_panel_set_backlight(struct drm_device *dev, u32 level)
- 	I915_WRITE(BLC_PWM_CPU_CTL, val | level);
- }
- 
--void intel_panel_set_backlight(struct drm_device *dev, u32 level)
-+static void intel_panel_actually_set_backlight(struct drm_device *dev, u32 level)
- {
- 	struct drm_i915_private *dev_priv = dev->dev_private;
- 	u32 tmp;
-@@ -254,16 +254,21 @@ void intel_panel_set_backlight(struct drm_device *dev, u32 level)
- 	I915_WRITE(BLC_PWM_CTL, tmp | level);
- }
- 
--void intel_panel_disable_backlight(struct drm_device *dev)
-+void intel_panel_set_backlight(struct drm_device *dev, u32 level)
- {
- 	struct drm_i915_private *dev_priv = dev->dev_private;
- 
--	if (dev_priv->backlight_enabled) {
--		dev_priv->backlight_level = intel_panel_get_backlight(dev);
--		dev_priv->backlight_enabled = false;
--	}
-+	dev_priv->backlight_level = level;
-+	if (dev_priv->backlight_enabled)
-+		intel_panel_actually_set_backlight(dev, level);
-+}
-+
-+void intel_panel_disable_backlight(struct drm_device *dev)
-+{
-+	struct drm_i915_private *dev_priv = dev->dev_private;
- 
--	intel_panel_set_backlight(dev, 0);
-+	dev_priv->backlight_enabled = false;
-+	intel_panel_actually_set_backlight(dev, 0);
- }
- 
- void intel_panel_enable_backlight(struct drm_device *dev)
-@@ -273,8 +278,8 @@ void intel_panel_enable_backlight(struct drm_device *dev)
- 	if (dev_priv->backlight_level == 0)
- 		dev_priv->backlight_level = intel_panel_get_max_backlight(dev);
- 
--	intel_panel_set_backlight(dev, dev_priv->backlight_level);
- 	dev_priv->backlight_enabled = true;
-+	intel_panel_actually_set_backlight(dev, dev_priv->backlight_level);
- }
- 
- void intel_panel_setup_backlight(struct drm_device *dev)
-diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
-index 79e8ebc..b5628ce 100644
---- a/drivers/gpu/drm/radeon/atombios_dp.c
-+++ b/drivers/gpu/drm/radeon/atombios_dp.c
-@@ -553,6 +553,7 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder,
- {
- 	struct drm_device *dev = encoder->dev;
- 	struct radeon_device *rdev = dev->dev_private;
-+	struct radeon_connector *radeon_connector = to_radeon_connector(connector);
- 	int panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE;
- 
- 	if (!ASIC_IS_DCE4(rdev))
-@@ -560,10 +561,20 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder,
- 
- 	if (radeon_connector_encoder_is_dp_bridge(connector))
- 		panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE;
-+	else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
-+		u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP);
-+		if (tmp & 1)
-+			panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;
-+	}
- 
- 	atombios_dig_encoder_setup(encoder,
- 				   ATOM_ENCODER_CMD_SETUP_PANEL_MODE,
- 				   panel_mode);
-+
-+	if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&
-+	    (panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {
-+		radeon_write_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_SET, 1);
-+	}
- }
- 
- void radeon_dp_set_link_config(struct drm_connector *connector,
-diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
-index ea7a24e..f1bdb58 100644
---- a/drivers/gpu/drm/radeon/evergreen.c
-+++ b/drivers/gpu/drm/radeon/evergreen.c
-@@ -353,6 +353,7 @@ void evergreen_hpd_init(struct radeon_device *rdev)
- 		default:
- 			break;
- 		}
-+		radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);
- 	}
- 	if (rdev->irq.installed)
- 		evergreen_irq_set(rdev);
-diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
-index 7fcdbbb..c9a0dae 100644
---- a/drivers/gpu/drm/radeon/r100.c
-+++ b/drivers/gpu/drm/radeon/r100.c
-@@ -434,6 +434,7 @@ void r100_hpd_init(struct radeon_device *rdev)
- 		default:
- 			break;
- 		}
-+		radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);
- 	}
- 	if (rdev->irq.installed)
- 		r100_irq_set(rdev);
-diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
-index 1dea9d6..1a4ed43 100644
---- a/drivers/gpu/drm/radeon/r600.c
-+++ b/drivers/gpu/drm/radeon/r600.c
-@@ -762,13 +762,14 @@ void r600_hpd_init(struct radeon_device *rdev)
- 	struct drm_device *dev = rdev->ddev;
- 	struct drm_connector *connector;
- 
--	if (ASIC_IS_DCE3(rdev)) {
--		u32 tmp = DC_HPDx_CONNECTION_TIMER(0x9c4) | DC_HPDx_RX_INT_TIMER(0xfa);
--		if (ASIC_IS_DCE32(rdev))
--			tmp |= DC_HPDx_EN;
-+	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-+		struct radeon_connector *radeon_connector = to_radeon_connector(connector);
-+
-+		if (ASIC_IS_DCE3(rdev)) {
-+			u32 tmp = DC_HPDx_CONNECTION_TIMER(0x9c4) | DC_HPDx_RX_INT_TIMER(0xfa);
-+			if (ASIC_IS_DCE32(rdev))
-+				tmp |= DC_HPDx_EN;
- 
--		list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
--			struct radeon_connector *radeon_connector = to_radeon_connector(connector);
- 			switch (radeon_connector->hpd.hpd) {
- 			case RADEON_HPD_1:
- 				WREG32(DC_HPD1_CONTROL, tmp);
-@@ -798,10 +799,7 @@ void r600_hpd_init(struct radeon_device *rdev)
- 			default:
- 				break;
- 			}
--		}
--	} else {
--		list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
--			struct radeon_connector *radeon_connector = to_radeon_connector(connector);
-+		} else {
- 			switch (radeon_connector->hpd.hpd) {
- 			case RADEON_HPD_1:
- 				WREG32(DC_HOT_PLUG_DETECT1_CONTROL, DC_HOT_PLUG_DETECTx_EN);
-@@ -819,6 +817,7 @@ void r600_hpd_init(struct radeon_device *rdev)
- 				break;
- 			}
- 		}
-+		radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);
- 	}
- 	if (rdev->irq.installed)
- 		r600_irq_set(rdev);
-diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
-index 0bb4ddf..59d72d0 100644
---- a/drivers/gpu/drm/radeon/radeon.h
-+++ b/drivers/gpu/drm/radeon/radeon.h
-@@ -93,6 +93,7 @@ extern int radeon_audio;
- extern int radeon_disp_priority;
- extern int radeon_hw_i2c;
- extern int radeon_pcie_gen2;
-+extern int radeon_msi;
- 
- /*
-  * Copy from radeon_drv.h so we don't have to include both and have conflicting
-diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
-index cd3c86c..859df6b 100644
---- a/drivers/gpu/drm/radeon/radeon_combios.c
-+++ b/drivers/gpu/drm/radeon/radeon_combios.c
-@@ -620,8 +620,8 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde
- 		i2c.y_data_mask = 0x80;
- 	} else {
- 		/* default masks for ddc pads */
--		i2c.mask_clk_mask = RADEON_GPIO_EN_1;
--		i2c.mask_data_mask = RADEON_GPIO_EN_0;
-+		i2c.mask_clk_mask = RADEON_GPIO_MASK_1;
-+		i2c.mask_data_mask = RADEON_GPIO_MASK_0;
- 		i2c.a_clk_mask = RADEON_GPIO_A_1;
- 		i2c.a_data_mask = RADEON_GPIO_A_0;
- 		i2c.en_clk_mask = RADEON_GPIO_EN_1;
-diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
-index 05b8b2c..2109c17 100644
---- a/drivers/gpu/drm/radeon/radeon_connectors.c
-+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
-@@ -715,6 +715,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
- 		dret = radeon_ddc_probe(radeon_connector,
- 					radeon_connector->requires_extended_probe);
- 	if (dret) {
-+		radeon_connector->detected_by_load = false;
- 		if (radeon_connector->edid) {
- 			kfree(radeon_connector->edid);
- 			radeon_connector->edid = NULL;
-@@ -741,12 +742,21 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
- 	} else {
- 
- 		/* if we aren't forcing don't do destructive polling */
--		if (!force)
--			return connector->status;
-+		if (!force) {
-+			/* only return the previous status if we last
-+			 * detected a monitor via load.
-+			 */
-+			if (radeon_connector->detected_by_load)
-+				return connector->status;
-+			else
-+				return ret;
-+		}
- 
- 		if (radeon_connector->dac_load_detect && encoder) {
- 			encoder_funcs = encoder->helper_private;
- 			ret = encoder_funcs->detect(encoder, connector);
-+			if (ret != connector_status_disconnected)
-+				radeon_connector->detected_by_load = true;
- 		}
- 	}
- 
-@@ -888,6 +898,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
- 		dret = radeon_ddc_probe(radeon_connector,
- 					radeon_connector->requires_extended_probe);
- 	if (dret) {
-+		radeon_connector->detected_by_load = false;
- 		if (radeon_connector->edid) {
- 			kfree(radeon_connector->edid);
- 			radeon_connector->edid = NULL;
-@@ -950,8 +961,18 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
- 	if ((ret == connector_status_connected) && (radeon_connector->use_digital == true))
- 		goto out;
- 
-+	/* DVI-D and HDMI-A are digital only */
-+	if ((connector->connector_type == DRM_MODE_CONNECTOR_DVID) ||
-+	    (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA))
-+		goto out;
-+
-+	/* if we aren't forcing don't do destructive polling */
- 	if (!force) {
--		ret = connector->status;
-+		/* only return the previous status if we last
-+		 * detected a monitor via load.
-+		 */
-+		if (radeon_connector->detected_by_load)
-+			ret = connector->status;
- 		goto out;
- 	}
- 
-@@ -976,6 +997,8 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
- 					if (ret == connector_status_connected) {
- 						radeon_connector->use_digital = false;
- 					}
-+					if (ret != connector_status_disconnected)
-+						radeon_connector->detected_by_load = true;
- 				}
- 				break;
- 			}
-diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
-index 73dfbe8..60e1605 100644
---- a/drivers/gpu/drm/radeon/radeon_drv.c
-+++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -117,6 +117,7 @@ int radeon_audio = 0;
- int radeon_disp_priority = 0;
- int radeon_hw_i2c = 0;
- int radeon_pcie_gen2 = 0;
-+int radeon_msi = -1;
- 
- MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
- module_param_named(no_wb, radeon_no_wb, int, 0444);
-@@ -163,6 +164,9 @@ module_param_named(hw_i2c, radeon_hw_i2c, int, 0444);
- MODULE_PARM_DESC(pcie_gen2, "PCIE Gen2 mode (1 = enable)");
- module_param_named(pcie_gen2, radeon_pcie_gen2, int, 0444);
- 
-+MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)");
-+module_param_named(msi, radeon_msi, int, 0444);
-+
- static int radeon_suspend(struct drm_device *dev, pm_message_t state)
- {
- 	drm_radeon_private_t *dev_priv = dev->dev_private;
-diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
-index 9ec830c..fecc1aa 100644
---- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
-+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
-@@ -108,6 +108,46 @@ void radeon_driver_irq_uninstall_kms(struct drm_device *dev)
- 	radeon_irq_set(rdev);
- }
- 
-+static bool radeon_msi_ok(struct radeon_device *rdev)
-+{
-+	/* RV370/RV380 was first asic with MSI support */
-+	if (rdev->family < CHIP_RV380)
-+		return false;
-+
-+	/* MSIs don't work on AGP */
-+	if (rdev->flags & RADEON_IS_AGP)
-+		return false;
-+
-+	/* force MSI on */
-+	if (radeon_msi == 1)
-+		return true;
-+	else if (radeon_msi == 0)
-+		return false;
-+
-+	/* Quirks */
-+	/* HP RS690 only seems to work with MSIs. */
-+	if ((rdev->pdev->device == 0x791f) &&
-+	    (rdev->pdev->subsystem_vendor == 0x103c) &&
-+	    (rdev->pdev->subsystem_device == 0x30c2))
-+		return true;
-+
-+	/* Dell RS690 only seems to work with MSIs. */
-+	if ((rdev->pdev->device == 0x791f) &&
-+	    (rdev->pdev->subsystem_vendor == 0x1028) &&
-+	    (rdev->pdev->subsystem_device == 0x01fd))
-+		return true;
-+
-+	if (rdev->flags & RADEON_IS_IGP) {
-+		/* APUs work fine with MSIs */
-+		if (rdev->family >= CHIP_PALM)
-+			return true;
-+		/* lots of IGPs have problems with MSIs */
-+		return false;
-+	}
-+
-+	return true;
-+}
-+
- int radeon_irq_kms_init(struct radeon_device *rdev)
- {
- 	int i;
-@@ -124,12 +164,8 @@ int radeon_irq_kms_init(struct radeon_device *rdev)
- 	}
- 	/* enable msi */
- 	rdev->msi_enabled = 0;
--	/* MSIs don't seem to work reliably on all IGP
--	 * chips.  Disable MSI on them for now.
--	 */
--	if ((rdev->family >= CHIP_RV380) &&
--	    ((!(rdev->flags & RADEON_IS_IGP)) || (rdev->family >= CHIP_PALM)) &&
--	    (!(rdev->flags & RADEON_IS_AGP))) {
-+
-+	if (radeon_msi_ok(rdev)) {
- 		int ret = pci_enable_msi(rdev->pdev);
- 		if (!ret) {
- 			rdev->msi_enabled = 1;
-diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
-index 68820f5..ed0178f 100644
---- a/drivers/gpu/drm/radeon/radeon_mode.h
-+++ b/drivers/gpu/drm/radeon/radeon_mode.h
-@@ -447,6 +447,7 @@ struct radeon_connector {
- 	struct edid *edid;
- 	void *con_priv;
- 	bool dac_load_detect;
-+	bool detected_by_load; /* if the connection status was determined by load */
- 	uint16_t connector_object_id;
- 	struct radeon_hpd hpd;
- 	struct radeon_router router;
-diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
-index 1f5850e..aea28c3 100644
---- a/drivers/gpu/drm/radeon/rs600.c
-+++ b/drivers/gpu/drm/radeon/rs600.c
-@@ -287,6 +287,7 @@ void rs600_hpd_init(struct radeon_device *rdev)
- 		default:
- 			break;
- 		}
-+		radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);
- 	}
- 	if (rdev->irq.installed)
- 		rs600_irq_set(rdev);
-diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
-index 36ca465..7e0acf4 100644
---- a/drivers/hid/Kconfig
-+++ b/drivers/hid/Kconfig
-@@ -69,7 +69,7 @@ config HID_ACRUX
- 	Say Y here if you want to enable support for ACRUX game controllers.
- 
- config HID_ACRUX_FF
--	tristate "ACRUX force feedback support"
-+	bool "ACRUX force feedback support"
- 	depends on HID_ACRUX
- 	select INPUT_FF_MEMLESS
- 	---help---
-@@ -314,6 +314,7 @@ config HID_MULTITOUCH
- 	  - Hanvon dual touch panels
- 	  - Ilitek dual touch panels
- 	  - IrTouch Infrared USB panels
-+	  - LG Display panels (Dell ST2220Tc)
- 	  - Lumio CrystalTouch panels
- 	  - MosArt dual-touch panels
- 	  - PenMount dual touch panels
-diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
-index b85744f..299d238 100644
---- a/drivers/hid/hid-apple.c
-+++ b/drivers/hid/hid-apple.c
-@@ -444,11 +444,20 @@ static const struct hid_device_id apple_devices[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS),
- 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
- 			APPLE_RDESC_JIS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI),
-+		.driver_data = APPLE_HAS_FN },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO),
-+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS),
-+		.driver_data = APPLE_HAS_FN },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
- 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
- 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
- 			APPLE_ISO_KEYBOARD },
-+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO),
-+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-+			APPLE_ISO_KEYBOARD },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
- 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
-@@ -487,6 +496,24 @@ static const struct hid_device_id apple_devices[] = {
- 		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),
- 		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI),
-+		.driver_data = APPLE_HAS_FN },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO),
-+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS),
-+		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI),
-+		.driver_data = APPLE_HAS_FN },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO),
-+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS),
-+		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI),
-+		.driver_data = APPLE_HAS_FN },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO),
-+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS),
-+		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
- 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
-diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 6f3289a..4f81d20 100644
---- a/drivers/hid/hid-core.c
-+++ b/drivers/hid/hid-core.c
-@@ -1340,9 +1340,22 @@ static const struct hid_device_id hid_have_special_driver[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) },
-+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI) },
-+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO) },
-+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS) },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
-+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) },
-@@ -1395,6 +1408,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_LG, USB_DEVICE_ID_LG_MULTITOUCH) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },
-@@ -1883,6 +1897,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
- 	{ }
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index c946d90..c97003c 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -109,9 +109,22 @@
- #define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI	0x0245
- #define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO	0x0246
- #define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS	0x0247
-+#define USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI	0x0249
-+#define USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO	0x024a
-+#define USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS	0x024b
-+#define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI	0x024c
-+#define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO	0x024d
-+#define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS	0x024e
-+#define USB_DEVICE_ID_APPLE_ALU_REVB_ANSI	0x024f
-+#define USB_DEVICE_ID_APPLE_ALU_REVB_ISO	0x0250
-+#define USB_DEVICE_ID_APPLE_ALU_REVB_JIS	0x0251
-+#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI	0x0252
-+#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO	0x0253
-+#define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS	0x0254
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b
-+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256
- #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a
- #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b
- #define USB_DEVICE_ID_APPLE_ATV_IRCONTROL	0x8241
-@@ -274,6 +287,7 @@
- #define USB_DEVICE_ID_PENPOWER		0x00f4
- 
- #define USB_VENDOR_ID_GREENASIA		0x0e8f
-+#define USB_DEVICE_ID_GREENASIA_DUAL_USB_JOYPAD	0x3013
- 
- #define USB_VENDOR_ID_GRETAGMACBETH	0x0971
- #define USB_DEVICE_ID_GRETAGMACBETH_HUEY	0x2005
-@@ -416,6 +430,9 @@
- #define USB_DEVICE_ID_LD_HYBRID		0x2090
- #define USB_DEVICE_ID_LD_HEATCONTROL	0x20A0
- 
-+#define USB_VENDOR_ID_LG		0x1fd2
-+#define USB_DEVICE_ID_LG_MULTITOUCH	0x0064
-+
- #define USB_VENDOR_ID_LOGITECH		0x046d
- #define USB_DEVICE_ID_LOGITECH_RECEIVER	0xc101
- #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110
-diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 62cac4d..685d8e4 100644
---- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -672,6 +672,11 @@ static const struct hid_device_id mt_devices[] = {
- 		HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
- 			USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
- 
-+	/* LG Display panels */
-+	{ .driver_data = MT_CLS_DEFAULT,
-+		HID_USB_DEVICE(USB_VENDOR_ID_LG,
-+			USB_DEVICE_ID_LG_MULTITOUCH) },
-+
- 	/* Lumio panels */
- 	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
- 		HID_USB_DEVICE(USB_VENDOR_ID_LUMIO,
-diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
-index 4bdb5d4..3146fdc 100644
---- a/drivers/hid/usbhid/hid-quirks.c
-+++ b/drivers/hid/usbhid/hid-quirks.c
-@@ -47,6 +47,7 @@ static const struct hid_blacklist {
- 	{ USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL },
- 
- 	{ USB_VENDOR_ID_ETURBOTOUCH, USB_DEVICE_ID_ETURBOTOUCH, HID_QUIRK_MULTI_INPUT },
-+	{ USB_VENDOR_ID_GREENASIA, USB_DEVICE_ID_GREENASIA_DUAL_USB_JOYPAD, HID_QUIRK_MULTI_INPUT },
- 	{ USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },
- 	{ USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT },
- 	{ USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS, HID_QUIRK_MULTI_INPUT },
-diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
-index 0070d54..f642194 100644
---- a/drivers/hwmon/coretemp.c
-+++ b/drivers/hwmon/coretemp.c
-@@ -50,14 +50,13 @@
- #ifdef CONFIG_SMP
- #define TO_PHYS_ID(cpu)		cpu_data(cpu).phys_proc_id
- #define TO_CORE_ID(cpu)		cpu_data(cpu).cpu_core_id
--#define TO_ATTR_NO(cpu)		(TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO)
- #define for_each_sibling(i, cpu)	for_each_cpu(i, cpu_sibling_mask(cpu))
- #else
- #define TO_PHYS_ID(cpu)		(cpu)
- #define TO_CORE_ID(cpu)		(cpu)
--#define TO_ATTR_NO(cpu)		(cpu)
- #define for_each_sibling(i, cpu)	for (i = 0; false; )
- #endif
-+#define TO_ATTR_NO(cpu)		(TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO)
- 
- /*
-  * Per-Core Temperature Data
-diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
-index 36d7f27..4b2fc50 100644
---- a/drivers/hwmon/w83627ehf.c
-+++ b/drivers/hwmon/w83627ehf.c
-@@ -1756,7 +1756,17 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,
- 		diode = 0x70;
- 	}
- 	for (i = 0; i < 3; i++) {
--		if ((tmp & (0x02 << i)))
-+		const char *label = NULL;
-+
-+		if (data->temp_label)
-+			label = data->temp_label[data->temp_src[i]];
-+
-+		/* Digital source overrides analog type */
-+		if (label && strncmp(label, "PECI", 4) == 0)
-+			data->temp_type[i] = 6;
-+		else if (label && strncmp(label, "AMD", 3) == 0)
-+			data->temp_type[i] = 5;
-+		else if ((tmp & (0x02 << i)))
- 			data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3;
- 		else
- 			data->temp_type[i] = 4; /* thermistor */
-diff --git a/drivers/hwspinlock/hwspinlock_core.c b/drivers/hwspinlock/hwspinlock_core.c
-index 43a6271..12f7c83 100644
---- a/drivers/hwspinlock/hwspinlock_core.c
-+++ b/drivers/hwspinlock/hwspinlock_core.c
-@@ -26,6 +26,7 @@
- #include <linux/radix-tree.h>
- #include <linux/hwspinlock.h>
- #include <linux/pm_runtime.h>
-+#include <linux/mutex.h>
- 
- #include "hwspinlock_internal.h"
- 
-@@ -52,10 +53,12 @@
- static RADIX_TREE(hwspinlock_tree, GFP_KERNEL);
- 
- /*
-- * Synchronization of access to the tree is achieved using this spinlock,
-+ * Synchronization of access to the tree is achieved using this mutex,
-  * as the radix-tree API requires that users provide all synchronisation.
-+ * A mutex is needed because we're using non-atomic radix tree allocations.
-  */
--static DEFINE_SPINLOCK(hwspinlock_tree_lock);
-+static DEFINE_MUTEX(hwspinlock_tree_lock);
-+
- 
- /**
-  * __hwspin_trylock() - attempt to lock a specific hwspinlock
-@@ -261,8 +264,7 @@ EXPORT_SYMBOL_GPL(__hwspin_unlock);
-  * This function should be called from the underlying platform-specific
-  * implementation, to register a new hwspinlock instance.
-  *
-- * Can be called from an atomic context (will not sleep) but not from
-- * within interrupt context.
-+ * Should be called from a process context (might sleep)
-  *
-  * Returns 0 on success, or an appropriate error code on failure
-  */
-@@ -279,7 +281,7 @@ int hwspin_lock_register(struct hwspinlock *hwlock)
- 
- 	spin_lock_init(&hwlock->lock);
- 
--	spin_lock(&hwspinlock_tree_lock);
-+	mutex_lock(&hwspinlock_tree_lock);
- 
- 	ret = radix_tree_insert(&hwspinlock_tree, hwlock->id, hwlock);
- 	if (ret)
-@@ -293,7 +295,7 @@ int hwspin_lock_register(struct hwspinlock *hwlock)
- 	WARN_ON(tmp != hwlock);
- 
- out:
--	spin_unlock(&hwspinlock_tree_lock);
-+	mutex_unlock(&hwspinlock_tree_lock);
- 	return ret;
- }
- EXPORT_SYMBOL_GPL(hwspin_lock_register);
-@@ -305,8 +307,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_register);
-  * This function should be called from the underlying platform-specific
-  * implementation, to unregister an existing (and unused) hwspinlock.
-  *
-- * Can be called from an atomic context (will not sleep) but not from
-- * within interrupt context.
-+ * Should be called from a process context (might sleep)
-  *
-  * Returns the address of hwspinlock @id on success, or NULL on failure
-  */
-@@ -315,7 +316,7 @@ struct hwspinlock *hwspin_lock_unregister(unsigned int id)
- 	struct hwspinlock *hwlock = NULL;
- 	int ret;
- 
--	spin_lock(&hwspinlock_tree_lock);
-+	mutex_lock(&hwspinlock_tree_lock);
- 
- 	/* make sure the hwspinlock is not in use (tag is set) */
- 	ret = radix_tree_tag_get(&hwspinlock_tree, id, HWSPINLOCK_UNUSED);
-@@ -331,7 +332,7 @@ struct hwspinlock *hwspin_lock_unregister(unsigned int id)
- 	}
- 
- out:
--	spin_unlock(&hwspinlock_tree_lock);
-+	mutex_unlock(&hwspinlock_tree_lock);
- 	return hwlock;
- }
- EXPORT_SYMBOL_GPL(hwspin_lock_unregister);
-@@ -400,9 +401,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_get_id);
-  * to the remote core before it can be used for synchronization (to get the
-  * id of a given hwlock, use hwspin_lock_get_id()).
-  *
-- * Can be called from an atomic context (will not sleep) but not from
-- * within interrupt context (simply because there is no use case for
-- * that yet).
-+ * Should be called from a process context (might sleep)
-  *
-  * Returns the address of the assigned hwspinlock, or NULL on error
-  */
-@@ -411,7 +410,7 @@ struct hwspinlock *hwspin_lock_request(void)
- 	struct hwspinlock *hwlock;
- 	int ret;
- 
--	spin_lock(&hwspinlock_tree_lock);
-+	mutex_lock(&hwspinlock_tree_lock);
- 
- 	/* look for an unused lock */
- 	ret = radix_tree_gang_lookup_tag(&hwspinlock_tree, (void **)&hwlock,
-@@ -431,7 +430,7 @@ struct hwspinlock *hwspin_lock_request(void)
- 		hwlock = NULL;
- 
- out:
--	spin_unlock(&hwspinlock_tree_lock);
-+	mutex_unlock(&hwspinlock_tree_lock);
- 	return hwlock;
- }
- EXPORT_SYMBOL_GPL(hwspin_lock_request);
-@@ -445,9 +444,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_request);
-  * Usually early board code will be calling this function in order to
-  * reserve specific hwspinlock ids for predefined purposes.
-  *
-- * Can be called from an atomic context (will not sleep) but not from
-- * within interrupt context (simply because there is no use case for
-- * that yet).
-+ * Should be called from a process context (might sleep)
-  *
-  * Returns the address of the assigned hwspinlock, or NULL on error
-  */
-@@ -456,7 +453,7 @@ struct hwspinlock *hwspin_lock_request_specific(unsigned int id)
- 	struct hwspinlock *hwlock;
- 	int ret;
- 
--	spin_lock(&hwspinlock_tree_lock);
-+	mutex_lock(&hwspinlock_tree_lock);
- 
- 	/* make sure this hwspinlock exists */
- 	hwlock = radix_tree_lookup(&hwspinlock_tree, id);
-@@ -482,7 +479,7 @@ struct hwspinlock *hwspin_lock_request_specific(unsigned int id)
- 		hwlock = NULL;
- 
- out:
--	spin_unlock(&hwspinlock_tree_lock);
-+	mutex_unlock(&hwspinlock_tree_lock);
- 	return hwlock;
- }
- EXPORT_SYMBOL_GPL(hwspin_lock_request_specific);
-@@ -495,9 +492,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_request_specific);
-  * Should only be called with an @hwlock that was retrieved from
-  * an earlier call to omap_hwspin_lock_request{_specific}.
-  *
-- * Can be called from an atomic context (will not sleep) but not from
-- * within interrupt context (simply because there is no use case for
-- * that yet).
-+ * Should be called from a process context (might sleep)
-  *
-  * Returns 0 on success, or an appropriate error code on failure
-  */
-@@ -511,7 +506,7 @@ int hwspin_lock_free(struct hwspinlock *hwlock)
- 		return -EINVAL;
- 	}
- 
--	spin_lock(&hwspinlock_tree_lock);
-+	mutex_lock(&hwspinlock_tree_lock);
- 
- 	/* make sure the hwspinlock is used */
- 	ret = radix_tree_tag_get(&hwspinlock_tree, hwlock->id,
-@@ -538,7 +533,7 @@ int hwspin_lock_free(struct hwspinlock *hwlock)
- 	module_put(hwlock->owner);
- 
- out:
--	spin_unlock(&hwspinlock_tree_lock);
-+	mutex_unlock(&hwspinlock_tree_lock);
- 	return ret;
- }
- EXPORT_SYMBOL_GPL(hwspin_lock_free);
-diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
-index dc3d3d8..661b692 100644
---- a/drivers/leds/led-class.c
-+++ b/drivers/leds/led-class.c
-@@ -267,9 +267,14 @@ void led_blink_set(struct led_classdev *led_cdev,
- 		   unsigned long *delay_on,
- 		   unsigned long *delay_off)
- {
-+	del_timer_sync(&led_cdev->blink_timer);
-+
- 	if (led_cdev->blink_set &&
--	    !led_cdev->blink_set(led_cdev, delay_on, delay_off))
-+	    !led_cdev->blink_set(led_cdev, delay_on, delay_off)) {
-+		led_cdev->blink_delay_on = *delay_on;
-+		led_cdev->blink_delay_off = *delay_off;
- 		return;
-+	}
- 
- 	/* blink with 1 Hz as default if nothing specified */
- 	if (!*delay_on && !*delay_off)
-diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index 2581ba1..e509147 100644
---- a/drivers/md/raid5.c
-+++ b/drivers/md/raid5.c
-@@ -3369,7 +3369,7 @@ static void handle_stripe6(struct stripe_head *sh)
- 			/* Not in-sync */;
- 		else if (test_bit(In_sync, &rdev->flags))
- 			set_bit(R5_Insync, &dev->flags);
--		else {
-+		else if (!test_bit(Faulty, &rdev->flags)) {
- 			/* in sync if before recovery_offset */
- 			if (sh->sector + STRIPE_SECTORS <= rdev->recovery_offset)
- 				set_bit(R5_Insync, &dev->flags);
-diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
-index 5eb91b4..a224e94 100644
---- a/drivers/media/dvb/dvb-usb/dib0700_core.c
-+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
-@@ -30,6 +30,11 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,
- 	struct dib0700_state *st = d->priv;
- 	int ret;
- 
-+	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+		deb_info("could not acquire lock");
-+		return 0;
-+	}
-+
- 	ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0),
- 				  REQUEST_GET_VERSION,
- 				  USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
-@@ -46,6 +51,7 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,
- 	if (fwtype != NULL)
- 		*fwtype     = (st->buf[12] << 24) | (st->buf[13] << 16) |
- 			(st->buf[14] << 8) | st->buf[15];
-+	mutex_unlock(&d->usb_mutex);
- 	return ret;
- }
- 
-@@ -108,7 +114,12 @@ int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen
- int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val)
- {
- 	struct dib0700_state *st = d->priv;
--	s16 ret;
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+		deb_info("could not acquire lock");
-+		return 0;
-+	}
- 
- 	st->buf[0] = REQUEST_SET_GPIO;
- 	st->buf[1] = gpio;
-@@ -116,6 +127,7 @@ int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_
- 
- 	ret = dib0700_ctrl_wr(d, st->buf, 3);
- 
-+	mutex_unlock(&d->usb_mutex);
- 	return ret;
- }
- 
-@@ -125,6 +137,11 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets)
- 	int ret;
- 
- 	if (st->fw_version >= 0x10201) {
-+		if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+			deb_info("could not acquire lock");
-+			return 0;
-+		}
-+
- 		st->buf[0] = REQUEST_SET_USB_XFER_LEN;
- 		st->buf[1] = (nb_ts_packets >> 8) & 0xff;
- 		st->buf[2] = nb_ts_packets & 0xff;
-@@ -132,6 +149,7 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets)
- 		deb_info("set the USB xfer len to %i Ts packet\n", nb_ts_packets);
- 
- 		ret = dib0700_ctrl_wr(d, st->buf, 3);
-+		mutex_unlock(&d->usb_mutex);
- 	} else {
- 		deb_info("this firmware does not allow to change the USB xfer len\n");
- 		ret = -EIO;
-@@ -208,6 +226,10 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
- 
- 		} else {
- 			/* Write request */
-+			if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+				deb_info("could not acquire lock");
-+				return 0;
-+			}
- 			st->buf[0] = REQUEST_NEW_I2C_WRITE;
- 			st->buf[1] = msg[i].addr << 1;
- 			st->buf[2] = (en_start << 7) | (en_stop << 6) |
-@@ -227,6 +249,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
- 						 USB_TYPE_VENDOR | USB_DIR_OUT,
- 						 0, 0, st->buf, msg[i].len + 4,
- 						 USB_CTRL_GET_TIMEOUT);
-+			mutex_unlock(&d->usb_mutex);
- 			if (result < 0) {
- 				deb_info("i2c write error (status = %d)\n", result);
- 				break;
-@@ -249,6 +272,10 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
- 
- 	if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
- 		return -EAGAIN;
-+	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+		deb_info("could not acquire lock");
-+		return 0;
-+	}
- 
- 	for (i = 0; i < num; i++) {
- 		/* fill in the address */
-@@ -279,6 +306,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
- 				break;
- 		}
- 	}
-+	mutex_unlock(&d->usb_mutex);
- 	mutex_unlock(&d->i2c_mutex);
- 
- 	return i;
-@@ -337,7 +365,12 @@ static int dib0700_set_clock(struct dvb_usb_device *d, u8 en_pll,
- 	u16 pll_loopdiv, u16 free_div, u16 dsuScaler)
- {
- 	struct dib0700_state *st = d->priv;
--	s16 ret;
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+		deb_info("could not acquire lock");
-+		return 0;
-+	}
- 
- 	st->buf[0] = REQUEST_SET_CLOCK;
- 	st->buf[1] = (en_pll << 7) | (pll_src << 6) |
-@@ -352,6 +385,7 @@ static int dib0700_set_clock(struct dvb_usb_device *d, u8 en_pll,
- 	st->buf[9] =  dsuScaler         & 0xff; /* LSB */
- 
- 	ret = dib0700_ctrl_wr(d, st->buf, 10);
-+	mutex_unlock(&d->usb_mutex);
- 
- 	return ret;
- }
-@@ -360,10 +394,16 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz)
- {
- 	struct dib0700_state *st = d->priv;
- 	u16 divider;
-+	int ret;
- 
- 	if (scl_kHz == 0)
- 		return -EINVAL;
- 
-+	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+		deb_info("could not acquire lock");
-+		return 0;
-+	}
-+
- 	st->buf[0] = REQUEST_SET_I2C_PARAM;
- 	divider = (u16) (30000 / scl_kHz);
- 	st->buf[1] = 0;
-@@ -379,7 +419,11 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz)
- 	deb_info("setting I2C speed: %04x %04x %04x (%d kHz).",
- 		(st->buf[2] << 8) | (st->buf[3]), (st->buf[4] << 8) |
- 		st->buf[5], (st->buf[6] << 8) | st->buf[7], scl_kHz);
--	return dib0700_ctrl_wr(d, st->buf, 8);
-+
-+	ret = dib0700_ctrl_wr(d, st->buf, 8);
-+	mutex_unlock(&d->usb_mutex);
-+
-+	return ret;
- }
- 
- 
-@@ -515,6 +559,11 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
- 		}
- 	}
- 
-+	if (mutex_lock_interruptible(&adap->dev->usb_mutex) < 0) {
-+		deb_info("could not acquire lock");
-+		return 0;
-+	}
-+
- 	st->buf[0] = REQUEST_ENABLE_VIDEO;
- 	/* this bit gives a kind of command,
- 	 * rather than enabling something or not */
-@@ -548,7 +597,10 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
- 
- 	deb_info("data for streaming: %x %x\n", st->buf[1], st->buf[2]);
- 
--	return dib0700_ctrl_wr(adap->dev, st->buf, 4);
-+	ret = dib0700_ctrl_wr(adap->dev, st->buf, 4);
-+	mutex_unlock(&adap->dev->usb_mutex);
-+
-+	return ret;
- }
- 
- int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type)
-@@ -557,6 +609,11 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type)
- 	struct dib0700_state *st = d->priv;
- 	int new_proto, ret;
- 
-+	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+		deb_info("could not acquire lock");
-+		return 0;
-+	}
-+
- 	st->buf[0] = REQUEST_SET_RC;
- 	st->buf[1] = 0;
- 	st->buf[2] = 0;
-@@ -567,23 +624,29 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type)
- 	else if (rc_type == RC_TYPE_NEC)
- 		new_proto = 0;
- 	else if (rc_type == RC_TYPE_RC6) {
--		if (st->fw_version < 0x10200)
--			return -EINVAL;
-+		if (st->fw_version < 0x10200) {
-+			ret = -EINVAL;
-+			goto out;
-+		}
- 
- 		new_proto = 2;
--	} else
--		return -EINVAL;
-+	} else {
-+		ret = -EINVAL;
-+		goto out;
-+	}
- 
- 	st->buf[1] = new_proto;
- 
- 	ret = dib0700_ctrl_wr(d, st->buf, 3);
- 	if (ret < 0) {
- 		err("ir protocol setup failed");
--		return ret;
-+		goto out;
- 	}
- 
- 	d->props.rc.core.protocol = rc_type;
- 
-+out:
-+	mutex_unlock(&d->usb_mutex);
- 	return ret;
- }
- 
-diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb/frontends/dib0070.c
-index 1d47d4d..dc1cb17 100644
---- a/drivers/media/dvb/frontends/dib0070.c
-+++ b/drivers/media/dvb/frontends/dib0070.c
-@@ -27,6 +27,7 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/i2c.h>
-+#include <linux/mutex.h>
- 
- #include "dvb_frontend.h"
- 
-@@ -78,10 +79,18 @@ struct dib0070_state {
- 	struct i2c_msg msg[2];
- 	u8 i2c_write_buffer[3];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
--static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg)
-+static u16 dib0070_read_reg(struct dib0070_state *state, u8 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	state->i2c_write_buffer[0] = reg;
- 
- 	memset(state->msg, 0, 2 * sizeof(struct i2c_msg));
-@@ -96,13 +105,23 @@ static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg)
- 
- 	if (i2c_transfer(state->i2c, state->msg, 2) != 2) {
- 		printk(KERN_WARNING "DiB0070 I2C read failed\n");
--		return 0;
--	}
--	return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+		ret = 0;
-+	} else
-+		ret = (state->i2c_read_buffer[0] << 8)
-+			| state->i2c_read_buffer[1];
-+
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
- 	state->i2c_write_buffer[0] = reg;
- 	state->i2c_write_buffer[1] = val >> 8;
- 	state->i2c_write_buffer[2] = val & 0xff;
-@@ -115,9 +134,12 @@ static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val)
- 
- 	if (i2c_transfer(state->i2c, state->msg, 1) != 1) {
- 		printk(KERN_WARNING "DiB0070 I2C write failed\n");
--		return -EREMOTEIO;
--	}
--	return 0;
-+		ret = -EREMOTEIO;
-+	} else
-+		ret = 0;
-+
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- #define HARD_RESET(state) do { \
-@@ -734,6 +756,7 @@ struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter
- 	state->cfg = cfg;
- 	state->i2c = i2c;
- 	state->fe  = fe;
-+	mutex_init(&state->i2c_buffer_lock);
- 	fe->tuner_priv = state;
- 
- 	if (dib0070_reset(fe) != 0)
-diff --git a/drivers/media/dvb/frontends/dib0090.c b/drivers/media/dvb/frontends/dib0090.c
-index c9c935a..b174d1c 100644
---- a/drivers/media/dvb/frontends/dib0090.c
-+++ b/drivers/media/dvb/frontends/dib0090.c
-@@ -27,6 +27,7 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/i2c.h>
-+#include <linux/mutex.h>
- 
- #include "dvb_frontend.h"
- 
-@@ -196,6 +197,7 @@ struct dib0090_state {
- 	struct i2c_msg msg[2];
- 	u8 i2c_write_buffer[3];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
- struct dib0090_fw_state {
-@@ -208,10 +210,18 @@ struct dib0090_fw_state {
- 	struct i2c_msg msg;
- 	u8 i2c_write_buffer[2];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
- static u16 dib0090_read_reg(struct dib0090_state *state, u8 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	state->i2c_write_buffer[0] = reg;
- 
- 	memset(state->msg, 0, 2 * sizeof(struct i2c_msg));
-@@ -226,14 +236,24 @@ static u16 dib0090_read_reg(struct dib0090_state *state, u8 reg)
- 
- 	if (i2c_transfer(state->i2c, state->msg, 2) != 2) {
- 		printk(KERN_WARNING "DiB0090 I2C read failed\n");
--		return 0;
--	}
-+		ret = 0;
-+	} else
-+		ret = (state->i2c_read_buffer[0] << 8)
-+			| state->i2c_read_buffer[1];
- 
--	return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- static int dib0090_write_reg(struct dib0090_state *state, u32 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
- 	state->i2c_write_buffer[0] = reg & 0xff;
- 	state->i2c_write_buffer[1] = val >> 8;
- 	state->i2c_write_buffer[2] = val & 0xff;
-@@ -246,13 +266,23 @@ static int dib0090_write_reg(struct dib0090_state *state, u32 reg, u16 val)
- 
- 	if (i2c_transfer(state->i2c, state->msg, 1) != 1) {
- 		printk(KERN_WARNING "DiB0090 I2C write failed\n");
--		return -EREMOTEIO;
--	}
--	return 0;
-+		ret = -EREMOTEIO;
-+	} else
-+		ret = 0;
-+
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- static u16 dib0090_fw_read_reg(struct dib0090_fw_state *state, u8 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	state->i2c_write_buffer[0] = reg;
- 
- 	memset(&state->msg, 0, sizeof(struct i2c_msg));
-@@ -262,13 +292,24 @@ static u16 dib0090_fw_read_reg(struct dib0090_fw_state *state, u8 reg)
- 	state->msg.len = 2;
- 	if (i2c_transfer(state->i2c, &state->msg, 1) != 1) {
- 		printk(KERN_WARNING "DiB0090 I2C read failed\n");
--		return 0;
--	}
--	return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+		ret = 0;
-+	} else
-+		ret = (state->i2c_read_buffer[0] << 8)
-+			| state->i2c_read_buffer[1];
-+
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- static int dib0090_fw_write_reg(struct dib0090_fw_state *state, u8 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
- 	state->i2c_write_buffer[0] = val >> 8;
- 	state->i2c_write_buffer[1] = val & 0xff;
- 
-@@ -279,9 +320,12 @@ static int dib0090_fw_write_reg(struct dib0090_fw_state *state, u8 reg, u16 val)
- 	state->msg.len = 2;
- 	if (i2c_transfer(state->i2c, &state->msg, 1) != 1) {
- 		printk(KERN_WARNING "DiB0090 I2C write failed\n");
--		return -EREMOTEIO;
--	}
--	return 0;
-+		ret = -EREMOTEIO;
-+	} else
-+		ret = 0;
-+
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- #define HARD_RESET(state) do {  if (cfg->reset) {  if (cfg->sleep) cfg->sleep(fe, 0); msleep(10);  cfg->reset(fe, 1); msleep(10);  cfg->reset(fe, 0); msleep(10);  }  } while (0)
-@@ -2440,6 +2484,7 @@ struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapte
- 	st->config = config;
- 	st->i2c = i2c;
- 	st->fe = fe;
-+	mutex_init(&st->i2c_buffer_lock);
- 	fe->tuner_priv = st;
- 
- 	if (config->wbd == NULL)
-@@ -2471,6 +2516,7 @@ struct dvb_frontend *dib0090_fw_register(struct dvb_frontend *fe, struct i2c_ada
- 	st->config = config;
- 	st->i2c = i2c;
- 	st->fe = fe;
-+	mutex_init(&st->i2c_buffer_lock);
- 	fe->tuner_priv = st;
- 
- 	if (dib0090_fw_reset_digital(fe, st->config) != 0)
-diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c
-index 79cb1c2..dbb76d7 100644
---- a/drivers/media/dvb/frontends/dib7000m.c
-+++ b/drivers/media/dvb/frontends/dib7000m.c
-@@ -11,6 +11,7 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/i2c.h>
-+#include <linux/mutex.h>
- 
- #include "dvb_frontend.h"
- 
-@@ -55,6 +56,7 @@ struct dib7000m_state {
- 	struct i2c_msg msg[2];
- 	u8 i2c_write_buffer[4];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
- enum dib7000m_power_mode {
-@@ -69,6 +71,13 @@ enum dib7000m_power_mode {
- 
- static u16 dib7000m_read_word(struct dib7000m_state *state, u16 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	state->i2c_write_buffer[0] = (reg >> 8) | 0x80;
- 	state->i2c_write_buffer[1] = reg & 0xff;
- 
-@@ -85,11 +94,21 @@ static u16 dib7000m_read_word(struct dib7000m_state *state, u16 reg)
- 	if (i2c_transfer(state->i2c_adap, state->msg, 2) != 2)
- 		dprintk("i2c read error on %d",reg);
- 
--	return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	ret = (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	mutex_unlock(&state->i2c_buffer_lock);
-+
-+	return ret;
- }
- 
- static int dib7000m_write_word(struct dib7000m_state *state, u16 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
- 	state->i2c_write_buffer[0] = (reg >> 8) & 0xff;
- 	state->i2c_write_buffer[1] = reg & 0xff;
- 	state->i2c_write_buffer[2] = (val >> 8) & 0xff;
-@@ -101,7 +120,10 @@ static int dib7000m_write_word(struct dib7000m_state *state, u16 reg, u16 val)
- 	state->msg[0].buf = state->i2c_write_buffer;
- 	state->msg[0].len = 4;
- 
--	return i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ? -EREMOTEIO : 0;
-+	ret = (i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ?
-+			-EREMOTEIO : 0);
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- static void dib7000m_write_tab(struct dib7000m_state *state, u16 *buf)
- {
-@@ -1385,6 +1407,7 @@ struct dvb_frontend * dib7000m_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr,
- 	demod                   = &st->demod;
- 	demod->demodulator_priv = st;
- 	memcpy(&st->demod.ops, &dib7000m_ops, sizeof(struct dvb_frontend_ops));
-+	mutex_init(&st->i2c_buffer_lock);
- 
- 	st->timf_default = cfg->bw->timf;
- 
-diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c
-index 0c9f40c..292bc19 100644
---- a/drivers/media/dvb/frontends/dib7000p.c
-+++ b/drivers/media/dvb/frontends/dib7000p.c
-@@ -10,6 +10,7 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/i2c.h>
-+#include <linux/mutex.h>
- 
- #include "dvb_math.h"
- #include "dvb_frontend.h"
-@@ -68,6 +69,7 @@ struct dib7000p_state {
- 	struct i2c_msg msg[2];
- 	u8 i2c_write_buffer[4];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
- enum dib7000p_power_mode {
-@@ -81,6 +83,13 @@ static int dib7090_set_diversity_in(struct dvb_frontend *fe, int onoff);
- 
- static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	state->i2c_write_buffer[0] = reg >> 8;
- 	state->i2c_write_buffer[1] = reg & 0xff;
- 
-@@ -97,11 +106,20 @@ static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg)
- 	if (i2c_transfer(state->i2c_adap, state->msg, 2) != 2)
- 		dprintk("i2c read error on %d", reg);
- 
--	return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	ret = (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- static int dib7000p_write_word(struct dib7000p_state *state, u16 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
- 	state->i2c_write_buffer[0] = (reg >> 8) & 0xff;
- 	state->i2c_write_buffer[1] = reg & 0xff;
- 	state->i2c_write_buffer[2] = (val >> 8) & 0xff;
-@@ -113,7 +131,10 @@ static int dib7000p_write_word(struct dib7000p_state *state, u16 reg, u16 val)
- 	state->msg[0].buf = state->i2c_write_buffer;
- 	state->msg[0].len = 4;
- 
--	return i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ? -EREMOTEIO : 0;
-+	ret = (i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ?
-+			-EREMOTEIO : 0);
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- static void dib7000p_write_tab(struct dib7000p_state *state, u16 * buf)
-@@ -1646,6 +1667,7 @@ int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defau
- 		return -ENOMEM;
- 
- 	dpst->i2c_adap = i2c;
-+	mutex_init(&dpst->i2c_buffer_lock);
- 
- 	for (k = no_of_demods - 1; k >= 0; k--) {
- 		dpst->cfg = cfg[k];
-@@ -2324,6 +2346,7 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr,
- 	demod = &st->demod;
- 	demod->demodulator_priv = st;
- 	memcpy(&st->demod.ops, &dib7000p_ops, sizeof(struct dvb_frontend_ops));
-+	mutex_init(&st->i2c_buffer_lock);
- 
- 	dib7000p_write_word(st, 1287, 0x0003);	/* sram lead in, rdy */
- 
-@@ -2333,8 +2356,9 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr,
- 	st->version = dib7000p_read_word(st, 897);
- 
- 	/* FIXME: make sure the dev.parent field is initialized, or else
--		request_firmware() will hit an OOPS (this should be moved somewhere
--		more common) */
-+	   request_firmware() will hit an OOPS (this should be moved somewhere
-+	   more common) */
-+	st->i2c_master.gated_tuner_i2c_adap.dev.parent = i2c_adap->dev.parent;
- 
- 	dibx000_init_i2c_master(&st->i2c_master, DIB7000P, st->i2c_adap, st->i2c_addr);
- 
-diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c
-index 7d2ea11..fe284d5 100644
---- a/drivers/media/dvb/frontends/dib8000.c
-+++ b/drivers/media/dvb/frontends/dib8000.c
-@@ -10,6 +10,8 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/i2c.h>
-+#include <linux/mutex.h>
-+
- #include "dvb_math.h"
- 
- #include "dvb_frontend.h"
-@@ -37,6 +39,7 @@ struct i2c_device {
- 	u8 addr;
- 	u8 *i2c_write_buffer;
- 	u8 *i2c_read_buffer;
-+	struct mutex *i2c_buffer_lock;
- };
- 
- struct dib8000_state {
-@@ -77,6 +80,7 @@ struct dib8000_state {
- 	struct i2c_msg msg[2];
- 	u8 i2c_write_buffer[4];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
- enum dib8000_power_mode {
-@@ -86,24 +90,39 @@ enum dib8000_power_mode {
- 
- static u16 dib8000_i2c_read16(struct i2c_device *i2c, u16 reg)
- {
-+	u16 ret;
- 	struct i2c_msg msg[2] = {
--		{.addr = i2c->addr >> 1, .flags = 0,
--			.buf = i2c->i2c_write_buffer, .len = 2},
--		{.addr = i2c->addr >> 1, .flags = I2C_M_RD,
--			.buf = i2c->i2c_read_buffer, .len = 2},
-+		{.addr = i2c->addr >> 1, .flags = 0, .len = 2},
-+		{.addr = i2c->addr >> 1, .flags = I2C_M_RD, .len = 2},
- 	};
- 
-+	if (mutex_lock_interruptible(i2c->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
-+	msg[0].buf    = i2c->i2c_write_buffer;
- 	msg[0].buf[0] = reg >> 8;
- 	msg[0].buf[1] = reg & 0xff;
-+	msg[1].buf    = i2c->i2c_read_buffer;
- 
- 	if (i2c_transfer(i2c->adap, msg, 2) != 2)
- 		dprintk("i2c read error on %d", reg);
- 
--	return (msg[1].buf[0] << 8) | msg[1].buf[1];
-+	ret = (msg[1].buf[0] << 8) | msg[1].buf[1];
-+	mutex_unlock(i2c->i2c_buffer_lock);
-+	return ret;
- }
- 
- static u16 dib8000_read_word(struct dib8000_state *state, u16 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	state->i2c_write_buffer[0] = reg >> 8;
- 	state->i2c_write_buffer[1] = reg & 0xff;
- 
-@@ -120,7 +139,10 @@ static u16 dib8000_read_word(struct dib8000_state *state, u16 reg)
- 	if (i2c_transfer(state->i2c.adap, state->msg, 2) != 2)
- 		dprintk("i2c read error on %d", reg);
- 
--	return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	ret = (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	mutex_unlock(&state->i2c_buffer_lock);
-+
-+	return ret;
- }
- 
- static u32 dib8000_read32(struct dib8000_state *state, u16 reg)
-@@ -135,22 +157,35 @@ static u32 dib8000_read32(struct dib8000_state *state, u16 reg)
- 
- static int dib8000_i2c_write16(struct i2c_device *i2c, u16 reg, u16 val)
- {
--	struct i2c_msg msg = {.addr = i2c->addr >> 1, .flags = 0,
--		.buf = i2c->i2c_write_buffer, .len = 4};
-+	struct i2c_msg msg = {.addr = i2c->addr >> 1, .flags = 0, .len = 4};
- 	int ret = 0;
- 
-+	if (mutex_lock_interruptible(i2c->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
-+	msg.buf    = i2c->i2c_write_buffer;
- 	msg.buf[0] = (reg >> 8) & 0xff;
- 	msg.buf[1] = reg & 0xff;
- 	msg.buf[2] = (val >> 8) & 0xff;
- 	msg.buf[3] = val & 0xff;
- 
- 	ret = i2c_transfer(i2c->adap, &msg, 1) != 1 ? -EREMOTEIO : 0;
-+	mutex_unlock(i2c->i2c_buffer_lock);
- 
- 	return ret;
- }
- 
- static int dib8000_write_word(struct dib8000_state *state, u16 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
- 	state->i2c_write_buffer[0] = (reg >> 8) & 0xff;
- 	state->i2c_write_buffer[1] = reg & 0xff;
- 	state->i2c_write_buffer[2] = (val >> 8) & 0xff;
-@@ -162,7 +197,11 @@ static int dib8000_write_word(struct dib8000_state *state, u16 reg, u16 val)
- 	state->msg[0].buf = state->i2c_write_buffer;
- 	state->msg[0].len = 4;
- 
--	return i2c_transfer(state->i2c.adap, state->msg, 1) != 1 ? -EREMOTEIO : 0;
-+	ret = (i2c_transfer(state->i2c.adap, state->msg, 1) != 1 ?
-+			-EREMOTEIO : 0);
-+	mutex_unlock(&state->i2c_buffer_lock);
-+
-+	return ret;
- }
- 
- static const s16 coeff_2k_sb_1seg_dqpsk[8] = {
-@@ -2434,8 +2473,15 @@ int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 defau
- 	if (!client.i2c_read_buffer) {
- 		dprintk("%s: not enough memory", __func__);
- 		ret = -ENOMEM;
--		goto error_memory;
-+		goto error_memory_read;
-+	}
-+	client.i2c_buffer_lock = kzalloc(sizeof(struct mutex), GFP_KERNEL);
-+	if (!client.i2c_buffer_lock) {
-+		dprintk("%s: not enough memory", __func__);
-+		ret = -ENOMEM;
-+		goto error_memory_lock;
- 	}
-+	mutex_init(client.i2c_buffer_lock);
- 
- 	for (k = no_of_demods - 1; k >= 0; k--) {
- 		/* designated i2c address */
-@@ -2476,8 +2522,10 @@ int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 defau
- 	}
- 
- error:
-+	kfree(client.i2c_buffer_lock);
-+error_memory_lock:
- 	kfree(client.i2c_read_buffer);
--error_memory:
-+error_memory_read:
- 	kfree(client.i2c_write_buffer);
- 
- 	return ret;
-@@ -2581,6 +2629,8 @@ struct dvb_frontend *dib8000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, s
- 	state->i2c.addr = i2c_addr;
- 	state->i2c.i2c_write_buffer = state->i2c_write_buffer;
- 	state->i2c.i2c_read_buffer = state->i2c_read_buffer;
-+	mutex_init(&state->i2c_buffer_lock);
-+	state->i2c.i2c_buffer_lock = &state->i2c_buffer_lock;
- 	state->gpio_val = cfg->gpio_val;
- 	state->gpio_dir = cfg->gpio_dir;
- 
-diff --git a/drivers/media/dvb/frontends/dib9000.c b/drivers/media/dvb/frontends/dib9000.c
-index a085588..b931074 100644
---- a/drivers/media/dvb/frontends/dib9000.c
-+++ b/drivers/media/dvb/frontends/dib9000.c
-@@ -38,6 +38,15 @@ struct i2c_device {
- #define DibInitLock(lock) mutex_init(lock)
- #define DibFreeLock(lock)
- 
-+struct dib9000_pid_ctrl {
-+#define DIB9000_PID_FILTER_CTRL 0
-+#define DIB9000_PID_FILTER      1
-+	u8 cmd;
-+	u8 id;
-+	u16 pid;
-+	u8 onoff;
-+};
-+
- struct dib9000_state {
- 	struct i2c_device i2c;
- 
-@@ -99,6 +108,10 @@ struct dib9000_state {
- 	struct i2c_msg msg[2];
- 	u8 i2c_write_buffer[255];
- 	u8 i2c_read_buffer[255];
-+	DIB_LOCK demod_lock;
-+	u8 get_frontend_internal;
-+	struct dib9000_pid_ctrl pid_ctrl[10];
-+	s8 pid_ctrl_index; /* -1: empty list; -2: do not use the list */
- };
- 
- static const u32 fe_info[44] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-@@ -1743,19 +1756,56 @@ EXPORT_SYMBOL(dib9000_set_gpio);
- int dib9000_fw_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff)
- {
- 	struct dib9000_state *state = fe->demodulator_priv;
--	u16 val = dib9000_read_word(state, 294 + 1) & 0xffef;
-+	u16 val;
-+	int ret;
-+
-+	if ((state->pid_ctrl_index != -2) && (state->pid_ctrl_index < 9)) {
-+		/* postpone the pid filtering cmd */
-+		dprintk("pid filter cmd postpone");
-+		state->pid_ctrl_index++;
-+		state->pid_ctrl[state->pid_ctrl_index].cmd = DIB9000_PID_FILTER_CTRL;
-+		state->pid_ctrl[state->pid_ctrl_index].onoff = onoff;
-+		return 0;
-+	}
-+
-+	DibAcquireLock(&state->demod_lock);
-+
-+	val = dib9000_read_word(state, 294 + 1) & 0xffef;
- 	val |= (onoff & 0x1) << 4;
- 
- 	dprintk("PID filter enabled %d", onoff);
--	return dib9000_write_word(state, 294 + 1, val);
-+	ret = dib9000_write_word(state, 294 + 1, val);
-+	DibReleaseLock(&state->demod_lock);
-+	return ret;
-+
- }
- EXPORT_SYMBOL(dib9000_fw_pid_filter_ctrl);
- 
- int dib9000_fw_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff)
- {
- 	struct dib9000_state *state = fe->demodulator_priv;
-+	int ret;
-+
-+	if (state->pid_ctrl_index != -2) {
-+		/* postpone the pid filtering cmd */
-+		dprintk("pid filter postpone");
-+		if (state->pid_ctrl_index < 9) {
-+			state->pid_ctrl_index++;
-+			state->pid_ctrl[state->pid_ctrl_index].cmd = DIB9000_PID_FILTER;
-+			state->pid_ctrl[state->pid_ctrl_index].id = id;
-+			state->pid_ctrl[state->pid_ctrl_index].pid = pid;
-+			state->pid_ctrl[state->pid_ctrl_index].onoff = onoff;
-+		} else
-+			dprintk("can not add any more pid ctrl cmd");
-+		return 0;
-+	}
-+
-+	DibAcquireLock(&state->demod_lock);
- 	dprintk("Index %x, PID %d, OnOff %d", id, pid, onoff);
--	return dib9000_write_word(state, 300 + 1 + id, onoff ? (1 << 13) | pid : 0);
-+	ret = dib9000_write_word(state, 300 + 1 + id,
-+			onoff ? (1 << 13) | pid : 0);
-+	DibReleaseLock(&state->demod_lock);
-+	return ret;
- }
- EXPORT_SYMBOL(dib9000_fw_pid_filter);
- 
-@@ -1778,6 +1828,7 @@ static void dib9000_release(struct dvb_frontend *demod)
- 	DibFreeLock(&state->platform.risc.mbx_lock);
- 	DibFreeLock(&state->platform.risc.mem_lock);
- 	DibFreeLock(&state->platform.risc.mem_mbx_lock);
-+	DibFreeLock(&state->demod_lock);
- 	dibx000_exit_i2c_master(&st->i2c_master);
- 
- 	i2c_del_adapter(&st->tuner_adap);
-@@ -1795,14 +1846,19 @@ static int dib9000_sleep(struct dvb_frontend *fe)
- {
- 	struct dib9000_state *state = fe->demodulator_priv;
- 	u8 index_frontend;
--	int ret;
-+	int ret = 0;
- 
-+	DibAcquireLock(&state->demod_lock);
- 	for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
- 		ret = state->fe[index_frontend]->ops.sleep(state->fe[index_frontend]);
- 		if (ret < 0)
--			return ret;
-+			goto error;
- 	}
--	return dib9000_mbx_send(state, OUT_MSG_FE_SLEEP, NULL, 0);
-+	ret = dib9000_mbx_send(state, OUT_MSG_FE_SLEEP, NULL, 0);
-+
-+error:
-+	DibReleaseLock(&state->demod_lock);
-+	return ret;
- }
- 
- static int dib9000_fe_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings *tune)
-@@ -1816,7 +1872,10 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
- 	struct dib9000_state *state = fe->demodulator_priv;
- 	u8 index_frontend, sub_index_frontend;
- 	fe_status_t stat;
--	int ret;
-+	int ret = 0;
-+
-+	if (state->get_frontend_internal == 0)
-+		DibAcquireLock(&state->demod_lock);
- 
- 	for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
- 		state->fe[index_frontend]->ops.read_status(state->fe[index_frontend], &stat);
-@@ -1846,14 +1905,15 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
- 					    state->fe[index_frontend]->dtv_property_cache.rolloff;
- 				}
- 			}
--			return 0;
-+			ret = 0;
-+			goto return_value;
- 		}
- 	}
- 
- 	/* get the channel from master chip */
- 	ret = dib9000_fw_get_channel(fe, fep);
- 	if (ret != 0)
--		return ret;
-+		goto return_value;
- 
- 	/* synchronize the cache with the other frontends */
- 	for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
-@@ -1866,8 +1926,12 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
- 		state->fe[index_frontend]->dtv_property_cache.code_rate_LP = fe->dtv_property_cache.code_rate_LP;
- 		state->fe[index_frontend]->dtv_property_cache.rolloff = fe->dtv_property_cache.rolloff;
- 	}
-+	ret = 0;
- 
--	return 0;
-+return_value:
-+	if (state->get_frontend_internal == 0)
-+		DibReleaseLock(&state->demod_lock);
-+	return ret;
- }
- 
- static int dib9000_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tune_state)
-@@ -1912,6 +1976,10 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
- 		dprintk("dib9000: must specify bandwidth ");
- 		return 0;
- 	}
-+
-+	state->pid_ctrl_index = -1; /* postpone the pid filtering cmd */
-+	DibAcquireLock(&state->demod_lock);
-+
- 	fe->dtv_property_cache.delivery_system = SYS_DVBT;
- 
- 	/* set the master status */
-@@ -1974,13 +2042,18 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
- 	/* check the tune result */
- 	if (exit_condition == 1) {	/* tune failed */
- 		dprintk("tune failed");
-+		DibReleaseLock(&state->demod_lock);
-+		/* tune failed; put all the pid filtering cmd to junk */
-+		state->pid_ctrl_index = -1;
- 		return 0;
- 	}
- 
- 	dprintk("tune success on frontend%i", index_frontend_success);
- 
- 	/* synchronize all the channel cache */
-+	state->get_frontend_internal = 1;
- 	dib9000_get_frontend(state->fe[0], fep);
-+	state->get_frontend_internal = 0;
- 
- 	/* retune the other frontends with the found channel */
- 	channel_status.status = CHANNEL_STATUS_PARAMETERS_SET;
-@@ -2025,6 +2098,28 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
- 	/* turn off the diversity for the last frontend */
- 	dib9000_fw_set_diversity_in(state->fe[index_frontend - 1], 0);
- 
-+	DibReleaseLock(&state->demod_lock);
-+	if (state->pid_ctrl_index >= 0) {
-+		u8 index_pid_filter_cmd;
-+		u8 pid_ctrl_index = state->pid_ctrl_index;
-+
-+		state->pid_ctrl_index = -2;
-+		for (index_pid_filter_cmd = 0;
-+				index_pid_filter_cmd <= pid_ctrl_index;
-+				index_pid_filter_cmd++) {
-+			if (state->pid_ctrl[index_pid_filter_cmd].cmd == DIB9000_PID_FILTER_CTRL)
-+				dib9000_fw_pid_filter_ctrl(state->fe[0],
-+						state->pid_ctrl[index_pid_filter_cmd].onoff);
-+			else if (state->pid_ctrl[index_pid_filter_cmd].cmd == DIB9000_PID_FILTER)
-+				dib9000_fw_pid_filter(state->fe[0],
-+						state->pid_ctrl[index_pid_filter_cmd].id,
-+						state->pid_ctrl[index_pid_filter_cmd].pid,
-+						state->pid_ctrl[index_pid_filter_cmd].onoff);
-+		}
-+	}
-+	/* do not postpone any more the pid filtering */
-+	state->pid_ctrl_index = -2;
-+
- 	return 0;
- }
- 
-@@ -2041,6 +2136,7 @@ static int dib9000_read_status(struct dvb_frontend *fe, fe_status_t * stat)
- 	u8 index_frontend;
- 	u16 lock = 0, lock_slave = 0;
- 
-+	DibAcquireLock(&state->demod_lock);
- 	for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++)
- 		lock_slave |= dib9000_read_lock(state->fe[index_frontend]);
- 
-@@ -2059,6 +2155,8 @@ static int dib9000_read_status(struct dvb_frontend *fe, fe_status_t * stat)
- 	if ((lock & 0x0008) || (lock_slave & 0x0008))
- 		*stat |= FE_HAS_LOCK;
- 
-+	DibReleaseLock(&state->demod_lock);
-+
- 	return 0;
- }
- 
-@@ -2066,10 +2164,14 @@ static int dib9000_read_ber(struct dvb_frontend *fe, u32 * ber)
- {
- 	struct dib9000_state *state = fe->demodulator_priv;
- 	u16 *c;
-+	int ret = 0;
- 
-+	DibAcquireLock(&state->demod_lock);
- 	DibAcquireLock(&state->platform.risc.mem_mbx_lock);
--	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0)
--		return -EIO;
-+	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {
-+		ret = -EIO;
-+		goto error;
-+	}
- 	dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR,
- 			state->i2c_read_buffer, 16 * 2);
- 	DibReleaseLock(&state->platform.risc.mem_mbx_lock);
-@@ -2077,7 +2179,10 @@ static int dib9000_read_ber(struct dvb_frontend *fe, u32 * ber)
- 	c = (u16 *)state->i2c_read_buffer;
- 
- 	*ber = c[10] << 16 | c[11];
--	return 0;
-+
-+error:
-+	DibReleaseLock(&state->demod_lock);
-+	return ret;
- }
- 
- static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
-@@ -2086,7 +2191,9 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
- 	u8 index_frontend;
- 	u16 *c = (u16 *)state->i2c_read_buffer;
- 	u16 val;
-+	int ret = 0;
- 
-+	DibAcquireLock(&state->demod_lock);
- 	*strength = 0;
- 	for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
- 		state->fe[index_frontend]->ops.read_signal_strength(state->fe[index_frontend], &val);
-@@ -2097,8 +2204,10 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
- 	}
- 
- 	DibAcquireLock(&state->platform.risc.mem_mbx_lock);
--	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0)
--		return -EIO;
-+	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {
-+		ret = -EIO;
-+		goto error;
-+	}
- 	dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2);
- 	DibReleaseLock(&state->platform.risc.mem_mbx_lock);
- 
-@@ -2107,7 +2216,10 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
- 		*strength = 65535;
- 	else
- 		*strength += val;
--	return 0;
-+
-+error:
-+	DibReleaseLock(&state->demod_lock);
-+	return ret;
- }
- 
- static u32 dib9000_get_snr(struct dvb_frontend *fe)
-@@ -2151,6 +2263,7 @@ static int dib9000_read_snr(struct dvb_frontend *fe, u16 * snr)
- 	u8 index_frontend;
- 	u32 snr_master;
- 
-+	DibAcquireLock(&state->demod_lock);
- 	snr_master = dib9000_get_snr(fe);
- 	for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++)
- 		snr_master += dib9000_get_snr(state->fe[index_frontend]);
-@@ -2161,6 +2274,8 @@ static int dib9000_read_snr(struct dvb_frontend *fe, u16 * snr)
- 	} else
- 		*snr = 0;
- 
-+	DibReleaseLock(&state->demod_lock);
-+
- 	return 0;
- }
- 
-@@ -2168,15 +2283,22 @@ static int dib9000_read_unc_blocks(struct dvb_frontend *fe, u32 * unc)
- {
- 	struct dib9000_state *state = fe->demodulator_priv;
- 	u16 *c = (u16 *)state->i2c_read_buffer;
-+	int ret = 0;
- 
-+	DibAcquireLock(&state->demod_lock);
- 	DibAcquireLock(&state->platform.risc.mem_mbx_lock);
--	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0)
--		return -EIO;
-+	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {
-+		ret = -EIO;
-+		goto error;
-+	}
- 	dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2);
- 	DibReleaseLock(&state->platform.risc.mem_mbx_lock);
- 
- 	*unc = c[12];
--	return 0;
-+
-+error:
-+	DibReleaseLock(&state->demod_lock);
-+	return ret;
- }
- 
- int dib9000_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, u8 first_addr)
-@@ -2322,6 +2444,10 @@ struct dvb_frontend *dib9000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, c
- 	DibInitLock(&st->platform.risc.mbx_lock);
- 	DibInitLock(&st->platform.risc.mem_lock);
- 	DibInitLock(&st->platform.risc.mem_mbx_lock);
-+	DibInitLock(&st->demod_lock);
-+	st->get_frontend_internal = 0;
-+
-+	st->pid_ctrl_index = -2;
- 
- 	st->fe[0] = fe;
- 	fe->demodulator_priv = st;
-diff --git a/drivers/media/dvb/frontends/dibx000_common.c b/drivers/media/dvb/frontends/dibx000_common.c
-index dc5d17a..774d507 100644
---- a/drivers/media/dvb/frontends/dibx000_common.c
-+++ b/drivers/media/dvb/frontends/dibx000_common.c
-@@ -1,4 +1,5 @@
- #include <linux/i2c.h>
-+#include <linux/mutex.h>
- 
- #include "dibx000_common.h"
- 
-@@ -10,6 +11,13 @@ MODULE_PARM_DESC(debug, "turn on debugging (default: 0)");
- 
- static int dibx000_write_word(struct dibx000_i2c_master *mst, u16 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
- 	mst->i2c_write_buffer[0] = (reg >> 8) & 0xff;
- 	mst->i2c_write_buffer[1] = reg & 0xff;
- 	mst->i2c_write_buffer[2] = (val >> 8) & 0xff;
-@@ -21,11 +29,21 @@ static int dibx000_write_word(struct dibx000_i2c_master *mst, u16 reg, u16 val)
- 	mst->msg[0].buf = mst->i2c_write_buffer;
- 	mst->msg[0].len = 4;
- 
--	return i2c_transfer(mst->i2c_adap, mst->msg, 1) != 1 ? -EREMOTEIO : 0;
-+	ret = i2c_transfer(mst->i2c_adap, mst->msg, 1) != 1 ? -EREMOTEIO : 0;
-+	mutex_unlock(&mst->i2c_buffer_lock);
-+
-+	return ret;
- }
- 
- static u16 dibx000_read_word(struct dibx000_i2c_master *mst, u16 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	mst->i2c_write_buffer[0] = reg >> 8;
- 	mst->i2c_write_buffer[1] = reg & 0xff;
- 
-@@ -42,7 +60,10 @@ static u16 dibx000_read_word(struct dibx000_i2c_master *mst, u16 reg)
- 	if (i2c_transfer(mst->i2c_adap, mst->msg, 2) != 2)
- 		dprintk("i2c read error on %d", reg);
- 
--	return (mst->i2c_read_buffer[0] << 8) | mst->i2c_read_buffer[1];
-+	ret = (mst->i2c_read_buffer[0] << 8) | mst->i2c_read_buffer[1];
-+	mutex_unlock(&mst->i2c_buffer_lock);
-+
-+	return ret;
- }
- 
- static int dibx000_is_i2c_done(struct dibx000_i2c_master *mst)
-@@ -257,6 +278,7 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap,
- 					struct i2c_msg msg[], int num)
- {
- 	struct dibx000_i2c_master *mst = i2c_get_adapdata(i2c_adap);
-+	int ret;
- 
- 	if (num > 32) {
- 		dprintk("%s: too much I2C message to be transmitted (%i).\
-@@ -264,10 +286,15 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap,
- 		return -ENOMEM;
- 	}
- 
--	memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num));
--
- 	dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_GPIO_6_7);
- 
-+	if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
-+	memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num));
-+
- 	/* open the gate */
- 	dibx000_i2c_gate_ctrl(mst, &mst->i2c_write_buffer[0], msg[0].addr, 1);
- 	mst->msg[0].addr = mst->i2c_addr;
-@@ -282,7 +309,11 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap,
- 	mst->msg[num + 1].buf = &mst->i2c_write_buffer[4];
- 	mst->msg[num + 1].len = 4;
- 
--	return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? num : -EIO;
-+	ret = (i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ?
-+			num : -EIO);
-+
-+	mutex_unlock(&mst->i2c_buffer_lock);
-+	return ret;
- }
- 
- static struct i2c_algorithm dibx000_i2c_gated_gpio67_algo = {
-@@ -294,6 +325,7 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap,
- 					struct i2c_msg msg[], int num)
- {
- 	struct dibx000_i2c_master *mst = i2c_get_adapdata(i2c_adap);
-+	int ret;
- 
- 	if (num > 32) {
- 		dprintk("%s: too much I2C message to be transmitted (%i).\
-@@ -301,10 +333,14 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap,
- 		return -ENOMEM;
- 	}
- 
--	memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num));
--
- 	dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_TUNER);
- 
-+	if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+	memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num));
-+
- 	/* open the gate */
- 	dibx000_i2c_gate_ctrl(mst, &mst->i2c_write_buffer[0], msg[0].addr, 1);
- 	mst->msg[0].addr = mst->i2c_addr;
-@@ -319,7 +355,10 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap,
- 	mst->msg[num + 1].buf = &mst->i2c_write_buffer[4];
- 	mst->msg[num + 1].len = 4;
- 
--	return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? num : -EIO;
-+	ret = (i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ?
-+			num : -EIO);
-+	mutex_unlock(&mst->i2c_buffer_lock);
-+	return ret;
- }
- 
- static struct i2c_algorithm dibx000_i2c_gated_tuner_algo = {
-@@ -390,8 +429,18 @@ static int i2c_adapter_init(struct i2c_adapter *i2c_adap,
- int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, u16 device_rev,
- 				struct i2c_adapter *i2c_adap, u8 i2c_addr)
- {
--	u8 tx[4];
--	struct i2c_msg m = {.addr = i2c_addr >> 1,.buf = tx,.len = 4 };
-+	int ret;
-+
-+	mutex_init(&mst->i2c_buffer_lock);
-+	if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+	memset(mst->msg, 0, sizeof(struct i2c_msg));
-+	mst->msg[0].addr = i2c_addr >> 1;
-+	mst->msg[0].flags = 0;
-+	mst->msg[0].buf = mst->i2c_write_buffer;
-+	mst->msg[0].len = 4;
- 
- 	mst->device_rev = device_rev;
- 	mst->i2c_adap = i2c_adap;
-@@ -431,9 +480,12 @@ int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, u16 device_rev,
- 				"DiBX000: could not initialize the master i2c_adapter\n");
- 
- 	/* initialize the i2c-master by closing the gate */
--	dibx000_i2c_gate_ctrl(mst, tx, 0, 0);
-+	dibx000_i2c_gate_ctrl(mst, mst->i2c_write_buffer, 0, 0);
-+
-+	ret = (i2c_transfer(i2c_adap, mst->msg, 1) == 1);
-+	mutex_unlock(&mst->i2c_buffer_lock);
- 
--	return i2c_transfer(i2c_adap, &m, 1) == 1;
-+	return ret;
- }
- 
- EXPORT_SYMBOL(dibx000_init_i2c_master);
-diff --git a/drivers/media/dvb/frontends/dibx000_common.h b/drivers/media/dvb/frontends/dibx000_common.h
-index f031165..5e01147 100644
---- a/drivers/media/dvb/frontends/dibx000_common.h
-+++ b/drivers/media/dvb/frontends/dibx000_common.h
-@@ -33,6 +33,7 @@ struct dibx000_i2c_master {
- 	struct i2c_msg msg[34];
- 	u8 i2c_write_buffer[8];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
- extern int dibx000_init_i2c_master(struct dibx000_i2c_master *mst,
-diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
-index 3c315f9..2b5cd21 100644
---- a/drivers/media/video/cx23885/cx23885-dvb.c
-+++ b/drivers/media/video/cx23885/cx23885-dvb.c
-@@ -843,7 +843,7 @@ static int dvb_register(struct cx23885_tsport *port)
- 			static struct xc2028_ctrl ctl = {
- 				.fname   = XC3028L_DEFAULT_FIRMWARE,
- 				.max_len = 64,
--				.demod   = 5000,
-+				.demod   = XC3028_FE_DIBCOM52,
- 				/* This is true for all demods with
- 					v36 firmware? */
- 				.type    = XC2028_D2633,
-diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
-index b6eae48..1f962dc 100644
---- a/drivers/media/video/uvc/uvc_driver.c
-+++ b/drivers/media/video/uvc/uvc_driver.c
-@@ -1960,7 +1960,7 @@ static int __uvc_resume(struct usb_interface *intf, int reset)
- 
- 	list_for_each_entry(stream, &dev->streams, list) {
- 		if (stream->intf == intf)
--			return uvc_video_resume(stream);
-+			return uvc_video_resume(stream, reset);
- 	}
- 
- 	uvc_trace(UVC_TRACE_SUSPEND, "Resume: video streaming USB interface "
-diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
-index 4999479..6f147de 100644
---- a/drivers/media/video/uvc/uvc_video.c
-+++ b/drivers/media/video/uvc/uvc_video.c
-@@ -1104,10 +1104,18 @@ int uvc_video_suspend(struct uvc_streaming *stream)
-  * buffers, making sure userspace applications are notified of the problem
-  * instead of waiting forever.
-  */
--int uvc_video_resume(struct uvc_streaming *stream)
-+int uvc_video_resume(struct uvc_streaming *stream, int reset)
- {
- 	int ret;
- 
-+	/* If the bus has been reset on resume, set the alternate setting to 0.
-+	 * This should be the default value, but some devices crash or otherwise
-+	 * misbehave if they don't receive a SET_INTERFACE request before any
-+	 * other video control request.
-+	 */
-+	if (reset)
-+		usb_set_interface(stream->dev->udev, stream->intfnum, 0);
-+
- 	stream->frozen = 0;
- 
- 	ret = uvc_commit_video(stream, &stream->ctrl);
-diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
-index 20107fd..2a38d5e 100644
---- a/drivers/media/video/uvc/uvcvideo.h
-+++ b/drivers/media/video/uvc/uvcvideo.h
-@@ -639,7 +639,7 @@ extern void uvc_mc_cleanup_entity(struct uvc_entity *entity);
- /* Video */
- extern int uvc_video_init(struct uvc_streaming *stream);
- extern int uvc_video_suspend(struct uvc_streaming *stream);
--extern int uvc_video_resume(struct uvc_streaming *stream);
-+extern int uvc_video_resume(struct uvc_streaming *stream, int reset);
- extern int uvc_video_enable(struct uvc_streaming *stream, int enable);
- extern int uvc_probe_video(struct uvc_streaming *stream,
- 		struct uvc_streaming_control *probe);
-diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
-index 38089b2..75db30e6 100644
---- a/drivers/mmc/core/core.c
-+++ b/drivers/mmc/core/core.c
-@@ -1057,7 +1057,7 @@ static void mmc_power_up(struct mmc_host *host)
- 	mmc_host_clk_release(host);
- }
- 
--static void mmc_power_off(struct mmc_host *host)
-+void mmc_power_off(struct mmc_host *host)
- {
- 	mmc_host_clk_hold(host);
- 
-@@ -1147,8 +1147,7 @@ void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops)
- }
- 
- /*
-- * Remove the current bus handler from a host. Assumes that there are
-- * no interesting cards left, so the bus is powered down.
-+ * Remove the current bus handler from a host.
-  */
- void mmc_detach_bus(struct mmc_host *host)
- {
-@@ -1165,8 +1164,6 @@ void mmc_detach_bus(struct mmc_host *host)
- 
- 	spin_unlock_irqrestore(&host->lock, flags);
- 
--	mmc_power_off(host);
--
- 	mmc_bus_put(host);
- }
- 
-@@ -1675,6 +1672,7 @@ void mmc_stop_host(struct mmc_host *host)
- 
- 		mmc_claim_host(host);
- 		mmc_detach_bus(host);
-+		mmc_power_off(host);
- 		mmc_release_host(host);
- 		mmc_bus_put(host);
- 		return;
-@@ -1796,6 +1794,7 @@ int mmc_suspend_host(struct mmc_host *host)
- 				host->bus_ops->remove(host);
- 			mmc_claim_host(host);
- 			mmc_detach_bus(host);
-+			mmc_power_off(host);
- 			mmc_release_host(host);
- 			host->pm_flags = 0;
- 			err = 0;
-@@ -1883,6 +1882,7 @@ int mmc_pm_notify(struct notifier_block *notify_block,
- 			host->bus_ops->remove(host);
- 
- 		mmc_detach_bus(host);
-+		mmc_power_off(host);
- 		mmc_release_host(host);
- 		host->pm_flags = 0;
- 		break;
-diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
-index d9411ed..14664f1 100644
---- a/drivers/mmc/core/core.h
-+++ b/drivers/mmc/core/core.h
-@@ -43,6 +43,7 @@ int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage,
- 			   bool cmd11);
- void mmc_set_timing(struct mmc_host *host, unsigned int timing);
- void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type);
-+void mmc_power_off(struct mmc_host *host);
- 
- static inline void mmc_delay(unsigned int ms)
- {
-diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
-index aa7d1d7..20b42c8 100644
---- a/drivers/mmc/core/mmc.c
-+++ b/drivers/mmc/core/mmc.c
-@@ -359,6 +359,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
- 		 * card has the Enhanced area enabled.  If so, export enhanced
- 		 * area offset and size to user by adding sysfs interface.
- 		 */
-+		card->ext_csd.raw_partition_support = ext_csd[EXT_CSD_PARTITION_SUPPORT];
- 		if ((ext_csd[EXT_CSD_PARTITION_SUPPORT] & 0x2) &&
- 		    (ext_csd[EXT_CSD_PARTITION_ATTRIBUTE] & 0x1)) {
- 			u8 hc_erase_grp_sz =
-@@ -405,6 +406,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
- 	if (card->ext_csd.rev >= 5)
- 		card->ext_csd.rel_param = ext_csd[EXT_CSD_WR_REL_PARAM];
- 
-+	card->ext_csd.raw_erased_mem_count = ext_csd[EXT_CSD_ERASED_MEM_CONT];
- 	if (ext_csd[EXT_CSD_ERASED_MEM_CONT])
- 		card->erased_byte = 0xFF;
- 	else
-@@ -891,6 +893,7 @@ static void mmc_detect(struct mmc_host *host)
- 
- 		mmc_claim_host(host);
- 		mmc_detach_bus(host);
-+		mmc_power_off(host);
- 		mmc_release_host(host);
- 	}
- }
-diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
-index ff27741..bd8805c 100644
---- a/drivers/mmc/core/sd.c
-+++ b/drivers/mmc/core/sd.c
-@@ -1008,6 +1008,7 @@ static void mmc_sd_detect(struct mmc_host *host)
- 
- 		mmc_claim_host(host);
- 		mmc_detach_bus(host);
-+		mmc_power_off(host);
- 		mmc_release_host(host);
- 	}
- }
-diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
-index 262fff0..ac492ac 100644
---- a/drivers/mmc/core/sdio.c
-+++ b/drivers/mmc/core/sdio.c
-@@ -597,6 +597,7 @@ out:
- 
- 		mmc_claim_host(host);
- 		mmc_detach_bus(host);
-+		mmc_power_off(host);
- 		mmc_release_host(host);
- 	}
- }
-diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
-index 3f92731..9f8658e 100644
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -320,6 +320,7 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count
- 			ops.mode = MTD_OOB_RAW;
- 			ops.datbuf = kbuf;
- 			ops.oobbuf = NULL;
-+			ops.ooboffs = 0;
- 			ops.len = len;
- 
- 			ret = mtd->write_oob(mtd, *ppos, &ops);
-diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
-index a46e9bb..86f05f4 100644
---- a/drivers/mtd/nand/nand_base.c
-+++ b/drivers/mtd/nand/nand_base.c
-@@ -2097,14 +2097,22 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,
- 
- /**
-  * nand_fill_oob - [Internal] Transfer client buffer to oob
-- * @chip:	nand chip structure
-+ * @mtd:	MTD device structure
-  * @oob:	oob data buffer
-  * @len:	oob data write length
-  * @ops:	oob ops structure
-  */
--static uint8_t *nand_fill_oob(struct nand_chip *chip, uint8_t *oob, size_t len,
--						struct mtd_oob_ops *ops)
-+static uint8_t *nand_fill_oob(struct mtd_info *mtd, uint8_t *oob, size_t len,
-+			      struct mtd_oob_ops *ops)
- {
-+	struct nand_chip *chip = mtd->priv;
-+
-+	/*
-+	 * Initialise to all 0xFF, to avoid the possibility of left over OOB
-+	 * data from a previous OOB read.
-+	 */
-+	memset(chip->oob_poi, 0xff, mtd->oobsize);
-+
- 	switch (ops->mode) {
- 
- 	case MTD_OOB_PLACE:
-@@ -2201,10 +2209,6 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
- 	    (chip->pagebuf << chip->page_shift) < (to + ops->len))
- 		chip->pagebuf = -1;
- 
--	/* If we're not given explicit OOB data, let it be 0xFF */
--	if (likely(!oob))
--		memset(chip->oob_poi, 0xff, mtd->oobsize);
--
- 	/* Don't allow multipage oob writes with offset */
- 	if (oob && ops->ooboffs && (ops->ooboffs + ops->ooblen > oobmaxlen))
- 		return -EINVAL;
-@@ -2226,8 +2230,11 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
- 
- 		if (unlikely(oob)) {
- 			size_t len = min(oobwritelen, oobmaxlen);
--			oob = nand_fill_oob(chip, oob, len, ops);
-+			oob = nand_fill_oob(mtd, oob, len, ops);
- 			oobwritelen -= len;
-+		} else {
-+			/* We still need to erase leftover OOB data */
-+			memset(chip->oob_poi, 0xff, mtd->oobsize);
- 		}
- 
- 		ret = chip->write_page(mtd, chip, wbuf, page, cached,
-@@ -2401,10 +2408,8 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
- 	if (page == chip->pagebuf)
- 		chip->pagebuf = -1;
- 
--	memset(chip->oob_poi, 0xff, mtd->oobsize);
--	nand_fill_oob(chip, ops->oobbuf, ops->ooblen, ops);
-+	nand_fill_oob(mtd, ops->oobbuf, ops->ooblen, ops);
- 	status = chip->ecc.write_oob(mtd, chip, page & chip->pagemask);
--	memset(chip->oob_poi, 0xff, mtd->oobsize);
- 
- 	if (status)
- 		return status;
-diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
-index 1fb3b3a..30689cc 100644
---- a/drivers/mtd/nand/pxa3xx_nand.c
-+++ b/drivers/mtd/nand/pxa3xx_nand.c
-@@ -685,6 +685,8 @@ static int pxa3xx_nand_read_page_hwecc(struct mtd_info *mtd,
- 		 * OOB, ignore such double bit errors
- 		 */
- 		if (is_buf_blank(buf, mtd->writesize))
-+			info->retcode = ERR_NONE;
-+		else
- 			mtd->ecc_stats.failed++;
- 	}
- 
-@@ -813,7 +815,7 @@ static int pxa3xx_nand_detect_config(struct pxa3xx_nand_info *info)
- 	info->page_size = ndcr & NDCR_PAGE_SZ ? 2048 : 512;
- 	/* set info fields needed to read id */
- 	info->read_id_bytes = (info->page_size == 2048) ? 4 : 2;
--	info->reg_ndcr = ndcr;
-+	info->reg_ndcr = ndcr & ~NDCR_INT_MASK;
- 	info->cmdset = &default_cmdset;
- 
- 	info->ndtr0cs0 = nand_readl(info, NDTR0CS0);
-@@ -882,7 +884,7 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
- 	struct pxa3xx_nand_info *info = mtd->priv;
- 	struct platform_device *pdev = info->pdev;
- 	struct pxa3xx_nand_platform_data *pdata = pdev->dev.platform_data;
--	struct nand_flash_dev pxa3xx_flash_ids[2] = { {NULL,}, {NULL,} };
-+	struct nand_flash_dev pxa3xx_flash_ids[2], *def = NULL;
- 	const struct pxa3xx_nand_flash *f = NULL;
- 	struct nand_chip *chip = mtd->priv;
- 	uint32_t id = -1;
-@@ -942,8 +944,10 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
- 	pxa3xx_flash_ids[0].erasesize = f->page_size * f->page_per_block;
- 	if (f->flash_width == 16)
- 		pxa3xx_flash_ids[0].options = NAND_BUSWIDTH_16;
-+	pxa3xx_flash_ids[1].name = NULL;
-+	def = pxa3xx_flash_ids;
- KEEP_CONFIG:
--	if (nand_scan_ident(mtd, 1, pxa3xx_flash_ids))
-+	if (nand_scan_ident(mtd, 1, def))
- 		return -ENODEV;
- 	/* calculate addressing information */
- 	info->col_addr_cycles = (mtd->writesize >= 2048) ? 2 : 1;
-@@ -954,9 +958,9 @@ KEEP_CONFIG:
- 		info->row_addr_cycles = 2;
- 	mtd->name = mtd_names[0];
- 	chip->ecc.mode = NAND_ECC_HW;
--	chip->ecc.size = f->page_size;
-+	chip->ecc.size = info->page_size;
- 
--	chip->options = (f->flash_width == 16) ? NAND_BUSWIDTH_16 : 0;
-+	chip->options = (info->reg_ndcr & NDCR_DWIDTH_M) ? NAND_BUSWIDTH_16 : 0;
- 	chip->options |= NAND_NO_AUTOINCR;
- 	chip->options |= NAND_NO_READRDY;
- 
-diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
-index 7a87d07..4938bd0 100644
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -297,6 +297,9 @@ static struct mtd_part_parser redboot_parser = {
- 	.name = "RedBoot",
- };
- 
-+/* mtd parsers will request the module by parser name */
-+MODULE_ALIAS("RedBoot");
-+
- static int __init redboot_parser_init(void)
- {
- 	return register_mtd_parser(&redboot_parser);
-diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
-index 9ea2f21..2065cb4 100644
---- a/drivers/net/bonding/bond_main.c
-+++ b/drivers/net/bonding/bond_main.c
-@@ -1500,6 +1500,8 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
- 	struct sk_buff *skb = *pskb;
- 	struct slave *slave;
- 	struct bonding *bond;
-+	void (*recv_probe)(struct sk_buff *, struct bonding *,
-+				struct slave *);
- 
- 	skb = skb_share_check(skb, GFP_ATOMIC);
- 	if (unlikely(!skb))
-@@ -1513,11 +1515,12 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
- 	if (bond->params.arp_interval)
- 		slave->dev->last_rx = jiffies;
- 
--	if (bond->recv_probe) {
-+	recv_probe = ACCESS_ONCE(bond->recv_probe);
-+	if (recv_probe) {
- 		struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);
- 
- 		if (likely(nskb)) {
--			bond->recv_probe(nskb, bond, slave);
-+			recv_probe(nskb, bond, slave);
- 			dev_kfree_skb(nskb);
- 		}
- 	}
-diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
-index 2f433fb..51fba5f 100644
---- a/drivers/net/enic/enic_main.c
-+++ b/drivers/net/enic/enic_main.c
-@@ -1718,8 +1718,12 @@ static void enic_poll_controller(struct net_device *netdev)
- 			enic_isr_msix_rq(enic->msix_entry[intr].vector,
- 				&enic->napi[i]);
- 		}
--		intr = enic_msix_wq_intr(enic, i);
--		enic_isr_msix_wq(enic->msix_entry[intr].vector, enic);
-+
-+		for (i = 0; i < enic->wq_count; i++) {
-+			intr = enic_msix_wq_intr(enic, i);
-+			enic_isr_msix_wq(enic->msix_entry[intr].vector, enic);
-+		}
-+
- 		break;
- 	case VNIC_DEV_INTR_MODE_MSI:
- 		enic_isr_msi(enic->pdev->irq, enic);
-diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
-index 2f3c48d..ab4723d 100644
---- a/drivers/net/macvlan.c
-+++ b/drivers/net/macvlan.c
-@@ -239,7 +239,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
- 		dest = macvlan_hash_lookup(port, eth->h_dest);
- 		if (dest && dest->mode == MACVLAN_MODE_BRIDGE) {
- 			/* send to lowerdev first for its network taps */
--			vlan->forward(vlan->lowerdev, skb);
-+			dev_forward_skb(vlan->lowerdev, skb);
- 
- 			return NET_XMIT_SUCCESS;
- 		}
-diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
-index dfc8272..4840ab7 100644
---- a/drivers/net/netconsole.c
-+++ b/drivers/net/netconsole.c
-@@ -307,6 +307,11 @@ static ssize_t store_enabled(struct netconsole_target *nt,
- 		return err;
- 	if (enabled < 0 || enabled > 1)
- 		return -EINVAL;
-+	if (enabled == nt->enabled) {
-+		printk(KERN_INFO "netconsole: network logging has already %s\n",
-+				nt->enabled ? "started" : "stopped");
-+		return -EINVAL;
-+	}
- 
- 	if (enabled) {	/* 1 */
- 
-diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
-index cb6e0b4..364cd67 100644
---- a/drivers/net/phy/dp83640.c
-+++ b/drivers/net/phy/dp83640.c
-@@ -875,6 +875,7 @@ static void dp83640_remove(struct phy_device *phydev)
- 	struct dp83640_clock *clock;
- 	struct list_head *this, *next;
- 	struct dp83640_private *tmp, *dp83640 = phydev->priv;
-+	struct sk_buff *skb;
- 
- 	if (phydev->addr == BROADCAST_ADDR)
- 		return;
-@@ -882,6 +883,12 @@ static void dp83640_remove(struct phy_device *phydev)
- 	enable_status_frames(phydev, false);
- 	cancel_work_sync(&dp83640->ts_work);
- 
-+	while ((skb = skb_dequeue(&dp83640->rx_queue)) != NULL)
-+		kfree_skb(skb);
-+
-+	while ((skb = skb_dequeue(&dp83640->tx_queue)) != NULL)
-+		skb_complete_tx_timestamp(skb, NULL);
-+
- 	clock = dp83640_clock_get(dp83640->clock);
- 
- 	if (dp83640 == clock->chosen) {
-@@ -1060,7 +1067,7 @@ static void dp83640_txtstamp(struct phy_device *phydev,
- 	struct dp83640_private *dp83640 = phydev->priv;
- 
- 	if (!dp83640->hwts_tx_en) {
--		kfree_skb(skb);
-+		skb_complete_tx_timestamp(skb, NULL);
- 		return;
- 	}
- 	skb_queue_tail(&dp83640->tx_queue, skb);
-diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
-index ca4694e..1f421d7 100644
---- a/drivers/net/rionet.c
-+++ b/drivers/net/rionet.c
-@@ -88,8 +88,8 @@ static struct rio_dev **rionet_active;
- #define dev_rionet_capable(dev) \
- 	is_rionet_capable(dev->src_ops, dev->dst_ops)
- 
--#define RIONET_MAC_MATCH(x)	(*(u32 *)x == 0x00010001)
--#define RIONET_GET_DESTID(x)	(*(u16 *)(x + 4))
-+#define RIONET_MAC_MATCH(x)	(!memcmp((x), "\00\01\00\01", 4))
-+#define RIONET_GET_DESTID(x)	((*((u8 *)x + 4) << 8) | *((u8 *)x + 5))
- 
- static int rionet_rx_clean(struct net_device *ndev)
- {
-diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
-index 38f6859..bc8c183 100644
---- a/drivers/net/tg3.c
-+++ b/drivers/net/tg3.c
-@@ -15278,7 +15278,7 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev)
- 
- 		cancel_work_sync(&tp->reset_task);
- 
--		if (!tg3_flag(tp, USE_PHYLIB)) {
-+		if (tg3_flag(tp, USE_PHYLIB)) {
- 			tg3_phy_fini(tp);
- 			tg3_mdio_fini(tp);
- 		}
-diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
-index 5250288..c5c4b4d 100644
---- a/drivers/net/usb/asix.c
-+++ b/drivers/net/usb/asix.c
-@@ -314,12 +314,11 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
- 	skb_pull(skb, 4);
- 
- 	while (skb->len > 0) {
--		if ((short)(header & 0x0000ffff) !=
--		    ~((short)((header & 0xffff0000) >> 16))) {
-+		if ((header & 0x07ff) != ((~header >> 16) & 0x07ff))
- 			netdev_err(dev->net, "asix_rx_fixup() Bad Header Length\n");
--		}
-+
- 		/* get the packet length */
--		size = (u16) (header & 0x0000ffff);
-+		size = (u16) (header & 0x000007ff);
- 
- 		if ((skb->len) - ((size + 1) & 0xfffe) == 0) {
- 			u8 alignment = (unsigned long)skb->data & 0x3;
-diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
-index d3b9e95..6a53161 100644
---- a/drivers/net/usb/cdc_ncm.c
-+++ b/drivers/net/usb/cdc_ncm.c
-@@ -229,23 +229,40 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
- 	if (ctx->rx_max != le32_to_cpu(ctx->ncm_parm.dwNtbInMaxSize)) {
- 
- 		if (flags & USB_CDC_NCM_NCAP_NTB_INPUT_SIZE) {
--			struct usb_cdc_ncm_ndp_input_size ndp_in_sz;
-+			struct usb_cdc_ncm_ndp_input_size *ndp_in_sz;
-+
-+			ndp_in_sz = kzalloc(sizeof(*ndp_in_sz), GFP_KERNEL);
-+			if (!ndp_in_sz) {
-+				err = -ENOMEM;
-+				goto size_err;
-+			}
-+
- 			err = usb_control_msg(ctx->udev,
- 					usb_sndctrlpipe(ctx->udev, 0),
- 					USB_CDC_SET_NTB_INPUT_SIZE,
- 					USB_TYPE_CLASS | USB_DIR_OUT
- 					 | USB_RECIP_INTERFACE,
--					0, iface_no, &ndp_in_sz, 8, 1000);
-+					0, iface_no, ndp_in_sz, 8, 1000);
-+			kfree(ndp_in_sz);
- 		} else {
--			__le32 dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
-+			__le32 *dwNtbInMaxSize;
-+			dwNtbInMaxSize = kzalloc(sizeof(*dwNtbInMaxSize),
-+					GFP_KERNEL);
-+			if (!dwNtbInMaxSize) {
-+				err = -ENOMEM;
-+				goto size_err;
-+			}
-+			*dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
-+
- 			err = usb_control_msg(ctx->udev,
- 					usb_sndctrlpipe(ctx->udev, 0),
- 					USB_CDC_SET_NTB_INPUT_SIZE,
- 					USB_TYPE_CLASS | USB_DIR_OUT
- 					 | USB_RECIP_INTERFACE,
--					0, iface_no, &dwNtbInMaxSize, 4, 1000);
-+					0, iface_no, dwNtbInMaxSize, 4, 1000);
-+			kfree(dwNtbInMaxSize);
- 		}
--
-+size_err:
- 		if (err < 0)
- 			pr_debug("Setting NTB Input Size failed\n");
- 	}
-@@ -326,19 +343,29 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
- 
- 	/* set Max Datagram Size (MTU) */
- 	if (flags & USB_CDC_NCM_NCAP_MAX_DATAGRAM_SIZE) {
--		__le16 max_datagram_size;
-+		__le16 *max_datagram_size;
- 		u16 eth_max_sz = le16_to_cpu(ctx->ether_desc->wMaxSegmentSize);
-+
-+		max_datagram_size = kzalloc(sizeof(*max_datagram_size),
-+				GFP_KERNEL);
-+		if (!max_datagram_size) {
-+			err = -ENOMEM;
-+			goto max_dgram_err;
-+		}
-+
- 		err = usb_control_msg(ctx->udev, usb_rcvctrlpipe(ctx->udev, 0),
- 				USB_CDC_GET_MAX_DATAGRAM_SIZE,
- 				USB_TYPE_CLASS | USB_DIR_IN
- 				 | USB_RECIP_INTERFACE,
--				0, iface_no, &max_datagram_size,
-+				0, iface_no, max_datagram_size,
- 				2, 1000);
- 		if (err < 0) {
- 			pr_debug("GET_MAX_DATAGRAM_SIZE failed, use size=%u\n",
- 						CDC_NCM_MIN_DATAGRAM_SIZE);
-+			kfree(max_datagram_size);
- 		} else {
--			ctx->max_datagram_size = le16_to_cpu(max_datagram_size);
-+			ctx->max_datagram_size =
-+				le16_to_cpu(*max_datagram_size);
- 			/* Check Eth descriptor value */
- 			if (eth_max_sz < CDC_NCM_MAX_DATAGRAM_SIZE) {
- 				if (ctx->max_datagram_size > eth_max_sz)
-@@ -361,8 +388,10 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
- 						USB_TYPE_CLASS | USB_DIR_OUT
- 						 | USB_RECIP_INTERFACE,
- 						0,
--						iface_no, &max_datagram_size,
-+						iface_no, max_datagram_size,
- 						2, 1000);
-+			kfree(max_datagram_size);
-+max_dgram_err:
- 			if (err < 0)
- 				pr_debug("SET_MAX_DATAGRAM_SIZE failed\n");
- 		}
-diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
-index 81126ff..8f9b7f7 100644
---- a/drivers/net/usb/ipheth.c
-+++ b/drivers/net/usb/ipheth.c
-@@ -59,6 +59,7 @@
- #define USB_PRODUCT_IPHONE_3G   0x1292
- #define USB_PRODUCT_IPHONE_3GS  0x1294
- #define USB_PRODUCT_IPHONE_4	0x1297
-+#define USB_PRODUCT_IPHONE_4_VZW 0x129c
- 
- #define IPHETH_USBINTF_CLASS    255
- #define IPHETH_USBINTF_SUBCLASS 253
-@@ -98,6 +99,10 @@ static struct usb_device_id ipheth_table[] = {
- 		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4,
- 		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
- 		IPHETH_USBINTF_PROTO) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(
-+		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4_VZW,
-+		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
-+		IPHETH_USBINTF_PROTO) },
- 	{ }
- };
- MODULE_DEVICE_TABLE(usb, ipheth_table);
-diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
-index 041fb7d..ef3b236 100644
---- a/drivers/net/usb/rtl8150.c
-+++ b/drivers/net/usb/rtl8150.c
-@@ -977,7 +977,6 @@ static void rtl8150_disconnect(struct usb_interface *intf)
- 	usb_set_intfdata(intf, NULL);
- 	if (dev) {
- 		set_bit(RTL8150_UNPLUG, &dev->flags);
--		tasklet_disable(&dev->tl);
- 		tasklet_kill(&dev->tl);
- 		unregister_netdev(dev->netdev);
- 		unlink_all_urbs(dev);
-diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
-index bfb6481..4e4e7c3 100644
---- a/drivers/net/wireless/ath/ath9k/ani.c
-+++ b/drivers/net/wireless/ath/ath9k/ani.c
-@@ -502,9 +502,6 @@ static void ath9k_ani_reset_old(struct ath_hw *ah, bool is_scanning)
- 		ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR,
- 				     ATH9K_ANI_CCK_WEAK_SIG_THR);
- 
--		ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) |
--				     ATH9K_RX_FILTER_PHYERR);
--
- 		ath9k_ani_restart(ah);
- 		return;
- 	}
-@@ -525,8 +522,6 @@ static void ath9k_ani_reset_old(struct ath_hw *ah, bool is_scanning)
- 		ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
- 				     aniState->firstepLevel);
- 
--	ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) &
--			     ~ATH9K_RX_FILTER_PHYERR);
- 	ath9k_ani_restart(ah);
- 
- 	ENABLE_REGWRITE_BUFFER(ah);
-diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-index f48051c..7c2aaad 100644
---- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-@@ -643,8 +643,9 @@ static void ar9003_hw_detect_outlier(int *mp_coeff, int nmeasurement,
- 			outlier_idx = max_idx;
- 		else
- 			outlier_idx = min_idx;
-+
-+		mp_coeff[outlier_idx] = mp_avg;
- 	}
--	mp_coeff[outlier_idx] = mp_avg;
- }
- 
- static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
-diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-index 1f99249..7880dca 100644
---- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-@@ -255,8 +255,6 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
- 		return -EIO;
- 	}
- 
--	if (status & AR_TxOpExceeded)
--		ts->ts_status |= ATH9K_TXERR_XTXOP;
- 	ts->ts_rateindex = MS(status, AR_FinalTxIdx);
- 	ts->ts_seqnum = MS(status, AR_SeqNum);
- 	ts->tid = MS(status, AR_TxTid);
-@@ -267,6 +265,8 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
- 	ts->ts_status = 0;
- 	ts->ts_flags  = 0;
- 
-+	if (status & AR_TxOpExceeded)
-+		ts->ts_status |= ATH9K_TXERR_XTXOP;
- 	status = ACCESS_ONCE(ads->status2);
- 	ts->ts_rssi_ctl0 = MS(status, AR_TxRSSIAnt00);
- 	ts->ts_rssi_ctl1 = MS(status, AR_TxRSSIAnt01);
-diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-index efdbe98..2364b5f 100644
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -570,12 +570,12 @@
- 
- #define AR_PHY_TXGAIN_TABLE      (AR_SM_BASE + 0x300)
- 
--#define AR_PHY_TX_IQCAL_CONTROL_1   (AR_SM_BASE + AR_SREV_9485(ah) ? \
--						 0x3c8 : 0x448)
--#define AR_PHY_TX_IQCAL_START       (AR_SM_BASE + AR_SREV_9485(ah) ? \
--						 0x3c4 : 0x440)
--#define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + AR_SREV_9485(ah) ? \
--						 0x3f0 : 0x48c)
-+#define AR_PHY_TX_IQCAL_CONTROL_1   (AR_SM_BASE + (AR_SREV_9485(ah) ? \
-+						 0x3c8 : 0x448))
-+#define AR_PHY_TX_IQCAL_START       (AR_SM_BASE + (AR_SREV_9485(ah) ? \
-+						 0x3c4 : 0x440))
-+#define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + (AR_SREV_9485(ah) ? \
-+						 0x3f0 : 0x48c))
- #define AR_PHY_TX_IQCAL_CORR_COEFF_B0(_i)    (AR_SM_BASE + \
- 					     (AR_SREV_9485(ah) ? \
- 					      0x3d0 : 0x450) + ((_i) << 2))
-diff --git a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
-index 611ea6c..d16d029 100644
---- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
-@@ -521,7 +521,7 @@ static const u32 ar9485_1_1_radio_postamble[][2] = {
- 	{0x000160ac, 0x24611800},
- 	{0x000160b0, 0x03284f3e},
- 	{0x0001610c, 0x00170000},
--	{0x00016140, 0x10804008},
-+	{0x00016140, 0x50804008},
- };
- 
- static const u32 ar9485_1_1_mac_postamble[][5] = {
-@@ -603,7 +603,7 @@ static const u32 ar9485_1_1_radio_core[][2] = {
- 
- static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_enable_L1[][2] = {
- 	/* Addr        allmodes */
--	{0x00018c00, 0x10052e5e},
-+	{0x00018c00, 0x18052e5e},
- 	{0x00018c04, 0x000801d8},
- 	{0x00018c08, 0x0000080c},
- };
-@@ -776,7 +776,7 @@ static const u32 ar9485_modes_green_ob_db_tx_gain_1_1[][5] = {
- 
- static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2] = {
- 	/* Addr        allmodes */
--	{0x00018c00, 0x10013e5e},
-+	{0x00018c00, 0x18013e5e},
- 	{0x00018c04, 0x000801d8},
- 	{0x00018c08, 0x0000080c},
- };
-@@ -882,7 +882,7 @@ static const u32 ar9485_fast_clock_1_1_baseband_postamble[][3] = {
- 
- static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_disable_L1[][2] = {
- 	/* Addr        allmodes  */
--	{0x00018c00, 0x10012e5e},
-+	{0x00018c00, 0x18012e5e},
- 	{0x00018c04, 0x000801d8},
- 	{0x00018c08, 0x0000080c},
- };
-@@ -1021,7 +1021,7 @@ static const u32 ar9485_common_rx_gain_1_1[][2] = {
- 
- static const u32 ar9485_1_1_pcie_phy_clkreq_enable_L1[][2] = {
- 	/* Addr        allmodes */
--	{0x00018c00, 0x10053e5e},
-+	{0x00018c00, 0x18053e5e},
- 	{0x00018c04, 0x000801d8},
- 	{0x00018c08, 0x0000080c},
- };
-diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
-index 260f1f3..5513c0a 100644
---- a/drivers/net/wireless/ath/ath9k/hif_usb.c
-+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -37,6 +37,7 @@ static struct usb_device_id ath9k_hif_usb_ids[] = {
- 	{ USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
- 	{ USB_DEVICE(0x040D, 0x3801) }, /* VIA */
- 	{ USB_DEVICE(0x0cf3, 0xb003) }, /* Ubiquiti WifiStation Ext */
-+	{ USB_DEVICE(0x057c, 0x8403) }, /* AVM FRITZ!WLAN 11N v2 USB */
- 
- 	{ USB_DEVICE(0x0cf3, 0x7015),
- 	  .driver_info = AR9287_USB },  /* Atheros */
-diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
-index 03900ca..7c2f06e 100644
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1931,6 +1931,10 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
- 		pCap->num_gpio_pins = AR9271_NUM_GPIO;
- 	else if (AR_DEVID_7010(ah))
- 		pCap->num_gpio_pins = AR7010_NUM_GPIO;
-+	else if (AR_SREV_9300_20_OR_LATER(ah))
-+		pCap->num_gpio_pins = AR9300_NUM_GPIO;
-+	else if (AR_SREV_9287_11_OR_LATER(ah))
-+		pCap->num_gpio_pins = AR9287_NUM_GPIO;
- 	else if (AR_SREV_9285_12_OR_LATER(ah))
- 		pCap->num_gpio_pins = AR9285_NUM_GPIO;
- 	else if (AR_SREV_9280_20_OR_LATER(ah))
-diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
-index 07e35e5..3b5f9d6 100644
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -423,12 +423,9 @@ void ath_rx_cleanup(struct ath_softc *sc)
- 
- u32 ath_calcrxfilter(struct ath_softc *sc)
- {
--#define	RX_FILTER_PRESERVE (ATH9K_RX_FILTER_PHYERR | ATH9K_RX_FILTER_PHYRADAR)
--
- 	u32 rfilt;
- 
--	rfilt = (ath9k_hw_getrxfilter(sc->sc_ah) & RX_FILTER_PRESERVE)
--		| ATH9K_RX_FILTER_UCAST | ATH9K_RX_FILTER_BCAST
-+	rfilt = ATH9K_RX_FILTER_UCAST | ATH9K_RX_FILTER_BCAST
- 		| ATH9K_RX_FILTER_MCAST;
- 
- 	if (sc->rx.rxfilter & FIF_PROBE_REQ)
-diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
-index 97de5d9..a03dbcc 100644
---- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
-@@ -144,13 +144,8 @@ static int iwlagn_load_section(struct iwl_priv *priv, const char *name,
- 		FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD);
- 
- 	IWL_DEBUG_INFO(priv, "%s uCode section being loaded...\n", name);
--	ret = wait_event_interruptible_timeout(priv->wait_command_queue,
--					priv->ucode_write_complete, 5 * HZ);
--	if (ret == -ERESTARTSYS) {
--		IWL_ERR(priv, "Could not load the %s uCode section due "
--			"to interrupt\n", name);
--		return ret;
--	}
-+	ret = wait_event_timeout(priv->wait_command_queue,
-+				 priv->ucode_write_complete, 5 * HZ);
- 	if (!ret) {
- 		IWL_ERR(priv, "Could not load the %s uCode section\n",
- 			name);
-diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
-index f24165d..baec52d 100644
---- a/drivers/net/wireless/iwlwifi/iwl-agn.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
-@@ -797,7 +797,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
- 		handled |= CSR_INT_BIT_FH_TX;
- 		/* Wake up uCode load routine, now that load is complete */
- 		priv->ucode_write_complete = 1;
--		wake_up_interruptible(&priv->wait_command_queue);
-+		wake_up(&priv->wait_command_queue);
- 	}
- 
- 	if (inta & ~handled) {
-diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
-index 45cc51c..5638407 100644
---- a/drivers/net/wireless/iwlwifi/iwl-core.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
-@@ -899,7 +899,7 @@ void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
- 	 * commands by clearing the ready bit */
- 	clear_bit(STATUS_READY, &priv->status);
- 
--	wake_up_interruptible(&priv->wait_command_queue);
-+	wake_up(&priv->wait_command_queue);
- 
- 	if (!ondemand) {
- 		/*
-@@ -950,7 +950,7 @@ void iwl_irq_handle_error(struct iwl_priv *priv)
- 		 */
- 		clear_bit(STATUS_READY, &priv->status);
- 		clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
--		wake_up_interruptible(&priv->wait_command_queue);
-+		wake_up(&priv->wait_command_queue);
- 		IWL_ERR(priv, "RF is used by WiMAX\n");
- 		return;
- 	}
-diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
-index 76f9966..fc11277 100644
---- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
-@@ -194,7 +194,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
- 		return ret;
- 	}
- 
--	ret = wait_event_interruptible_timeout(priv->wait_command_queue,
-+	ret = wait_event_timeout(priv->wait_command_queue,
- 			!test_bit(STATUS_HCMD_ACTIVE, &priv->status),
- 			HOST_COMPLETE_TIMEOUT);
- 	if (!ret) {
-diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
-index b774517..865ac1a 100644
---- a/drivers/net/wireless/iwlwifi/iwl-rx.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
-@@ -738,7 +738,7 @@ static void iwl_rx_card_state_notif(struct iwl_priv *priv,
- 		wiphy_rfkill_set_hw_state(priv->hw->wiphy,
- 			test_bit(STATUS_RF_KILL_HW, &priv->status));
- 	else
--		wake_up_interruptible(&priv->wait_command_queue);
-+		wake_up(&priv->wait_command_queue);
- }
- 
- static void iwl_rx_missed_beacon_notif(struct iwl_priv *priv,
-diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
-index c368c50..93152c3 100644
---- a/drivers/net/wireless/iwlwifi/iwl-tx.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
-@@ -821,7 +821,7 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
- 		clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
- 		IWL_DEBUG_INFO(priv, "Clearing HCMD_ACTIVE for command %s\n",
- 			       get_cmd_string(cmd->hdr.cmd));
--		wake_up_interruptible(&priv->wait_command_queue);
-+		wake_up(&priv->wait_command_queue);
- 	}
- 
- 	/* Mark as unmapped */
-diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
-index 56f76ab..9542e46 100644
---- a/drivers/net/wireless/wl12xx/scan.c
-+++ b/drivers/net/wireless/wl12xx/scan.c
-@@ -83,14 +83,18 @@ static int wl1271_get_scan_channels(struct wl1271 *wl,
- 	for (i = 0, j = 0;
- 	     i < req->n_channels && j < WL1271_SCAN_MAX_CHANNELS;
- 	     i++) {
--
- 		flags = req->channels[i]->flags;
- 
- 		if (!test_bit(i, wl->scan.scanned_ch) &&
- 		    !(flags & IEEE80211_CHAN_DISABLED) &&
--		    ((!!(flags & IEEE80211_CHAN_PASSIVE_SCAN)) == passive) &&
--		    (req->channels[i]->band == band)) {
--
-+		    (req->channels[i]->band == band) &&
-+		    /*
-+		     * In passive scans, we scan all remaining
-+		     * channels, even if not marked as such.
-+		     * In active scans, we only scan channels not
-+		     * marked as passive.
-+		     */
-+		    (passive || !(flags & IEEE80211_CHAN_PASSIVE_SCAN))) {
- 			wl1271_debug(DEBUG_SCAN, "band %d, center_freq %d ",
- 				     req->channels[i]->band,
- 				     req->channels[i]->center_freq);
-@@ -142,6 +146,10 @@ static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band,
- 	int ret;
- 	u16 scan_options = 0;
- 
-+	/* skip active scans if we don't have SSIDs */
-+	if (!passive && wl->scan.req->n_ssids == 0)
-+		return WL1271_NOTHING_TO_SCAN;
-+
- 	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
- 	trigger = kzalloc(sizeof(*trigger), GFP_KERNEL);
- 	if (!cmd || !trigger) {
-@@ -152,8 +160,7 @@ static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band,
- 	/* We always use high priority scans */
- 	scan_options = WL1271_SCAN_OPT_PRIORITY_HIGH;
- 
--	/* No SSIDs means that we have a forced passive scan */
--	if (passive || wl->scan.req->n_ssids == 0)
-+	if (passive)
- 		scan_options |= WL1271_SCAN_OPT_PASSIVE;
- 
- 	cmd->params.scan_options = cpu_to_le16(scan_options);
-diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
-index 0ca86f9..1825629 100644
---- a/drivers/net/xen-netback/interface.c
-+++ b/drivers/net/xen-netback/interface.c
-@@ -327,12 +327,12 @@ int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref,
- 	xenvif_get(vif);
- 
- 	rtnl_lock();
--	if (netif_running(vif->dev))
--		xenvif_up(vif);
- 	if (!vif->can_sg && vif->dev->mtu > ETH_DATA_LEN)
- 		dev_set_mtu(vif->dev, ETH_DATA_LEN);
- 	netdev_update_features(vif->dev);
- 	netif_carrier_on(vif->dev);
-+	if (netif_running(vif->dev))
-+		xenvif_up(vif);
- 	rtnl_unlock();
- 
- 	return 0;
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 1196f61..cec4629 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -2745,20 +2745,6 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
- 	/* disable must be done via function #0 */
- 	if (PCI_FUNC(dev->devfn))
- 		return;
--
--	pci_read_config_byte(dev, 0xCB, &disable);
--
--	if (disable & 0x02)
--		return;
--
--	pci_read_config_byte(dev, 0xCA, &write_enable);
--	pci_write_config_byte(dev, 0xCA, 0x57);
--	pci_write_config_byte(dev, 0xCB, disable | 0x02);
--	pci_write_config_byte(dev, 0xCA, write_enable);
--
--	dev_notice(&dev->dev, "proprietary Ricoh MMC controller disabled (via firewire function)\n");
--	dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI controller\n");
--
- 	/*
- 	 * RICOH 0xe823 SD/MMC card reader fails to recognize
- 	 * certain types of SD/MMC cards. Lowering the SD base
-@@ -2781,6 +2767,20 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
- 
- 		dev_notice(&dev->dev, "MMC controller base frequency changed to 50Mhz.\n");
- 	}
-+
-+	pci_read_config_byte(dev, 0xCB, &disable);
-+
-+	if (disable & 0x02)
-+		return;
-+
-+	pci_read_config_byte(dev, 0xCA, &write_enable);
-+	pci_write_config_byte(dev, 0xCA, 0x57);
-+	pci_write_config_byte(dev, 0xCB, disable | 0x02);
-+	pci_write_config_byte(dev, 0xCA, write_enable);
-+
-+	dev_notice(&dev->dev, "proprietary Ricoh MMC controller disabled (via firewire function)\n");
-+	dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI controller\n");
-+
- }
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
- DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
-diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
-index 492b7d8..d4e7a10 100644
---- a/drivers/pci/xen-pcifront.c
-+++ b/drivers/pci/xen-pcifront.c
-@@ -400,9 +400,8 @@ static int pcifront_claim_resource(struct pci_dev *dev, void *data)
- 			dev_info(&pdev->xdev->dev, "claiming resource %s/%d\n",
- 				pci_name(dev), i);
- 			if (pci_claim_resource(dev, i)) {
--				dev_err(&pdev->xdev->dev, "Could not claim "
--					"resource %s/%d! Device offline. Try "
--					"giving less than 4GB to domain.\n",
-+				dev_err(&pdev->xdev->dev, "Could not claim resource %s/%d! "
-+					"Device offline. Try using e820_host=1 in the guest config.\n",
- 					pci_name(dev), i);
- 			}
- 		}
-diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
-index 1658575..ec85987 100644
---- a/drivers/platform/x86/samsung-laptop.c
-+++ b/drivers/platform/x86/samsung-laptop.c
-@@ -370,15 +370,17 @@ static u8 read_brightness(void)
- 				  &sretval);
- 	if (!retval) {
- 		user_brightness = sretval.retval[0];
--		if (user_brightness != 0)
-+		if (user_brightness > sabi_config->min_brightness)
- 			user_brightness -= sabi_config->min_brightness;
-+		else
-+			user_brightness = 0;
- 	}
- 	return user_brightness;
- }
- 
- static void set_brightness(u8 user_brightness)
- {
--	u8 user_level = user_brightness - sabi_config->min_brightness;
-+	u8 user_level = user_brightness + sabi_config->min_brightness;
- 
- 	sabi_set_command(sabi_config->commands.set_brightness, user_level);
- }
-@@ -631,6 +633,15 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = {
- 		.callback = dmi_check_cb,
- 	},
- 	{
-+		.ident = "R700",
-+		.matches = {
-+		      DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
-+		      DMI_MATCH(DMI_PRODUCT_NAME, "SR700"),
-+		      DMI_MATCH(DMI_BOARD_NAME, "SR700"),
-+		},
-+		.callback = dmi_check_cb,
-+	},
-+	{
- 		.ident = "R530/R730",
- 		.matches = {
- 		      DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
-@@ -676,6 +687,24 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = {
- 		},
- 		.callback = dmi_check_cb,
- 	},
-+		{
-+		.ident = "X520",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "X520"),
-+			DMI_MATCH(DMI_BOARD_NAME, "X520"),
-+		},
-+		.callback = dmi_check_cb,
-+	},
-+	{
-+		.ident = "R528/R728",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "R528/R728"),
-+			DMI_MATCH(DMI_BOARD_NAME, "R528/R728"),
-+		},
-+		.callback = dmi_check_cb,
-+	},
- 	{ },
- };
- MODULE_DEVICE_TABLE(dmi, samsung_dmi_table);
-@@ -760,7 +789,7 @@ static int __init samsung_init(void)
- 	sabi_iface = ioremap_nocache(ifaceP, 16);
- 	if (!sabi_iface) {
- 		pr_err("Can't remap %x\n", ifaceP);
--		goto exit;
-+		goto error_no_signature;
- 	}
- 	if (debug) {
- 		printk(KERN_DEBUG "ifaceP = 0x%08x\n", ifaceP);
-@@ -792,7 +821,8 @@ static int __init samsung_init(void)
- 	/* create a backlight device to talk to this one */
- 	memset(&props, 0, sizeof(struct backlight_properties));
- 	props.type = BACKLIGHT_PLATFORM;
--	props.max_brightness = sabi_config->max_brightness;
-+	props.max_brightness = sabi_config->max_brightness -
-+				sabi_config->min_brightness;
- 	backlight_device = backlight_device_register("samsung", &sdev->dev,
- 						     NULL, &backlight_ops,
- 						     &props);
-@@ -811,7 +841,6 @@ static int __init samsung_init(void)
- 	if (retval)
- 		goto error_file_create;
- 
--exit:
- 	return 0;
- 
- error_file_create:
-diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
-index f23d5a8..9b88be4 100644
---- a/drivers/platform/x86/wmi.c
-+++ b/drivers/platform/x86/wmi.c
-@@ -754,9 +754,13 @@ static void wmi_free_devices(void)
- 	struct wmi_block *wblock, *next;
- 
- 	/* Delete devices for all the GUIDs */
--	list_for_each_entry_safe(wblock, next, &wmi_block_list, list)
-+	list_for_each_entry_safe(wblock, next, &wmi_block_list, list) {
-+		list_del(&wblock->list);
- 		if (wblock->dev.class)
- 			device_unregister(&wblock->dev);
-+		else
-+			kfree(wblock);
-+	}
- }
- 
- static bool guid_already_parsed(const char *guid_string)
-diff --git a/drivers/power/ds2780_battery.c b/drivers/power/ds2780_battery.c
-index 1fefe82..91a783d 100644
---- a/drivers/power/ds2780_battery.c
-+++ b/drivers/power/ds2780_battery.c
-@@ -39,6 +39,7 @@ struct ds2780_device_info {
- 	struct device *dev;
- 	struct power_supply bat;
- 	struct device *w1_dev;
-+	struct task_struct *mutex_holder;
- };
- 
- enum current_types {
-@@ -49,8 +50,8 @@ enum current_types {
- static const char model[] = "DS2780";
- static const char manufacturer[] = "Maxim/Dallas";
- 
--static inline struct ds2780_device_info *to_ds2780_device_info(
--	struct power_supply *psy)
-+static inline struct ds2780_device_info *
-+to_ds2780_device_info(struct power_supply *psy)
- {
- 	return container_of(psy, struct ds2780_device_info, bat);
- }
-@@ -60,17 +61,28 @@ static inline struct power_supply *to_power_supply(struct device *dev)
- 	return dev_get_drvdata(dev);
- }
- 
--static inline int ds2780_read8(struct device *dev, u8 *val, int addr)
-+static inline int ds2780_battery_io(struct ds2780_device_info *dev_info,
-+	char *buf, int addr, size_t count, int io)
- {
--	return w1_ds2780_io(dev, val, addr, sizeof(u8), 0);
-+	if (dev_info->mutex_holder == current)
-+		return w1_ds2780_io_nolock(dev_info->w1_dev, buf, addr, count, io);
-+	else
-+		return w1_ds2780_io(dev_info->w1_dev, buf, addr, count, io);
-+}
-+
-+static inline int ds2780_read8(struct ds2780_device_info *dev_info, u8 *val,
-+	int addr)
-+{
-+	return ds2780_battery_io(dev_info, val, addr, sizeof(u8), 0);
- }
- 
--static int ds2780_read16(struct device *dev, s16 *val, int addr)
-+static int ds2780_read16(struct ds2780_device_info *dev_info, s16 *val,
-+	int addr)
- {
- 	int ret;
- 	u8 raw[2];
- 
--	ret = w1_ds2780_io(dev, raw, addr, sizeof(u8) * 2, 0);
-+	ret = ds2780_battery_io(dev_info, raw, addr, sizeof(raw), 0);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -79,16 +91,16 @@ static int ds2780_read16(struct device *dev, s16 *val, int addr)
- 	return 0;
- }
- 
--static inline int ds2780_read_block(struct device *dev, u8 *val, int addr,
--	size_t count)
-+static inline int ds2780_read_block(struct ds2780_device_info *dev_info,
-+	u8 *val, int addr, size_t count)
- {
--	return w1_ds2780_io(dev, val, addr, count, 0);
-+	return ds2780_battery_io(dev_info, val, addr, count, 0);
- }
- 
--static inline int ds2780_write(struct device *dev, u8 *val, int addr,
--	size_t count)
-+static inline int ds2780_write(struct ds2780_device_info *dev_info, u8 *val,
-+	int addr, size_t count)
- {
--	return w1_ds2780_io(dev, val, addr, count, 1);
-+	return ds2780_battery_io(dev_info, val, addr, count, 1);
- }
- 
- static inline int ds2780_store_eeprom(struct device *dev, int addr)
-@@ -122,7 +134,7 @@ static int ds2780_set_sense_register(struct ds2780_device_info *dev_info,
- {
- 	int ret;
- 
--	ret = ds2780_write(dev_info->w1_dev, &conductance,
-+	ret = ds2780_write(dev_info, &conductance,
- 				DS2780_RSNSP_REG, sizeof(u8));
- 	if (ret < 0)
- 		return ret;
-@@ -134,7 +146,7 @@ static int ds2780_set_sense_register(struct ds2780_device_info *dev_info,
- static int ds2780_get_rsgain_register(struct ds2780_device_info *dev_info,
- 	u16 *rsgain)
- {
--	return ds2780_read16(dev_info->w1_dev, rsgain, DS2780_RSGAIN_MSB_REG);
-+	return ds2780_read16(dev_info, rsgain, DS2780_RSGAIN_MSB_REG);
- }
- 
- /* Set RSGAIN value from 0 to 1.999 in steps of 0.001 */
-@@ -144,8 +156,8 @@ static int ds2780_set_rsgain_register(struct ds2780_device_info *dev_info,
- 	int ret;
- 	u8 raw[] = {rsgain >> 8, rsgain & 0xFF};
- 
--	ret = ds2780_write(dev_info->w1_dev, raw,
--				DS2780_RSGAIN_MSB_REG, sizeof(u8) * 2);
-+	ret = ds2780_write(dev_info, raw,
-+				DS2780_RSGAIN_MSB_REG, sizeof(raw));
- 	if (ret < 0)
- 		return ret;
- 
-@@ -167,7 +179,7 @@ static int ds2780_get_voltage(struct ds2780_device_info *dev_info,
- 	 * Bits 2 - 0 of the voltage value are in bits 7 - 5 of the
- 	 * voltage LSB register
- 	 */
--	ret = ds2780_read16(dev_info->w1_dev, &voltage_raw,
-+	ret = ds2780_read16(dev_info, &voltage_raw,
- 				DS2780_VOLT_MSB_REG);
- 	if (ret < 0)
- 		return ret;
-@@ -196,7 +208,7 @@ static int ds2780_get_temperature(struct ds2780_device_info *dev_info,
- 	 * Bits 2 - 0 of the temperature value are in bits 7 - 5 of the
- 	 * temperature LSB register
- 	 */
--	ret = ds2780_read16(dev_info->w1_dev, &temperature_raw,
-+	ret = ds2780_read16(dev_info, &temperature_raw,
- 				DS2780_TEMP_MSB_REG);
- 	if (ret < 0)
- 		return ret;
-@@ -222,13 +234,13 @@ static int ds2780_get_current(struct ds2780_device_info *dev_info,
- 	 * The units of measurement for current are dependent on the value of
- 	 * the sense resistor.
- 	 */
--	ret = ds2780_read8(dev_info->w1_dev, &sense_res_raw, DS2780_RSNSP_REG);
-+	ret = ds2780_read8(dev_info, &sense_res_raw, DS2780_RSNSP_REG);
- 	if (ret < 0)
- 		return ret;
- 
- 	if (sense_res_raw == 0) {
- 		dev_err(dev_info->dev, "sense resistor value is 0\n");
--		return -ENXIO;
-+		return -EINVAL;
- 	}
- 	sense_res = 1000 / sense_res_raw;
- 
-@@ -248,7 +260,7 @@ static int ds2780_get_current(struct ds2780_device_info *dev_info,
- 	 * Bits 7 - 0 of the current value are in bits 7 - 0 of the current
- 	 * LSB register
- 	 */
--	ret = ds2780_read16(dev_info->w1_dev, &current_raw, reg_msb);
-+	ret = ds2780_read16(dev_info, &current_raw, reg_msb);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -267,7 +279,7 @@ static int ds2780_get_accumulated_current(struct ds2780_device_info *dev_info,
- 	 * The units of measurement for accumulated current are dependent on
- 	 * the value of the sense resistor.
- 	 */
--	ret = ds2780_read8(dev_info->w1_dev, &sense_res_raw, DS2780_RSNSP_REG);
-+	ret = ds2780_read8(dev_info, &sense_res_raw, DS2780_RSNSP_REG);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -285,7 +297,7 @@ static int ds2780_get_accumulated_current(struct ds2780_device_info *dev_info,
- 	 * Bits 7 - 0 of the ACR value are in bits 7 - 0 of the ACR
- 	 * LSB register
- 	 */
--	ret = ds2780_read16(dev_info->w1_dev, &current_raw, DS2780_ACR_MSB_REG);
-+	ret = ds2780_read16(dev_info, &current_raw, DS2780_ACR_MSB_REG);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -299,7 +311,7 @@ static int ds2780_get_capacity(struct ds2780_device_info *dev_info,
- 	int ret;
- 	u8 raw;
- 
--	ret = ds2780_read8(dev_info->w1_dev, &raw, DS2780_RARC_REG);
-+	ret = ds2780_read8(dev_info, &raw, DS2780_RARC_REG);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -345,7 +357,7 @@ static int ds2780_get_charge_now(struct ds2780_device_info *dev_info,
- 	 * Bits 7 - 0 of the RAAC value are in bits 7 - 0 of the RAAC
- 	 * LSB register
- 	 */
--	ret = ds2780_read16(dev_info->w1_dev, &charge_raw, DS2780_RAAC_MSB_REG);
-+	ret = ds2780_read16(dev_info, &charge_raw, DS2780_RAAC_MSB_REG);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -356,7 +368,7 @@ static int ds2780_get_charge_now(struct ds2780_device_info *dev_info,
- static int ds2780_get_control_register(struct ds2780_device_info *dev_info,
- 	u8 *control_reg)
- {
--	return ds2780_read8(dev_info->w1_dev, control_reg, DS2780_CONTROL_REG);
-+	return ds2780_read8(dev_info, control_reg, DS2780_CONTROL_REG);
- }
- 
- static int ds2780_set_control_register(struct ds2780_device_info *dev_info,
-@@ -364,7 +376,7 @@ static int ds2780_set_control_register(struct ds2780_device_info *dev_info,
- {
- 	int ret;
- 
--	ret = ds2780_write(dev_info->w1_dev, &control_reg,
-+	ret = ds2780_write(dev_info, &control_reg,
- 				DS2780_CONTROL_REG, sizeof(u8));
- 	if (ret < 0)
- 		return ret;
-@@ -503,7 +515,7 @@ static ssize_t ds2780_get_sense_resistor_value(struct device *dev,
- 	struct power_supply *psy = to_power_supply(dev);
- 	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
- 
--	ret = ds2780_read8(dev_info->w1_dev, &sense_resistor, DS2780_RSNSP_REG);
-+	ret = ds2780_read8(dev_info, &sense_resistor, DS2780_RSNSP_REG);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -584,7 +596,7 @@ static ssize_t ds2780_get_pio_pin(struct device *dev,
- 	struct power_supply *psy = to_power_supply(dev);
- 	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
- 
--	ret = ds2780_read8(dev_info->w1_dev, &sfr, DS2780_SFR_REG);
-+	ret = ds2780_read8(dev_info, &sfr, DS2780_SFR_REG);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -611,7 +623,7 @@ static ssize_t ds2780_set_pio_pin(struct device *dev,
- 		return -EINVAL;
- 	}
- 
--	ret = ds2780_write(dev_info->w1_dev, &new_setting,
-+	ret = ds2780_write(dev_info, &new_setting,
- 				DS2780_SFR_REG, sizeof(u8));
- 	if (ret < 0)
- 		return ret;
-@@ -632,7 +644,7 @@ static ssize_t ds2780_read_param_eeprom_bin(struct file *filp,
- 		DS2780_EEPROM_BLOCK1_END -
- 		DS2780_EEPROM_BLOCK1_START + 1 - off);
- 
--	return ds2780_read_block(dev_info->w1_dev, buf,
-+	return ds2780_read_block(dev_info, buf,
- 				DS2780_EEPROM_BLOCK1_START + off, count);
- }
- 
-@@ -650,7 +662,7 @@ static ssize_t ds2780_write_param_eeprom_bin(struct file *filp,
- 		DS2780_EEPROM_BLOCK1_END -
- 		DS2780_EEPROM_BLOCK1_START + 1 - off);
- 
--	ret = ds2780_write(dev_info->w1_dev, buf,
-+	ret = ds2780_write(dev_info, buf,
- 				DS2780_EEPROM_BLOCK1_START + off, count);
- 	if (ret < 0)
- 		return ret;
-@@ -685,9 +697,8 @@ static ssize_t ds2780_read_user_eeprom_bin(struct file *filp,
- 		DS2780_EEPROM_BLOCK0_END -
- 		DS2780_EEPROM_BLOCK0_START + 1 - off);
- 
--	return ds2780_read_block(dev_info->w1_dev, buf,
-+	return ds2780_read_block(dev_info, buf,
- 				DS2780_EEPROM_BLOCK0_START + off, count);
--
- }
- 
- static ssize_t ds2780_write_user_eeprom_bin(struct file *filp,
-@@ -704,7 +715,7 @@ static ssize_t ds2780_write_user_eeprom_bin(struct file *filp,
- 		DS2780_EEPROM_BLOCK0_END -
- 		DS2780_EEPROM_BLOCK0_START + 1 - off);
- 
--	ret = ds2780_write(dev_info->w1_dev, buf,
-+	ret = ds2780_write(dev_info, buf,
- 				DS2780_EEPROM_BLOCK0_START + off, count);
- 	if (ret < 0)
- 		return ret;
-@@ -768,6 +779,7 @@ static int __devinit ds2780_battery_probe(struct platform_device *pdev)
- 	dev_info->bat.properties	= ds2780_battery_props;
- 	dev_info->bat.num_properties	= ARRAY_SIZE(ds2780_battery_props);
- 	dev_info->bat.get_property	= ds2780_battery_get_property;
-+	dev_info->mutex_holder		= current;
- 
- 	ret = power_supply_register(&pdev->dev, &dev_info->bat);
- 	if (ret) {
-@@ -797,6 +809,8 @@ static int __devinit ds2780_battery_probe(struct platform_device *pdev)
- 		goto fail_remove_bin_file;
- 	}
- 
-+	dev_info->mutex_holder = NULL;
-+
- 	return 0;
- 
- fail_remove_bin_file:
-@@ -816,6 +830,8 @@ static int __devexit ds2780_battery_remove(struct platform_device *pdev)
- {
- 	struct ds2780_device_info *dev_info = platform_get_drvdata(pdev);
- 
-+	dev_info->mutex_holder = current;
-+
- 	/* remove attributes */
- 	sysfs_remove_group(&dev_info->bat.dev->kobj, &ds2780_attr_group);
- 
-diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
-index 5c56741..cda9bd6 100644
---- a/drivers/s390/cio/ccwgroup.c
-+++ b/drivers/s390/cio/ccwgroup.c
-@@ -87,6 +87,12 @@ static void __ccwgroup_remove_cdev_refs(struct ccwgroup_device *gdev)
- 	}
- }
- 
-+static ssize_t ccwgroup_online_store(struct device *dev,
-+				     struct device_attribute *attr,
-+				     const char *buf, size_t count);
-+static ssize_t ccwgroup_online_show(struct device *dev,
-+				    struct device_attribute *attr,
-+				    char *buf);
- /*
-  * Provide an 'ungroup' attribute so the user can remove group devices no
-  * longer needed or accidentially created. Saves memory :)
-@@ -134,6 +140,20 @@ out:
- }
- 
- static DEVICE_ATTR(ungroup, 0200, NULL, ccwgroup_ungroup_store);
-+static DEVICE_ATTR(online, 0644, ccwgroup_online_show, ccwgroup_online_store);
-+
-+static struct attribute *ccwgroup_attrs[] = {
-+	&dev_attr_online.attr,
-+	&dev_attr_ungroup.attr,
-+	NULL,
-+};
-+static struct attribute_group ccwgroup_attr_group = {
-+	.attrs = ccwgroup_attrs,
-+};
-+static const struct attribute_group *ccwgroup_attr_groups[] = {
-+	&ccwgroup_attr_group,
-+	NULL,
-+};
- 
- static void
- ccwgroup_release (struct device *dev)
-@@ -293,25 +313,17 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
- 	}
- 
- 	dev_set_name(&gdev->dev, "%s", dev_name(&gdev->cdev[0]->dev));
--
-+	gdev->dev.groups = ccwgroup_attr_groups;
- 	rc = device_add(&gdev->dev);
- 	if (rc)
- 		goto error;
- 	get_device(&gdev->dev);
--	rc = device_create_file(&gdev->dev, &dev_attr_ungroup);
--
--	if (rc) {
--		device_unregister(&gdev->dev);
--		goto error;
--	}
--
- 	rc = __ccwgroup_create_symlinks(gdev);
- 	if (!rc) {
- 		mutex_unlock(&gdev->reg_mutex);
- 		put_device(&gdev->dev);
- 		return 0;
- 	}
--	device_remove_file(&gdev->dev, &dev_attr_ungroup);
- 	device_unregister(&gdev->dev);
- error:
- 	for (i = 0; i < num_devices; i++)
-@@ -423,7 +435,7 @@ ccwgroup_online_store (struct device *dev, struct device_attribute *attr, const
- 	int ret;
- 
- 	if (!dev->driver)
--		return -ENODEV;
-+		return -EINVAL;
- 
- 	gdev = to_ccwgroupdev(dev);
- 	gdrv = to_ccwgroupdrv(dev->driver);
-@@ -456,8 +468,6 @@ ccwgroup_online_show (struct device *dev, struct device_attribute *attr, char *b
- 	return sprintf(buf, online ? "1\n" : "0\n");
- }
- 
--static DEVICE_ATTR(online, 0644, ccwgroup_online_show, ccwgroup_online_store);
--
- static int
- ccwgroup_probe (struct device *dev)
- {
-@@ -469,12 +479,7 @@ ccwgroup_probe (struct device *dev)
- 	gdev = to_ccwgroupdev(dev);
- 	gdrv = to_ccwgroupdrv(dev->driver);
- 
--	if ((ret = device_create_file(dev, &dev_attr_online)))
--		return ret;
--
- 	ret = gdrv->probe ? gdrv->probe(gdev) : -ENODEV;
--	if (ret)
--		device_remove_file(dev, &dev_attr_online);
- 
- 	return ret;
- }
-@@ -485,9 +490,6 @@ ccwgroup_remove (struct device *dev)
- 	struct ccwgroup_device *gdev;
- 	struct ccwgroup_driver *gdrv;
- 
--	device_remove_file(dev, &dev_attr_online);
--	device_remove_file(dev, &dev_attr_ungroup);
--
- 	if (!dev->driver)
- 		return 0;
- 
-diff --git a/drivers/scsi/device_handler/scsi_dh.c b/drivers/scsi/device_handler/scsi_dh.c
-index 0119b81..d973325 100644
---- a/drivers/scsi/device_handler/scsi_dh.c
-+++ b/drivers/scsi/device_handler/scsi_dh.c
-@@ -398,7 +398,15 @@ int scsi_dh_activate(struct request_queue *q, activate_complete fn, void *data)
- 
- 	spin_lock_irqsave(q->queue_lock, flags);
- 	sdev = q->queuedata;
--	if (sdev && sdev->scsi_dh_data)
-+	if (!sdev) {
-+		spin_unlock_irqrestore(q->queue_lock, flags);
-+		err = SCSI_DH_NOSYS;
-+		if (fn)
-+			fn(data, err);
-+		return err;
-+	}
-+
-+	if (sdev->scsi_dh_data)
- 		scsi_dh = sdev->scsi_dh_data->scsi_dh;
- 	dev = get_device(&sdev->sdev_gendev);
- 	if (!scsi_dh || !dev ||
-diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
-index 4f7a582..351dc0b 100644
---- a/drivers/scsi/hosts.c
-+++ b/drivers/scsi/hosts.c
-@@ -286,6 +286,7 @@ static void scsi_host_dev_release(struct device *dev)
- {
- 	struct Scsi_Host *shost = dev_to_shost(dev);
- 	struct device *parent = dev->parent;
-+	struct request_queue *q;
- 
- 	scsi_proc_hostdir_rm(shost->hostt);
- 
-@@ -293,9 +294,11 @@ static void scsi_host_dev_release(struct device *dev)
- 		kthread_stop(shost->ehandler);
- 	if (shost->work_q)
- 		destroy_workqueue(shost->work_q);
--	if (shost->uspace_req_q) {
--		kfree(shost->uspace_req_q->queuedata);
--		scsi_free_queue(shost->uspace_req_q);
-+	q = shost->uspace_req_q;
-+	if (q) {
-+		kfree(q->queuedata);
-+		q->queuedata = NULL;
-+		scsi_free_queue(q);
- 	}
- 
- 	scsi_destroy_command_freelist(shost);
-diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 78c2e20..6689d5d 100644
---- a/drivers/scsi/hpsa.c
-+++ b/drivers/scsi/hpsa.c
-@@ -3300,6 +3300,13 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev,
- 		pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
- 		pmcsr |= PCI_D0;
- 		pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr);
-+
-+		/*
-+		 * The P600 requires a small delay when changing states.
-+		 * Otherwise we may think the board did not reset and we bail.
-+		 * This for kdump only and is particular to the P600.
-+		 */
-+		msleep(500);
- 	}
- 	return 0;
- }
-diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
-index 888086c..c5c7c3a 100644
---- a/drivers/scsi/ipr.c
-+++ b/drivers/scsi/ipr.c
-@@ -8812,7 +8812,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
- 	uproc = readl(ioa_cfg->regs.sense_uproc_interrupt_reg32);
- 	if ((mask & IPR_PCII_HRRQ_UPDATED) == 0 || (uproc & IPR_UPROCI_RESET_ALERT))
- 		ioa_cfg->needs_hard_reset = 1;
--	if (interrupts & IPR_PCII_ERROR_INTERRUPTS)
-+	if ((interrupts & IPR_PCII_ERROR_INTERRUPTS) || reset_devices)
- 		ioa_cfg->needs_hard_reset = 1;
- 	if (interrupts & IPR_PCII_IOA_UNIT_CHECKED)
- 		ioa_cfg->ioa_unit_checked = 1;
-diff --git a/drivers/scsi/isci/isci.h b/drivers/scsi/isci/isci.h
-index d1de633..8efeb6b 100644
---- a/drivers/scsi/isci/isci.h
-+++ b/drivers/scsi/isci/isci.h
-@@ -97,7 +97,7 @@
- #define SCU_MAX_COMPLETION_QUEUE_SHIFT	  (ilog2(SCU_MAX_COMPLETION_QUEUE_ENTRIES))
- 
- #define SCU_ABSOLUTE_MAX_UNSOLICITED_FRAMES (4096)
--#define SCU_UNSOLICITED_FRAME_BUFFER_SIZE   (1024)
-+#define SCU_UNSOLICITED_FRAME_BUFFER_SIZE   (1024U)
- #define SCU_INVALID_FRAME_INDEX             (0xFFFF)
- 
- #define SCU_IO_REQUEST_MAX_SGE_SIZE         (0x00FFFFFF)
-diff --git a/drivers/scsi/isci/port_config.c b/drivers/scsi/isci/port_config.c
-index 486b113..38a99d2 100644
---- a/drivers/scsi/isci/port_config.c
-+++ b/drivers/scsi/isci/port_config.c
-@@ -678,7 +678,7 @@ static void apc_agent_timeout(unsigned long data)
- 	configure_phy_mask = ~port_agent->phy_configured_mask & port_agent->phy_ready_mask;
- 
- 	if (!configure_phy_mask)
--		return;
-+		goto done;
- 
- 	for (index = 0; index < SCI_MAX_PHYS; index++) {
- 		if ((configure_phy_mask & (1 << index)) == 0)
-diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
-index b5d3a8c..225b196 100644
---- a/drivers/scsi/isci/request.c
-+++ b/drivers/scsi/isci/request.c
-@@ -1490,29 +1490,30 @@ sci_io_request_frame_handler(struct isci_request *ireq,
- 		return SCI_SUCCESS;
- 
- 	case SCI_REQ_SMP_WAIT_RESP: {
--		struct smp_resp *rsp_hdr = &ireq->smp.rsp;
--		void *frame_header;
-+		struct sas_task *task = isci_request_access_task(ireq);
-+		struct scatterlist *sg = &task->smp_task.smp_resp;
-+		void *frame_header, *kaddr;
-+		u8 *rsp;
- 
- 		sci_unsolicited_frame_control_get_header(&ihost->uf_control,
--							      frame_index,
--							      &frame_header);
--
--		/* byte swap the header. */
--		word_cnt = SMP_RESP_HDR_SZ / sizeof(u32);
--		sci_swab32_cpy(rsp_hdr, frame_header, word_cnt);
-+							 frame_index,
-+							 &frame_header);
-+		kaddr = kmap_atomic(sg_page(sg), KM_IRQ0);
-+		rsp = kaddr + sg->offset;
-+		sci_swab32_cpy(rsp, frame_header, 1);
- 
--		if (rsp_hdr->frame_type == SMP_RESPONSE) {
-+		if (rsp[0] == SMP_RESPONSE) {
- 			void *smp_resp;
- 
- 			sci_unsolicited_frame_control_get_buffer(&ihost->uf_control,
--								      frame_index,
--								      &smp_resp);
-+								 frame_index,
-+								 &smp_resp);
- 
--			word_cnt = (sizeof(struct smp_resp) - SMP_RESP_HDR_SZ) /
--				sizeof(u32);
--
--			sci_swab32_cpy(((u8 *) rsp_hdr) + SMP_RESP_HDR_SZ,
--				       smp_resp, word_cnt);
-+			word_cnt = (sg->length/4)-1;
-+			if (word_cnt > 0)
-+				word_cnt = min_t(unsigned int, word_cnt,
-+						 SCU_UNSOLICITED_FRAME_BUFFER_SIZE/4);
-+			sci_swab32_cpy(rsp + 4, smp_resp, word_cnt);
- 
- 			ireq->scu_status = SCU_TASK_DONE_GOOD;
- 			ireq->sci_status = SCI_SUCCESS;
-@@ -1528,12 +1529,13 @@ sci_io_request_frame_handler(struct isci_request *ireq,
- 				__func__,
- 				ireq,
- 				frame_index,
--				rsp_hdr->frame_type);
-+				rsp[0]);
- 
- 			ireq->scu_status = SCU_TASK_DONE_SMP_FRM_TYPE_ERR;
- 			ireq->sci_status = SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR;
- 			sci_change_state(&ireq->sm, SCI_REQ_COMPLETED);
- 		}
-+		kunmap_atomic(kaddr, KM_IRQ0);
- 
- 		sci_controller_release_frame(ihost, frame_index);
- 
-@@ -2603,18 +2605,7 @@ static void isci_request_io_request_complete(struct isci_host *ihost,
- 			status   = SAM_STAT_GOOD;
- 			set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
- 
--			if (task->task_proto == SAS_PROTOCOL_SMP) {
--				void *rsp = &request->smp.rsp;
--
--				dev_dbg(&ihost->pdev->dev,
--					"%s: SMP protocol completion\n",
--					__func__);
--
--				sg_copy_from_buffer(
--					&task->smp_task.smp_resp, 1,
--					rsp, sizeof(struct smp_resp));
--			} else if (completion_status
--				   == SCI_IO_SUCCESS_IO_DONE_EARLY) {
-+			if (completion_status == SCI_IO_SUCCESS_IO_DONE_EARLY) {
- 
- 				/* This was an SSP / STP / SATA transfer.
- 				 * There is a possibility that less data than
-diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h
-index 7a1d5a9..58d70b6 100644
---- a/drivers/scsi/isci/request.h
-+++ b/drivers/scsi/isci/request.h
-@@ -174,9 +174,6 @@ struct isci_request {
- 			};
- 		} ssp;
- 		struct {
--			struct smp_resp rsp;
--		} smp;
--		struct {
- 			struct isci_stp_request req;
- 			struct host_to_dev_fis cmd;
- 			struct dev_to_host_fis rsp;
-diff --git a/drivers/scsi/isci/sas.h b/drivers/scsi/isci/sas.h
-index 462b151..dc26b4a 100644
---- a/drivers/scsi/isci/sas.h
-+++ b/drivers/scsi/isci/sas.h
-@@ -204,8 +204,6 @@ struct smp_req {
- 	u8 req_data[0];
- }  __packed;
- 
--#define SMP_RESP_HDR_SZ	4
--
- /*
-  * struct sci_sas_address - This structure depicts how a SAS address is
-  *    represented by SCI.
-diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
-index 16ad97d..37cbe4d 100644
---- a/drivers/scsi/libsas/sas_expander.c
-+++ b/drivers/scsi/libsas/sas_expander.c
-@@ -199,6 +199,8 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id,
- 	phy->virtual = dr->virtual;
- 	phy->last_da_index = -1;
- 
-+	phy->phy->identify.sas_address = SAS_ADDR(phy->attached_sas_addr);
-+	phy->phy->identify.device_type = phy->attached_dev_type;
- 	phy->phy->identify.initiator_port_protocols = phy->attached_iproto;
- 	phy->phy->identify.target_port_protocols = phy->attached_tproto;
- 	phy->phy->identify.phy_identifier = phy_id;
-diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
-index 2d8cdce..e6e30f4 100644
---- a/drivers/scsi/megaraid/megaraid_sas_base.c
-+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
-@@ -1906,7 +1906,6 @@ static int megasas_generic_reset(struct scsi_cmnd *scmd)
- static enum
- blk_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)
- {
--	struct megasas_cmd *cmd = (struct megasas_cmd *)scmd->SCp.ptr;
- 	struct megasas_instance *instance;
- 	unsigned long flags;
- 
-@@ -1915,7 +1914,7 @@ blk_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)
- 		return BLK_EH_NOT_HANDLED;
- 	}
- 
--	instance = cmd->instance;
-+	instance = (struct megasas_instance *)scmd->device->host->hostdata;
- 	if (!(instance->flag & MEGASAS_FW_BUSY)) {
- 		/* FW is busy, throttle IO */
- 		spin_lock_irqsave(instance->host->host_lock, flags);
-diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
-index 8dc2ad4..5690f09 100644
---- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
-+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
-@@ -7318,22 +7318,27 @@ _scsih_probe_sas(struct MPT2SAS_ADAPTER *ioc)
- 	/* SAS Device List */
- 	list_for_each_entry_safe(sas_device, next, &ioc->sas_device_init_list,
- 	    list) {
--		spin_lock_irqsave(&ioc->sas_device_lock, flags);
--		list_move_tail(&sas_device->list, &ioc->sas_device_list);
--		spin_unlock_irqrestore(&ioc->sas_device_lock, flags);
- 
- 		if (ioc->hide_drives)
- 			continue;
- 
- 		if (!mpt2sas_transport_port_add(ioc, sas_device->handle,
- 		    sas_device->sas_address_parent)) {
--			_scsih_sas_device_remove(ioc, sas_device);
-+			list_del(&sas_device->list);
-+			kfree(sas_device);
-+			continue;
- 		} else if (!sas_device->starget) {
- 			mpt2sas_transport_port_remove(ioc,
- 			    sas_device->sas_address,
- 			    sas_device->sas_address_parent);
--			_scsih_sas_device_remove(ioc, sas_device);
-+			list_del(&sas_device->list);
-+			kfree(sas_device);
-+			continue;
-+
- 		}
-+		spin_lock_irqsave(&ioc->sas_device_lock, flags);
-+		list_move_tail(&sas_device->list, &ioc->sas_device_list);
-+		spin_unlock_irqrestore(&ioc->sas_device_lock, flags);
- 	}
- }
- 
-diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
-index 28d9c9d..f97acff 100644
---- a/drivers/scsi/scsi_lib.c
-+++ b/drivers/scsi/scsi_lib.c
-@@ -1697,6 +1697,15 @@ struct request_queue *scsi_alloc_queue(struct scsi_device *sdev)
- 
- void scsi_free_queue(struct request_queue *q)
- {
-+	unsigned long flags;
-+
-+	WARN_ON(q->queuedata);
-+
-+	/* cause scsi_request_fn() to kill all non-finished requests */
-+	spin_lock_irqsave(q->queue_lock, flags);
-+	q->request_fn(q);
-+	spin_unlock_irqrestore(q->queue_lock, flags);
-+
- 	blk_cleanup_queue(q);
- }
- 
-diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
-index 44e8ca3..72273a0 100644
---- a/drivers/scsi/scsi_scan.c
-+++ b/drivers/scsi/scsi_scan.c
-@@ -322,6 +322,7 @@ out_device_destroy:
- 	scsi_device_set_state(sdev, SDEV_DEL);
- 	transport_destroy_device(&sdev->sdev_gendev);
- 	put_device(&sdev->sdev_dev);
-+	scsi_free_queue(sdev->request_queue);
- 	put_device(&sdev->sdev_gendev);
- out:
- 	if (display_failure_msg)
-diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
-index 1871b8a..9b28f39 100644
---- a/drivers/scsi/st.c
-+++ b/drivers/scsi/st.c
-@@ -462,14 +462,16 @@ static void st_scsi_execute_end(struct request *req, int uptodate)
- {
- 	struct st_request *SRpnt = req->end_io_data;
- 	struct scsi_tape *STp = SRpnt->stp;
-+	struct bio *tmp;
- 
- 	STp->buffer->cmdstat.midlevel_result = SRpnt->result = req->errors;
- 	STp->buffer->cmdstat.residual = req->resid_len;
- 
-+	tmp = SRpnt->bio;
- 	if (SRpnt->waiting)
- 		complete(SRpnt->waiting);
- 
--	blk_rq_unmap_user(SRpnt->bio);
-+	blk_rq_unmap_user(tmp);
- 	__blk_put_request(req->q, req);
- }
- 
-diff --git a/drivers/staging/hv/hyperv_storage.h b/drivers/staging/hv/hyperv_storage.h
-index a01f9a0..5af82f4 100644
---- a/drivers/staging/hv/hyperv_storage.h
-+++ b/drivers/staging/hv/hyperv_storage.h
-@@ -218,6 +218,7 @@ struct vstor_packet {
- #define STORVSC_MAX_LUNS_PER_TARGET			64
- #define STORVSC_MAX_TARGETS				1
- #define STORVSC_MAX_CHANNELS				1
-+#define STORVSC_MAX_CMD_LEN				16
- 
- struct hv_storvsc_request;
- 
-diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
-index cb4a25b..734076b 100644
---- a/drivers/staging/hv/storvsc_drv.c
-+++ b/drivers/staging/hv/storvsc_drv.c
-@@ -729,6 +729,8 @@ static int storvsc_probe(struct hv_device *device)
- 	host->max_id = STORVSC_MAX_TARGETS;
- 	/* max # of channels */
- 	host->max_channel = STORVSC_MAX_CHANNELS - 1;
-+	/* max cmd length */
-+	host->max_cmd_len = STORVSC_MAX_CMD_LEN;
- 
- 	/* Register the HBA and start the scsi bus scan */
- 	ret = scsi_add_host(host, &device->device);
-diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c
-index ca098ca..02fafec 100644
---- a/drivers/staging/quatech_usb2/quatech_usb2.c
-+++ b/drivers/staging/quatech_usb2/quatech_usb2.c
-@@ -916,9 +916,10 @@ static int qt2_ioctl(struct tty_struct *tty,
- 		dbg("%s() port %d, cmd == TIOCMIWAIT enter",
- 			__func__, port->number);
- 		prev_msr_value = port_extra->shadowMSR  & QT2_SERIAL_MSR_MASK;
-+		barrier();
-+		__set_current_state(TASK_INTERRUPTIBLE);
- 		while (1) {
- 			add_wait_queue(&port_extra->wait, &wait);
--			set_current_state(TASK_INTERRUPTIBLE);
- 			schedule();
- 			dbg("%s(): port %d, cmd == TIOCMIWAIT here\n",
- 				__func__, port->number);
-@@ -926,9 +927,12 @@ static int qt2_ioctl(struct tty_struct *tty,
- 			/* see if a signal woke us up */
- 			if (signal_pending(current))
- 				return -ERESTARTSYS;
-+			set_current_state(TASK_INTERRUPTIBLE);
- 			msr_value = port_extra->shadowMSR & QT2_SERIAL_MSR_MASK;
--			if (msr_value == prev_msr_value)
-+			if (msr_value == prev_msr_value) {
-+				__set_current_state(TASK_RUNNING);
- 				return -EIO;  /* no change - error */
-+			}
- 			if ((arg & TIOCM_RNG &&
- 				((prev_msr_value & QT2_SERIAL_MSR_RI) ==
- 					(msr_value & QT2_SERIAL_MSR_RI))) ||
-@@ -941,6 +945,7 @@ static int qt2_ioctl(struct tty_struct *tty,
- 				(arg & TIOCM_CTS &&
- 				((prev_msr_value & QT2_SERIAL_MSR_CTS) ==
- 					(msr_value & QT2_SERIAL_MSR_CTS)))) {
-+				__set_current_state(TASK_RUNNING);
- 				return 0;
- 			}
- 		} /* end inifinite while */
-diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c
-index 12f5eba..48aa61e 100644
---- a/drivers/staging/serqt_usb2/serqt_usb2.c
-+++ b/drivers/staging/serqt_usb2/serqt_usb2.c
-@@ -24,7 +24,6 @@ static int debug;
- #define DRIVER_DESC "Quatech USB to Serial Driver"
- 
- #define	USB_VENDOR_ID_QUATECH			0x061d	/* Quatech VID */
--#define QUATECH_SSU100	0xC020	/* SSU100 */
- #define QUATECH_SSU200	0xC030	/* SSU200 */
- #define QUATECH_DSU100	0xC040	/* DSU100 */
- #define QUATECH_DSU200	0xC050	/* DSU200 */
-@@ -127,7 +126,6 @@ static int debug;
- #define RS232_MODE          0x00
- 
- static const struct usb_device_id serqt_id_table[] = {
--	{USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_SSU100)},
- 	{USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_SSU200)},
- 	{USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_DSU100)},
- 	{USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_DSU200)},
-@@ -775,7 +773,6 @@ static int qt_startup(struct usb_serial *serial)
- 	}
- 
- 	switch (serial->dev->descriptor.idProduct) {
--	case QUATECH_SSU100:
- 	case QUATECH_DSU100:
- 	case QUATECH_QSU100:
- 	case QUATECH_ESU100A:
-diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
-index 70c2e7f..4b5421b 100644
---- a/drivers/target/loopback/tcm_loop.c
-+++ b/drivers/target/loopback/tcm_loop.c
-@@ -127,6 +127,24 @@ static struct se_cmd *tcm_loop_allocate_core_cmd(
- 		set_host_byte(sc, DID_NO_CONNECT);
- 		return NULL;
- 	}
-+	/*
-+	 * Because some userspace code via scsi-generic do not memset their
-+	 * associated read buffers, go ahead and do that here for type
-+	 * SCF_SCSI_CONTROL_SG_IO_CDB.  Also note that this is currently
-+	 * guaranteed to be a single SGL for SCF_SCSI_CONTROL_SG_IO_CDB
-+	 * by target core in transport_generic_allocate_tasks() ->
-+	 * transport_generic_cmd_sequencer().
-+	 */
-+	if (se_cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB &&
-+	    se_cmd->data_direction == DMA_FROM_DEVICE) {
-+		struct scatterlist *sg = scsi_sglist(sc);
-+		unsigned char *buf = kmap(sg_page(sg)) + sg->offset;
-+
-+		if (buf != NULL) {
-+			memset(buf, 0, sg->length);
-+			kunmap(sg_page(sg));
-+		}
-+	}
- 
- 	transport_device_setup_cmd(se_cmd);
- 	return se_cmd;
-diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
-index 47abb42..86b3660 100644
---- a/drivers/target/target_core_alua.c
-+++ b/drivers/target/target_core_alua.c
-@@ -60,11 +60,31 @@ int core_emulate_report_target_port_groups(struct se_cmd *cmd)
- 	unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf;
- 	u32 rd_len = 0, off = 4; /* Skip over RESERVED area to first
- 				    Target port group descriptor */
-+	/*
-+	 * Need at least 4 bytes of response data or else we can't
-+	 * even fit the return data length.
-+	 */
-+	if (cmd->data_length < 4) {
-+		pr_warn("REPORT TARGET PORT GROUPS allocation length %u"
-+			" too small\n", cmd->data_length);
-+		return -EINVAL;
-+	}
- 
- 	spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
- 	list_for_each_entry(tg_pt_gp, &T10_ALUA(su_dev)->tg_pt_gps_list,
- 			tg_pt_gp_list) {
- 		/*
-+		 * Check if the Target port group and Target port descriptor list
-+		 * based on tg_pt_gp_members count will fit into the response payload.
-+		 * Otherwise, bump rd_len to let the initiator know we have exceeded
-+		 * the allocation length and the response is truncated.
-+		 */
-+		if ((off + 8 + (tg_pt_gp->tg_pt_gp_members * 4)) >
-+		     cmd->data_length) {
-+			rd_len += 8 + (tg_pt_gp->tg_pt_gp_members * 4);
-+			continue;
-+		}
-+		/*
- 		 * PREF: Preferred target port bit, determine if this
- 		 * bit should be set for port group.
- 		 */
-diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
-index e809e9d..e18604b 100644
---- a/drivers/tty/pty.c
-+++ b/drivers/tty/pty.c
-@@ -670,12 +670,18 @@ static int ptmx_open(struct inode *inode, struct file *filp)
- 
- 	nonseekable_open(inode, filp);
- 
-+	retval = tty_alloc_file(filp);
-+	if (retval)
-+		return retval;
-+
- 	/* find a device that is not in use. */
- 	tty_lock();
- 	index = devpts_new_index(inode);
- 	tty_unlock();
--	if (index < 0)
--		return index;
-+	if (index < 0) {
-+		retval = index;
-+		goto err_file;
-+	}
- 
- 	mutex_lock(&tty_mutex);
- 	tty_lock();
-@@ -689,27 +695,27 @@ static int ptmx_open(struct inode *inode, struct file *filp)
- 
- 	set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */
- 
--	retval = tty_add_file(tty, filp);
--	if (retval)
--		goto out;
-+	tty_add_file(tty, filp);
- 
- 	retval = devpts_pty_new(inode, tty->link);
- 	if (retval)
--		goto out1;
-+		goto err_release;
- 
- 	retval = ptm_driver->ops->open(tty, filp);
- 	if (retval)
--		goto out2;
--out1:
-+		goto err_release;
-+
- 	tty_unlock();
--	return retval;
--out2:
-+	return 0;
-+err_release:
- 	tty_unlock();
- 	tty_release(inode, filp);
- 	return retval;
- out:
- 	devpts_kill_index(inode, index);
- 	tty_unlock();
-+err_file:
-+	tty_free_file(filp);
- 	return retval;
- }
- 
-diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
-index 225123b..58be715 100644
---- a/drivers/tty/serial/crisv10.c
-+++ b/drivers/tty/serial/crisv10.c
-@@ -4450,7 +4450,7 @@ static int __init rs_init(void)
- 
- #if defined(CONFIG_ETRAX_RS485)
- #if defined(CONFIG_ETRAX_RS485_ON_PA)
--	if (cris_io_interface_allocate_pins(if_ser0, 'a', rs485_pa_bit,
-+	if (cris_io_interface_allocate_pins(if_serial_0, 'a', rs485_pa_bit,
- 			rs485_pa_bit)) {
- 		printk(KERN_CRIT "ETRAX100LX serial: Could not allocate "
- 			"RS485 pin\n");
-@@ -4459,7 +4459,7 @@ static int __init rs_init(void)
- 	}
- #endif
- #if defined(CONFIG_ETRAX_RS485_ON_PORT_G)
--	if (cris_io_interface_allocate_pins(if_ser0, 'g', rs485_pa_bit,
-+	if (cris_io_interface_allocate_pins(if_serial_0, 'g', rs485_pa_bit,
- 			rs485_port_g_bit)) {
- 		printk(KERN_CRIT "ETRAX100LX serial: Could not allocate "
- 			"RS485 pin\n");
-diff --git a/drivers/tty/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h
-index b704c8c..5b837e7 100644
---- a/drivers/tty/serial/jsm/jsm.h
-+++ b/drivers/tty/serial/jsm/jsm.h
-@@ -183,10 +183,8 @@ struct jsm_board
- /* Our Read/Error/Write queue sizes */
- #define RQUEUEMASK	0x1FFF		/* 8 K - 1 */
- #define EQUEUEMASK	0x1FFF		/* 8 K - 1 */
--#define WQUEUEMASK	0x0FFF		/* 4 K - 1 */
- #define RQUEUESIZE	(RQUEUEMASK + 1)
- #define EQUEUESIZE	RQUEUESIZE
--#define WQUEUESIZE	(WQUEUEMASK + 1)
- 
- 
- /************************************************************************
-@@ -226,10 +224,6 @@ struct jsm_channel {
- 	u16		ch_e_head;	/* Head location of the error queue */
- 	u16		ch_e_tail;	/* Tail location of the error queue */
- 
--	u8		*ch_wqueue;	/* Our write queue buffer - malloc'ed */
--	u16		ch_w_head;	/* Head location of the write queue */
--	u16		ch_w_tail;	/* Tail location of the write queue */
--
- 	u64		ch_rxcount;	/* total of data received so far */
- 	u64		ch_txcount;	/* total of data transmitted so far */
- 
-@@ -378,7 +372,6 @@ extern int	jsm_debug;
-  * Prototypes for non-static functions used in more than one module
-  *
-  *************************************************************************/
--int jsm_tty_write(struct uart_port *port);
- int jsm_tty_init(struct jsm_board *);
- int jsm_uart_port_init(struct jsm_board *);
- int jsm_remove_uart_port(struct jsm_board *);
-diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
-index 96da178..2aaafa9 100644
---- a/drivers/tty/serial/jsm/jsm_driver.c
-+++ b/drivers/tty/serial/jsm/jsm_driver.c
-@@ -211,7 +211,6 @@ static void __devexit jsm_remove_one(struct pci_dev *pdev)
- 		if (brd->channels[i]) {
- 			kfree(brd->channels[i]->ch_rqueue);
- 			kfree(brd->channels[i]->ch_equeue);
--			kfree(brd->channels[i]->ch_wqueue);
- 			kfree(brd->channels[i]);
- 		}
- 	}
-diff --git a/drivers/tty/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c
-index 4538c3e..bd6e846 100644
---- a/drivers/tty/serial/jsm/jsm_neo.c
-+++ b/drivers/tty/serial/jsm/jsm_neo.c
-@@ -496,12 +496,15 @@ static void neo_copy_data_from_queue_to_uart(struct jsm_channel *ch)
- 	int s;
- 	int qlen;
- 	u32 len_written = 0;
-+	struct circ_buf *circ;
- 
- 	if (!ch)
- 		return;
- 
-+	circ = &ch->uart_port.state->xmit;
-+
- 	/* No data to write to the UART */
--	if (ch->ch_w_tail == ch->ch_w_head)
-+	if (uart_circ_empty(circ))
- 		return;
- 
- 	/* If port is "stopped", don't send any data to the UART */
-@@ -517,11 +520,10 @@ static void neo_copy_data_from_queue_to_uart(struct jsm_channel *ch)
- 		if (ch->ch_cached_lsr & UART_LSR_THRE) {
- 			ch->ch_cached_lsr &= ~(UART_LSR_THRE);
- 
--			writeb(ch->ch_wqueue[ch->ch_w_tail], &ch->ch_neo_uart->txrx);
-+			writeb(circ->buf[circ->tail], &ch->ch_neo_uart->txrx);
- 			jsm_printk(WRITE, INFO, &ch->ch_bd->pci_dev,
--					"Tx data: %x\n", ch->ch_wqueue[ch->ch_w_head]);
--			ch->ch_w_tail++;
--			ch->ch_w_tail &= WQUEUEMASK;
-+					"Tx data: %x\n", circ->buf[circ->head]);
-+			circ->tail = (circ->tail + 1) & (UART_XMIT_SIZE - 1);
- 			ch->ch_txcount++;
- 		}
- 		return;
-@@ -536,36 +538,36 @@ static void neo_copy_data_from_queue_to_uart(struct jsm_channel *ch)
- 	n = UART_17158_TX_FIFOSIZE - ch->ch_t_tlevel;
- 
- 	/* cache head and tail of queue */
--	head = ch->ch_w_head & WQUEUEMASK;
--	tail = ch->ch_w_tail & WQUEUEMASK;
--	qlen = (head - tail) & WQUEUEMASK;
-+	head = circ->head & (UART_XMIT_SIZE - 1);
-+	tail = circ->tail & (UART_XMIT_SIZE - 1);
-+	qlen = uart_circ_chars_pending(circ);
- 
- 	/* Find minimum of the FIFO space, versus queue length */
- 	n = min(n, qlen);
- 
- 	while (n > 0) {
- 
--		s = ((head >= tail) ? head : WQUEUESIZE) - tail;
-+		s = ((head >= tail) ? head : UART_XMIT_SIZE) - tail;
- 		s = min(s, n);
- 
- 		if (s <= 0)
- 			break;
- 
--		memcpy_toio(&ch->ch_neo_uart->txrxburst, ch->ch_wqueue + tail, s);
-+		memcpy_toio(&ch->ch_neo_uart->txrxburst, circ->buf + tail, s);
- 		/* Add and flip queue if needed */
--		tail = (tail + s) & WQUEUEMASK;
-+		tail = (tail + s) & (UART_XMIT_SIZE - 1);
- 		n -= s;
- 		ch->ch_txcount += s;
- 		len_written += s;
- 	}
- 
- 	/* Update the final tail */
--	ch->ch_w_tail = tail & WQUEUEMASK;
-+	circ->tail = tail & (UART_XMIT_SIZE - 1);
- 
- 	if (len_written >= ch->ch_t_tlevel)
- 		ch->ch_flags &= ~(CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
- 
--	if (!jsm_tty_write(&ch->uart_port))
-+	if (uart_circ_empty(circ))
- 		uart_write_wakeup(&ch->uart_port);
- }
- 
-@@ -946,7 +948,6 @@ static void neo_param(struct jsm_channel *ch)
- 	if ((ch->ch_c_cflag & (CBAUD)) == 0) {
- 		ch->ch_r_head = ch->ch_r_tail = 0;
- 		ch->ch_e_head = ch->ch_e_tail = 0;
--		ch->ch_w_head = ch->ch_w_tail = 0;
- 
- 		neo_flush_uart_write(ch);
- 		neo_flush_uart_read(ch);
-diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c
-index 7a4a914..434bd88 100644
---- a/drivers/tty/serial/jsm/jsm_tty.c
-+++ b/drivers/tty/serial/jsm/jsm_tty.c
-@@ -118,6 +118,19 @@ static void jsm_tty_set_mctrl(struct uart_port *port, unsigned int mctrl)
- 	udelay(10);
- }
- 
-+/*
-+ * jsm_tty_write()
-+ *
-+ * Take data from the user or kernel and send it out to the FEP.
-+ * In here exists all the Transparent Print magic as well.
-+ */
-+static void jsm_tty_write(struct uart_port *port)
-+{
-+	struct jsm_channel *channel;
-+	channel = container_of(port, struct jsm_channel, uart_port);
-+	channel->ch_bd->bd_ops->copy_data_from_queue_to_uart(channel);
-+}
-+
- static void jsm_tty_start_tx(struct uart_port *port)
- {
- 	struct jsm_channel *channel = (struct jsm_channel *)port;
-@@ -216,14 +229,6 @@ static int jsm_tty_open(struct uart_port *port)
- 			return -ENOMEM;
- 		}
- 	}
--	if (!channel->ch_wqueue) {
--		channel->ch_wqueue = kzalloc(WQUEUESIZE, GFP_KERNEL);
--		if (!channel->ch_wqueue) {
--			jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
--				"unable to allocate write queue buf");
--			return -ENOMEM;
--		}
--	}
- 
- 	channel->ch_flags &= ~(CH_OPENING);
- 	/*
-@@ -237,7 +242,6 @@ static int jsm_tty_open(struct uart_port *port)
- 	 */
- 	channel->ch_r_head = channel->ch_r_tail = 0;
- 	channel->ch_e_head = channel->ch_e_tail = 0;
--	channel->ch_w_head = channel->ch_w_tail = 0;
- 
- 	brd->bd_ops->flush_uart_write(channel);
- 	brd->bd_ops->flush_uart_read(channel);
-@@ -836,75 +840,3 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch)
- 		}
- 	}
- }
--
--/*
-- * jsm_tty_write()
-- *
-- * Take data from the user or kernel and send it out to the FEP.
-- * In here exists all the Transparent Print magic as well.
-- */
--int jsm_tty_write(struct uart_port *port)
--{
--	int bufcount;
--	int data_count = 0,data_count1 =0;
--	u16 head;
--	u16 tail;
--	u16 tmask;
--	u32 remain;
--	int temp_tail = port->state->xmit.tail;
--	struct jsm_channel *channel = (struct jsm_channel *)port;
--
--	tmask = WQUEUEMASK;
--	head = (channel->ch_w_head) & tmask;
--	tail = (channel->ch_w_tail) & tmask;
--
--	if ((bufcount = tail - head - 1) < 0)
--		bufcount += WQUEUESIZE;
--
--	bufcount = min(bufcount, 56);
--	remain = WQUEUESIZE - head;
--
--	data_count = 0;
--	if (bufcount >= remain) {
--		bufcount -= remain;
--		while ((port->state->xmit.head != temp_tail) &&
--		(data_count < remain)) {
--			channel->ch_wqueue[head++] =
--			port->state->xmit.buf[temp_tail];
--
--			temp_tail++;
--			temp_tail &= (UART_XMIT_SIZE - 1);
--			data_count++;
--		}
--		if (data_count == remain) head = 0;
--	}
--
--	data_count1 = 0;
--	if (bufcount > 0) {
--		remain = bufcount;
--		while ((port->state->xmit.head != temp_tail) &&
--			(data_count1 < remain)) {
--			channel->ch_wqueue[head++] =
--				port->state->xmit.buf[temp_tail];
--
--			temp_tail++;
--			temp_tail &= (UART_XMIT_SIZE - 1);
--			data_count1++;
--
--		}
--	}
--
--	port->state->xmit.tail = temp_tail;
--
--	data_count += data_count1;
--	if (data_count) {
--		head &= tmask;
--		channel->ch_w_head = head;
--	}
--
--	if (data_count) {
--		channel->ch_bd->bd_ops->copy_data_from_queue_to_uart(channel);
--	}
--
--	return data_count;
--}
-diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
-index 4302e6e..81243a6 100644
---- a/drivers/tty/serial/pxa.c
-+++ b/drivers/tty/serial/pxa.c
-@@ -100,6 +100,16 @@ static inline void receive_chars(struct uart_pxa_port *up, int *status)
- 	int max_count = 256;
- 
- 	do {
-+		/* work around Errata #20 according to
-+		 * Intel(R) PXA27x Processor Family
-+		 * Specification Update (May 2005)
-+		 *
-+		 * Step 2
-+		 * Disable the Reciever Time Out Interrupt via IER[RTOEI]
-+		 */
-+		up->ier &= ~UART_IER_RTOIE;
-+		serial_out(up, UART_IER, up->ier);
-+
- 		ch = serial_in(up, UART_RX);
- 		flag = TTY_NORMAL;
- 		up->port.icount.rx++;
-@@ -156,6 +166,16 @@ static inline void receive_chars(struct uart_pxa_port *up, int *status)
- 		*status = serial_in(up, UART_LSR);
- 	} while ((*status & UART_LSR_DR) && (max_count-- > 0));
- 	tty_flip_buffer_push(tty);
-+
-+	/* work around Errata #20 according to
-+	 * Intel(R) PXA27x Processor Family
-+	 * Specification Update (May 2005)
-+	 *
-+	 * Step 6:
-+	 * No more data in FIFO: Re-enable RTO interrupt via IER[RTOIE]
-+	 */
-+	up->ier |= UART_IER_RTOIE;
-+	serial_out(up, UART_IER, up->ier);
- }
- 
- static void transmit_chars(struct uart_pxa_port *up)
-diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
-index db7912c..6bc20d7 100644
---- a/drivers/tty/serial/serial_core.c
-+++ b/drivers/tty/serial/serial_core.c
-@@ -2003,6 +2003,8 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
- 		if (port->tty && port->tty->termios && termios.c_cflag == 0)
- 			termios = *(port->tty->termios);
- 
-+		if (console_suspend_enabled)
-+			uart_change_pm(state, 0);
- 		uport->ops->set_termios(uport, &termios, NULL);
- 		if (console_suspend_enabled)
- 			console_start(uport->cons);
-diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
-index b6f92d3..b44aef0 100644
---- a/drivers/tty/tty_io.c
-+++ b/drivers/tty/tty_io.c
-@@ -193,8 +193,7 @@ static inline struct tty_struct *file_tty(struct file *file)
- 	return ((struct tty_file_private *)file->private_data)->tty;
- }
- 
--/* Associate a new file with the tty structure */
--int tty_add_file(struct tty_struct *tty, struct file *file)
-+int tty_alloc_file(struct file *file)
- {
- 	struct tty_file_private *priv;
- 
-@@ -202,15 +201,36 @@ int tty_add_file(struct tty_struct *tty, struct file *file)
- 	if (!priv)
- 		return -ENOMEM;
- 
-+	file->private_data = priv;
-+
-+	return 0;
-+}
-+
-+/* Associate a new file with the tty structure */
-+void tty_add_file(struct tty_struct *tty, struct file *file)
-+{
-+	struct tty_file_private *priv = file->private_data;
-+
- 	priv->tty = tty;
- 	priv->file = file;
--	file->private_data = priv;
- 
- 	spin_lock(&tty_files_lock);
- 	list_add(&priv->list, &tty->tty_files);
- 	spin_unlock(&tty_files_lock);
-+}
- 
--	return 0;
-+/**
-+ * tty_free_file - free file->private_data
-+ *
-+ * This shall be used only for fail path handling when tty_add_file was not
-+ * called yet.
-+ */
-+void tty_free_file(struct file *file)
-+{
-+	struct tty_file_private *priv = file->private_data;
-+
-+	file->private_data = NULL;
-+	kfree(priv);
- }
- 
- /* Delete file from its tty */
-@@ -221,8 +241,7 @@ void tty_del_file(struct file *file)
- 	spin_lock(&tty_files_lock);
- 	list_del(&priv->list);
- 	spin_unlock(&tty_files_lock);
--	file->private_data = NULL;
--	kfree(priv);
-+	tty_free_file(file);
- }
- 
- 
-@@ -1811,6 +1830,10 @@ static int tty_open(struct inode *inode, struct file *filp)
- 	nonseekable_open(inode, filp);
- 
- retry_open:
-+	retval = tty_alloc_file(filp);
-+	if (retval)
-+		return -ENOMEM;
-+
- 	noctty = filp->f_flags & O_NOCTTY;
- 	index  = -1;
- 	retval = 0;
-@@ -1823,6 +1846,7 @@ retry_open:
- 		if (!tty) {
- 			tty_unlock();
- 			mutex_unlock(&tty_mutex);
-+			tty_free_file(filp);
- 			return -ENXIO;
- 		}
- 		driver = tty_driver_kref_get(tty->driver);
-@@ -1855,6 +1879,7 @@ retry_open:
- 		}
- 		tty_unlock();
- 		mutex_unlock(&tty_mutex);
-+		tty_free_file(filp);
- 		return -ENODEV;
- 	}
- 
-@@ -1862,6 +1887,7 @@ retry_open:
- 	if (!driver) {
- 		tty_unlock();
- 		mutex_unlock(&tty_mutex);
-+		tty_free_file(filp);
- 		return -ENODEV;
- 	}
- got_driver:
-@@ -1872,6 +1898,8 @@ got_driver:
- 		if (IS_ERR(tty)) {
- 			tty_unlock();
- 			mutex_unlock(&tty_mutex);
-+			tty_driver_kref_put(driver);
-+			tty_free_file(filp);
- 			return PTR_ERR(tty);
- 		}
- 	}
-@@ -1887,15 +1915,11 @@ got_driver:
- 	tty_driver_kref_put(driver);
- 	if (IS_ERR(tty)) {
- 		tty_unlock();
-+		tty_free_file(filp);
- 		return PTR_ERR(tty);
- 	}
- 
--	retval = tty_add_file(tty, filp);
--	if (retval) {
--		tty_unlock();
--		tty_release(inode, filp);
--		return retval;
--	}
-+	tty_add_file(tty, filp);
- 
- 	check_tty_count(tty, "tty_open");
- 	if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
-diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
-index dac7676..5112f57 100644
---- a/drivers/usb/class/cdc-acm.c
-+++ b/drivers/usb/class/cdc-acm.c
-@@ -1534,6 +1534,9 @@ static const struct usb_device_id acm_ids[] = {
- 	{ NOKIA_PCSUITE_ACM_INFO(0x03cd), }, /* Nokia C7 */
- 	{ SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) */
- 
-+	/* Support for Owen devices */
-+	{ USB_DEVICE(0x03eb, 0x0030), }, /* Owen SI30 */
-+
- 	/* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */
- 
- 	/* Support Lego NXT using pbLua firmware */
-diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
-index 37518df..0ca54e2 100644
---- a/drivers/usb/core/devio.c
-+++ b/drivers/usb/core/devio.c
-@@ -407,7 +407,7 @@ static void async_completed(struct urb *urb)
- 		sinfo.si_errno = as->status;
- 		sinfo.si_code = SI_ASYNCIO;
- 		sinfo.si_addr = as->userurb;
--		pid = as->pid;
-+		pid = get_pid(as->pid);
- 		uid = as->uid;
- 		euid = as->euid;
- 		secid = as->secid;
-@@ -422,9 +422,11 @@ static void async_completed(struct urb *urb)
- 		cancel_bulk_urbs(ps, as->bulk_addr);
- 	spin_unlock(&ps->lock);
- 
--	if (signr)
-+	if (signr) {
- 		kill_pid_info_as_uid(sinfo.si_signo, &sinfo, pid, uid,
- 				      euid, secid);
-+		put_pid(pid);
-+	}
- 
- 	wake_up(&ps->wait);
- }
-@@ -607,9 +609,10 @@ static int findintfep(struct usb_device *dev, unsigned int ep)
- }
- 
- static int check_ctrlrecip(struct dev_state *ps, unsigned int requesttype,
--			   unsigned int index)
-+			   unsigned int request, unsigned int index)
- {
- 	int ret = 0;
-+	struct usb_host_interface *alt_setting;
- 
- 	if (ps->dev->state != USB_STATE_UNAUTHENTICATED
- 	 && ps->dev->state != USB_STATE_ADDRESS
-@@ -618,6 +621,19 @@ static int check_ctrlrecip(struct dev_state *ps, unsigned int requesttype,
- 	if (USB_TYPE_VENDOR == (USB_TYPE_MASK & requesttype))
- 		return 0;
- 
-+	/*
-+	 * check for the special corner case 'get_device_id' in the printer
-+	 * class specification, where wIndex is (interface << 8 | altsetting)
-+	 * instead of just interface
-+	 */
-+	if (requesttype == 0xa1 && request == 0) {
-+		alt_setting = usb_find_alt_setting(ps->dev->actconfig,
-+						   index >> 8, index & 0xff);
-+		if (alt_setting
-+		 && alt_setting->desc.bInterfaceClass == USB_CLASS_PRINTER)
-+			index >>= 8;
-+	}
-+
- 	index &= 0xff;
- 	switch (requesttype & USB_RECIP_MASK) {
- 	case USB_RECIP_ENDPOINT:
-@@ -770,7 +786,8 @@ static int proc_control(struct dev_state *ps, void __user *arg)
- 
- 	if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
- 		return -EFAULT;
--	ret = check_ctrlrecip(ps, ctrl.bRequestType, ctrl.wIndex);
-+	ret = check_ctrlrecip(ps, ctrl.bRequestType, ctrl.bRequest,
-+			      ctrl.wIndex);
- 	if (ret)
- 		return ret;
- 	wLength = ctrl.wLength;		/* To suppress 64k PAGE_SIZE warning */
-@@ -1100,7 +1117,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
- 			kfree(dr);
- 			return -EINVAL;
- 		}
--		ret = check_ctrlrecip(ps, dr->bRequestType,
-+		ret = check_ctrlrecip(ps, dr->bRequestType, dr->bRequest,
- 				      le16_to_cpup(&dr->wIndex));
- 		if (ret) {
- 			kfree(dr);
-diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
-index 34e3da5..75b4bc0 100644
---- a/drivers/usb/core/driver.c
-+++ b/drivers/usb/core/driver.c
-@@ -1583,7 +1583,7 @@ int usb_autopm_get_interface_async(struct usb_interface *intf)
- 	dev_vdbg(&intf->dev, "%s: cnt %d -> %d\n",
- 			__func__, atomic_read(&intf->dev.power.usage_count),
- 			status);
--	if (status > 0)
-+	if (status > 0 || status == -EINPROGRESS)
- 		status = 0;
- 	return status;
- }
-@@ -1668,6 +1668,11 @@ int usb_runtime_suspend(struct device *dev)
- 		return -EAGAIN;
- 
- 	status = usb_suspend_both(udev, PMSG_AUTO_SUSPEND);
-+
-+	/* Allow a retry if autosuspend failed temporarily */
-+	if (status == -EAGAIN || status == -EBUSY)
-+		usb_mark_last_busy(udev);
-+
- 	/* The PM core reacts badly unless the return code is 0,
- 	 * -EAGAIN, or -EBUSY, so always return -EBUSY on an error.
- 	 */
-diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
-index ace9f84..39ea00b 100644
---- a/drivers/usb/core/hcd.c
-+++ b/drivers/usb/core/hcd.c
-@@ -1764,6 +1764,8 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev,
- 		struct usb_interface *iface = usb_ifnum_to_if(udev,
- 				cur_alt->desc.bInterfaceNumber);
- 
-+		if (!iface)
-+			return -EINVAL;
- 		if (iface->resetting_device) {
- 			/*
- 			 * The USB core just reset the device, so the xHCI host
-diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 81ce6a8..d6a8d82 100644
---- a/drivers/usb/core/quirks.c
-+++ b/drivers/usb/core/quirks.c
-@@ -38,6 +38,27 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	/* Creative SB Audigy 2 NX */
- 	{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Webcam C200 */
-+	{ USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C250 */
-+	{ USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C300 */
-+	{ USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam B/C500 */
-+	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam Pro 9000 */
-+	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C310 */
-+	{ USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C270 */
-+	{ USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Harmony 700-series */
- 	{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
- 
-@@ -69,6 +90,9 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	{ USB_DEVICE(0x06a3, 0x0006), .driver_info =
- 			USB_QUIRK_CONFIG_INTF_STRINGS },
- 
-+	/* Guillemot Webcam Hercules Dualpix Exchange*/
-+	{ USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* M-Systems Flash Disk Pioneers */
- 	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
-index 271ef94..88a464c 100644
---- a/drivers/usb/gadget/printer.c
-+++ b/drivers/usb/gadget/printer.c
-@@ -1602,7 +1602,7 @@ cleanup(void)
- 	if (status)
- 		ERROR(dev, "usb_gadget_unregister_driver %x\n", status);
- 
--	unregister_chrdev_region(g_printer_devno, 2);
-+	unregister_chrdev_region(g_printer_devno, 1);
- 	class_destroy(usb_gadget_class);
- 	mutex_unlock(&usb_printer_gadget.lock_printer_io);
- }
-diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
-index 40a844c..3e2ccb0 100644
---- a/drivers/usb/host/ehci-dbg.c
-+++ b/drivers/usb/host/ehci-dbg.c
-@@ -808,7 +808,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
- 	next += temp;
- 
- 	temp = scnprintf (next, size, "uframe %04x\n",
--			ehci_readl(ehci, &ehci->regs->frame_index));
-+			ehci_read_frame_index(ehci));
- 	size -= temp;
- 	next += temp;
- 
-diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
-index 9ff9abc..b27ceab 100644
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -761,6 +761,35 @@ static int ehci_run (struct usb_hcd *hcd)
- 	return 0;
- }
- 
-+static int __maybe_unused ehci_setup (struct usb_hcd *hcd)
-+{
-+	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+	int retval;
-+
-+	ehci->regs = (void __iomem *)ehci->caps +
-+	    HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));
-+	dbg_hcs_params(ehci, "reset");
-+	dbg_hcc_params(ehci, "reset");
-+
-+	/* cache this readonly data; minimize chip reads */
-+	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
-+
-+	ehci->sbrn = HCD_USB2;
-+
-+	retval = ehci_halt(ehci);
-+	if (retval)
-+		return retval;
-+
-+	/* data structure init */
-+	retval = ehci_init(hcd);
-+	if (retval)
-+		return retval;
-+
-+	ehci_reset(ehci);
-+
-+	return 0;
-+}
-+
- /*-------------------------------------------------------------------------*/
- 
- static irqreturn_t ehci_irq (struct usb_hcd *hcd)
-@@ -1159,8 +1188,7 @@ ehci_endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep)
- static int ehci_get_frame (struct usb_hcd *hcd)
- {
- 	struct ehci_hcd		*ehci = hcd_to_ehci (hcd);
--	return (ehci_readl(ehci, &ehci->regs->frame_index) >> 3) %
--		ehci->periodic_size;
-+	return (ehci_read_frame_index(ehci) >> 3) % ehci->periodic_size;
- }
- 
- /*-------------------------------------------------------------------------*/
-diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
-index 0f3a724..f5d7fed 100644
---- a/drivers/usb/host/ehci-hub.c
-+++ b/drivers/usb/host/ehci-hub.c
-@@ -1120,7 +1120,19 @@ static int ehci_hub_control (
- 			if (!selector || selector > 5)
- 				goto error;
- 			ehci_quiesce(ehci);
-+
-+			/* Put all enabled ports into suspend */
-+			while (ports--) {
-+				u32 __iomem *sreg =
-+						&ehci->regs->port_status[ports];
-+
-+				temp = ehci_readl(ehci, sreg) & ~PORT_RWC_BITS;
-+				if (temp & PORT_PE)
-+					ehci_writel(ehci, temp | PORT_SUSPEND,
-+							sreg);
-+			}
- 			ehci_halt(ehci);
-+			temp = ehci_readl(ehci, status_reg);
- 			temp |= selector << 16;
- 			ehci_writel(ehci, temp, status_reg);
- 			break;
-diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
-index 1102ce6..1d1caa6 100644
---- a/drivers/usb/host/ehci-pci.c
-+++ b/drivers/usb/host/ehci-pci.c
-@@ -224,6 +224,11 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
- 			pci_dev_put(p_smbus);
- 		}
- 		break;
-+	case PCI_VENDOR_ID_NETMOS:
-+		/* MosChip frame-index-register bug */
-+		ehci_info(ehci, "applying MosChip frame-index workaround\n");
-+		ehci->frame_index_bug = 1;
-+		break;
- 	}
- 
- 	/* optional debug port, normally in the first BAR */
-diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
-index 6c9fbe3..063c630 100644
---- a/drivers/usb/host/ehci-sched.c
-+++ b/drivers/usb/host/ehci-sched.c
-@@ -36,6 +36,27 @@
- 
- static int ehci_get_frame (struct usb_hcd *hcd);
- 
-+#ifdef CONFIG_PCI
-+
-+static unsigned ehci_read_frame_index(struct ehci_hcd *ehci)
-+{
-+	unsigned uf;
-+
-+	/*
-+	 * The MosChip MCS9990 controller updates its microframe counter
-+	 * a little before the frame counter, and occasionally we will read
-+	 * the invalid intermediate value.  Avoid problems by checking the
-+	 * microframe number (the low-order 3 bits); if they are 0 then
-+	 * re-read the register to get the correct value.
-+	 */
-+	uf = ehci_readl(ehci, &ehci->regs->frame_index);
-+	if (unlikely(ehci->frame_index_bug && ((uf & 7) == 0)))
-+		uf = ehci_readl(ehci, &ehci->regs->frame_index);
-+	return uf;
-+}
-+
-+#endif
-+
- /*-------------------------------------------------------------------------*/
- 
- /*
-@@ -482,7 +503,7 @@ static int enable_periodic (struct ehci_hcd *ehci)
- 	ehci_to_hcd(ehci)->state = HC_STATE_RUNNING;
- 
- 	/* make sure ehci_work scans these */
--	ehci->next_uframe = ehci_readl(ehci, &ehci->regs->frame_index)
-+	ehci->next_uframe = ehci_read_frame_index(ehci)
- 		% (ehci->periodic_size << 3);
- 	if (unlikely(ehci->broken_periodic))
- 		ehci->last_periodic_enable = ktime_get_real();
-@@ -1412,7 +1433,7 @@ iso_stream_schedule (
- 		goto fail;
- 	}
- 
--	now = ehci_readl(ehci, &ehci->regs->frame_index) & (mod - 1);
-+	now = ehci_read_frame_index(ehci) & (mod - 1);
- 
- 	/* Typical case: reuse current schedule, stream is still active.
- 	 * Hopefully there are no gaps from the host falling behind
-@@ -2279,7 +2300,7 @@ scan_periodic (struct ehci_hcd *ehci)
- 	 */
- 	now_uframe = ehci->next_uframe;
- 	if (HC_IS_RUNNING(ehci_to_hcd(ehci)->state)) {
--		clock = ehci_readl(ehci, &ehci->regs->frame_index);
-+		clock = ehci_read_frame_index(ehci);
- 		clock_frame = (clock >> 3) & (ehci->periodic_size - 1);
- 	} else  {
- 		clock = now_uframe + mod - 1;
-@@ -2458,8 +2479,7 @@ restart:
- 					|| ehci->periodic_sched == 0)
- 				break;
- 			ehci->next_uframe = now_uframe;
--			now = ehci_readl(ehci, &ehci->regs->frame_index) &
--					(mod - 1);
-+			now = ehci_read_frame_index(ehci) & (mod - 1);
- 			if (now_uframe == now)
- 				break;
- 
-diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
-index 989e0a8..3ffb27f 100644
---- a/drivers/usb/host/ehci.h
-+++ b/drivers/usb/host/ehci.h
-@@ -137,6 +137,7 @@ struct ehci_hcd {			/* one per controller */
- 	unsigned		fs_i_thresh:1;	/* Intel iso scheduling */
- 	unsigned		use_dummy_qh:1;	/* AMD Frame List table quirk*/
- 	unsigned		has_synopsys_hc_bug:1; /* Synopsys HC */
-+	unsigned		frame_index_bug:1; /* MosChip (AKA NetMos) */
- 
- 	/* required for usb32 quirk */
- 	#define OHCI_CTRL_HCFS          (3 << 6)
-@@ -738,6 +739,22 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
- 
- /*-------------------------------------------------------------------------*/
- 
-+#ifdef CONFIG_PCI
-+
-+/* For working around the MosChip frame-index-register bug */
-+static unsigned ehci_read_frame_index(struct ehci_hcd *ehci);
-+
-+#else
-+
-+static inline unsigned ehci_read_frame_index(struct ehci_hcd *ehci)
-+{
-+	return ehci_readl(ehci, &ehci->regs->frame_index);
-+}
-+
-+#endif
-+
-+/*-------------------------------------------------------------------------*/
-+
- #ifndef DEBUG
- #define STUB_DEBUG_FILES
- #endif	/* DEBUG */
-diff --git a/drivers/usb/host/fhci-sched.c b/drivers/usb/host/fhci-sched.c
-index a42ef38..2df851b 100644
---- a/drivers/usb/host/fhci-sched.c
-+++ b/drivers/usb/host/fhci-sched.c
-@@ -1,7 +1,7 @@
- /*
-  * Freescale QUICC Engine USB Host Controller Driver
-  *
-- * Copyright (c) Freescale Semicondutor, Inc. 2006.
-+ * Copyright (c) Freescale Semicondutor, Inc. 2006, 2011.
-  *               Shlomi Gridish <gridish@freescale.com>
-  *               Jerry Huang <Chang-Ming.Huang@freescale.com>
-  * Copyright (c) Logic Product Development, Inc. 2007
-@@ -810,9 +810,11 @@ void fhci_queue_urb(struct fhci_hcd *fhci, struct urb *urb)
- 		ed->dev_addr = usb_pipedevice(urb->pipe);
- 		ed->max_pkt_size = usb_maxpacket(urb->dev, urb->pipe,
- 			usb_pipeout(urb->pipe));
-+		/* setup stage */
- 		td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++, FHCI_TA_SETUP,
- 			USB_TD_TOGGLE_DATA0, urb->setup_packet, 8, 0, 0, true);
- 
-+		/* data stage */
- 		if (data_len > 0) {
- 			td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++,
- 				usb_pipeout(urb->pipe) ? FHCI_TA_OUT :
-@@ -820,9 +822,18 @@ void fhci_queue_urb(struct fhci_hcd *fhci, struct urb *urb)
- 				USB_TD_TOGGLE_DATA1, data, data_len, 0, 0,
- 				true);
- 		}
--		td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++,
--			usb_pipeout(urb->pipe) ? FHCI_TA_IN : FHCI_TA_OUT,
--			USB_TD_TOGGLE_DATA1, data, 0, 0, 0, true);
-+
-+		/* status stage */
-+		if (data_len > 0)
-+			td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++,
-+				(usb_pipeout(urb->pipe) ? FHCI_TA_IN :
-+							  FHCI_TA_OUT),
-+				USB_TD_TOGGLE_DATA1, data, 0, 0, 0, true);
-+		else
-+			 td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++,
-+				FHCI_TA_IN,
-+				USB_TD_TOGGLE_DATA1, data, 0, 0, 0, true);
-+
- 		urb_state = US_CTRL_SETUP;
- 		break;
- 	case FHCI_TF_ISO:
-diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
-index 55d3d58..840beda 100644
---- a/drivers/usb/host/isp1760-hcd.c
-+++ b/drivers/usb/host/isp1760-hcd.c
-@@ -1583,6 +1583,9 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb,
- 	int retval = 0;
- 
- 	spin_lock_irqsave(&priv->lock, spinflags);
-+	retval = usb_hcd_check_unlink_urb(hcd, urb, status);
-+	if (retval)
-+		goto out;
- 
- 	qh = urb->ep->hcpriv;
- 	if (!qh) {
-diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
-index 9154615..2f00040 100644
---- a/drivers/usb/host/ohci-hub.c
-+++ b/drivers/usb/host/ohci-hub.c
-@@ -356,10 +356,7 @@ static void ohci_finish_controller_resume(struct usb_hcd *hcd)
- 		msleep(20);
- 	}
- 
--	/* Does the root hub have a port wakeup pending? */
--	if (ohci_readl(ohci, &ohci->regs->intrstatus) &
--			(OHCI_INTR_RD | OHCI_INTR_RHSC))
--		usb_hcd_resume_root_hub(hcd);
-+	usb_hcd_resume_root_hub(hcd);
- }
- 
- /* Carry out polling-, autostop-, and autoresume-related state changes */
-diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
-index 723f823..ce9f974 100644
---- a/drivers/usb/host/xhci-hub.c
-+++ b/drivers/usb/host/xhci-hub.c
-@@ -392,6 +392,20 @@ static int xhci_get_ports(struct usb_hcd *hcd, __le32 __iomem ***port_array)
- 	return max_ports;
- }
- 
-+/* Test and clear port RWC bit */
-+void xhci_test_and_clear_bit(struct xhci_hcd *xhci, __le32 __iomem **port_array,
-+				int port_id, u32 port_bit)
-+{
-+	u32 temp;
-+
-+	temp = xhci_readl(xhci, port_array[port_id]);
-+	if (temp & port_bit) {
-+		temp = xhci_port_state_to_neutral(temp);
-+		temp |= port_bit;
-+		xhci_writel(xhci, temp, port_array[port_id]);
-+	}
-+}
-+
- int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
- 		u16 wIndex, char *buf, u16 wLength)
- {
-@@ -938,12 +952,8 @@ int xhci_bus_resume(struct usb_hcd *hcd)
- 			spin_lock_irqsave(&xhci->lock, flags);
- 
- 			/* Clear PLC */
--			temp = xhci_readl(xhci, port_array[port_index]);
--			if (temp & PORT_PLC) {
--				temp = xhci_port_state_to_neutral(temp);
--				temp |= PORT_PLC;
--				xhci_writel(xhci, temp, port_array[port_index]);
--			}
-+			xhci_test_and_clear_bit(xhci, port_array, port_index,
-+						PORT_PLC);
- 
- 			slot_id = xhci_find_slot_id_by_port(hcd,
- 					xhci, port_index + 1);
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index fcb7f7e..104620b 100644
---- a/drivers/usb/host/xhci-mem.c
-+++ b/drivers/usb/host/xhci-mem.c
-@@ -81,7 +81,7 @@ static void xhci_segment_free(struct xhci_hcd *xhci, struct xhci_segment *seg)
-  * related flags, such as End TRB, Toggle Cycle, and no snoop.
-  */
- static void xhci_link_segments(struct xhci_hcd *xhci, struct xhci_segment *prev,
--		struct xhci_segment *next, bool link_trbs)
-+		struct xhci_segment *next, bool link_trbs, bool isoc)
- {
- 	u32 val;
- 
-@@ -97,7 +97,9 @@ static void xhci_link_segments(struct xhci_hcd *xhci, struct xhci_segment *prev,
- 		val &= ~TRB_TYPE_BITMASK;
- 		val |= TRB_TYPE(TRB_LINK);
- 		/* Always set the chain bit with 0.95 hardware */
--		if (xhci_link_trb_quirk(xhci))
-+		/* Set chain bit for isoc rings on AMD 0.96 host */
-+		if (xhci_link_trb_quirk(xhci) ||
-+				(isoc && (xhci->quirks & XHCI_AMD_0x96_HOST)))
- 			val |= TRB_CHAIN;
- 		prev->trbs[TRBS_PER_SEGMENT-1].link.control = cpu_to_le32(val);
- 	}
-@@ -112,18 +114,20 @@ void xhci_ring_free(struct xhci_hcd *xhci, struct xhci_ring *ring)
- 	struct xhci_segment *seg;
- 	struct xhci_segment *first_seg;
- 
--	if (!ring || !ring->first_seg)
-+	if (!ring)
- 		return;
--	first_seg = ring->first_seg;
--	seg = first_seg->next;
--	xhci_dbg(xhci, "Freeing ring at %p\n", ring);
--	while (seg != first_seg) {
--		struct xhci_segment *next = seg->next;
--		xhci_segment_free(xhci, seg);
--		seg = next;
-+	if (ring->first_seg) {
-+		first_seg = ring->first_seg;
-+		seg = first_seg->next;
-+		xhci_dbg(xhci, "Freeing ring at %p\n", ring);
-+		while (seg != first_seg) {
-+			struct xhci_segment *next = seg->next;
-+			xhci_segment_free(xhci, seg);
-+			seg = next;
-+		}
-+		xhci_segment_free(xhci, first_seg);
-+		ring->first_seg = NULL;
- 	}
--	xhci_segment_free(xhci, first_seg);
--	ring->first_seg = NULL;
- 	kfree(ring);
- }
- 
-@@ -152,7 +156,7 @@ static void xhci_initialize_ring_info(struct xhci_ring *ring)
-  * See section 4.9.1 and figures 15 and 16.
-  */
- static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci,
--		unsigned int num_segs, bool link_trbs, gfp_t flags)
-+		unsigned int num_segs, bool link_trbs, bool isoc, gfp_t flags)
- {
- 	struct xhci_ring	*ring;
- 	struct xhci_segment	*prev;
-@@ -178,12 +182,12 @@ static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci,
- 		next = xhci_segment_alloc(xhci, flags);
- 		if (!next)
- 			goto fail;
--		xhci_link_segments(xhci, prev, next, link_trbs);
-+		xhci_link_segments(xhci, prev, next, link_trbs, isoc);
- 
- 		prev = next;
- 		num_segs--;
- 	}
--	xhci_link_segments(xhci, prev, ring->first_seg, link_trbs);
-+	xhci_link_segments(xhci, prev, ring->first_seg, link_trbs, isoc);
- 
- 	if (link_trbs) {
- 		/* See section 4.9.2.1 and 6.4.4.1 */
-@@ -229,14 +233,14 @@ void xhci_free_or_cache_endpoint_ring(struct xhci_hcd *xhci,
-  * pointers to the beginning of the ring.
-  */
- static void xhci_reinit_cached_ring(struct xhci_hcd *xhci,
--		struct xhci_ring *ring)
-+		struct xhci_ring *ring, bool isoc)
- {
- 	struct xhci_segment	*seg = ring->first_seg;
- 	do {
- 		memset(seg->trbs, 0,
- 				sizeof(union xhci_trb)*TRBS_PER_SEGMENT);
- 		/* All endpoint rings have link TRBs */
--		xhci_link_segments(xhci, seg, seg->next, 1);
-+		xhci_link_segments(xhci, seg, seg->next, 1, isoc);
- 		seg = seg->next;
- 	} while (seg != ring->first_seg);
- 	xhci_initialize_ring_info(ring);
-@@ -540,7 +544,7 @@ struct xhci_stream_info *xhci_alloc_stream_info(struct xhci_hcd *xhci,
- 	 */
- 	for (cur_stream = 1; cur_stream < num_streams; cur_stream++) {
- 		stream_info->stream_rings[cur_stream] =
--			xhci_ring_alloc(xhci, 1, true, mem_flags);
-+			xhci_ring_alloc(xhci, 1, true, false, mem_flags);
- 		cur_ring = stream_info->stream_rings[cur_stream];
- 		if (!cur_ring)
- 			goto cleanup_rings;
-@@ -765,7 +769,7 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,
- 	}
- 
- 	/* Allocate endpoint 0 ring */
--	dev->eps[0].ring = xhci_ring_alloc(xhci, 1, true, flags);
-+	dev->eps[0].ring = xhci_ring_alloc(xhci, 1, true, false, flags);
- 	if (!dev->eps[0].ring)
- 		goto fail;
- 
-@@ -1175,10 +1179,10 @@ int xhci_endpoint_init(struct xhci_hcd *xhci,
- 	 */
- 	if (usb_endpoint_xfer_isoc(&ep->desc))
- 		virt_dev->eps[ep_index].new_ring =
--			xhci_ring_alloc(xhci, 8, true, mem_flags);
-+			xhci_ring_alloc(xhci, 8, true, true, mem_flags);
- 	else
- 		virt_dev->eps[ep_index].new_ring =
--			xhci_ring_alloc(xhci, 1, true, mem_flags);
-+			xhci_ring_alloc(xhci, 1, true, false, mem_flags);
- 	if (!virt_dev->eps[ep_index].new_ring) {
- 		/* Attempt to use the ring cache */
- 		if (virt_dev->num_rings_cached == 0)
-@@ -1187,7 +1191,8 @@ int xhci_endpoint_init(struct xhci_hcd *xhci,
- 			virt_dev->ring_cache[virt_dev->num_rings_cached];
- 		virt_dev->ring_cache[virt_dev->num_rings_cached] = NULL;
- 		virt_dev->num_rings_cached--;
--		xhci_reinit_cached_ring(xhci, virt_dev->eps[ep_index].new_ring);
-+		xhci_reinit_cached_ring(xhci, virt_dev->eps[ep_index].new_ring,
-+			usb_endpoint_xfer_isoc(&ep->desc) ? true : false);
- 	}
- 	virt_dev->eps[ep_index].skip = false;
- 	ep_ring = virt_dev->eps[ep_index].new_ring;
-@@ -2001,7 +2006,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
- 		goto fail;
- 
- 	/* Set up the command ring to have one segments for now. */
--	xhci->cmd_ring = xhci_ring_alloc(xhci, 1, true, flags);
-+	xhci->cmd_ring = xhci_ring_alloc(xhci, 1, true, false, flags);
- 	if (!xhci->cmd_ring)
- 		goto fail;
- 	xhci_dbg(xhci, "Allocated command ring at %p\n", xhci->cmd_ring);
-@@ -2032,7 +2037,8 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
- 	 * the event ring segment table (ERST).  Section 4.9.3.
- 	 */
- 	xhci_dbg(xhci, "// Allocating event ring\n");
--	xhci->event_ring = xhci_ring_alloc(xhci, ERST_NUM_SEGS, false, flags);
-+	xhci->event_ring = xhci_ring_alloc(xhci, ERST_NUM_SEGS, false, false,
-+						flags);
- 	if (!xhci->event_ring)
- 		goto fail;
- 	if (xhci_check_trb_in_td_math(xhci, flags) < 0)
-diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
-index cb16de2..50e7156 100644
---- a/drivers/usb/host/xhci-pci.c
-+++ b/drivers/usb/host/xhci-pci.c
-@@ -128,6 +128,9 @@ static int xhci_pci_setup(struct usb_hcd *hcd)
- 	if (pdev->vendor == PCI_VENDOR_ID_NEC)
- 		xhci->quirks |= XHCI_NEC_HOST;
- 
-+	if (pdev->vendor == PCI_VENDOR_ID_AMD && xhci->hci_version == 0x96)
-+		xhci->quirks |= XHCI_AMD_0x96_HOST;
-+
- 	/* AMD PLL quirk */
- 	if (pdev->vendor == PCI_VENDOR_ID_AMD && usb_amd_find_chipset_info())
- 		xhci->quirks |= XHCI_AMD_PLL_FIX;
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index d0871ea..b20d2f7 100644
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -187,7 +187,7 @@ static void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring, bool consumer
-  *			prepare_transfer()?
-  */
- static void inc_enq(struct xhci_hcd *xhci, struct xhci_ring *ring,
--		bool consumer, bool more_trbs_coming)
-+		bool consumer, bool more_trbs_coming, bool isoc)
- {
- 	u32 chain;
- 	union xhci_trb *next;
-@@ -214,11 +214,13 @@ static void inc_enq(struct xhci_hcd *xhci, struct xhci_ring *ring,
- 				if (!chain && !more_trbs_coming)
- 					break;
- 
--				/* If we're not dealing with 0.95 hardware,
-+				/* If we're not dealing with 0.95 hardware or
-+				 * isoc rings on AMD 0.96 host,
- 				 * carry over the chain bit of the previous TRB
- 				 * (which may mean the chain bit is cleared).
- 				 */
--				if (!xhci_link_trb_quirk(xhci)) {
-+				if (!(isoc && (xhci->quirks & XHCI_AMD_0x96_HOST))
-+						&& !xhci_link_trb_quirk(xhci)) {
- 					next->link.control &=
- 						cpu_to_le32(~TRB_CHAIN);
- 					next->link.control |=
-@@ -1345,10 +1347,8 @@ static void handle_port_status(struct xhci_hcd *xhci,
- 			xhci_ring_device(xhci, slot_id);
- 			xhci_dbg(xhci, "resume SS port %d finished\n", port_id);
- 			/* Clear PORT_PLC */
--			temp = xhci_readl(xhci, port_array[faked_port_index]);
--			temp = xhci_port_state_to_neutral(temp);
--			temp |= PORT_PLC;
--			xhci_writel(xhci, temp, port_array[faked_port_index]);
-+			xhci_test_and_clear_bit(xhci, port_array,
-+						faked_port_index, PORT_PLC);
- 		} else {
- 			xhci_dbg(xhci, "resume HS port %d\n", port_id);
- 			bus_state->resume_done[faked_port_index] = jiffies +
-@@ -1359,6 +1359,10 @@ static void handle_port_status(struct xhci_hcd *xhci,
- 		}
- 	}
- 
-+	if (hcd->speed != HCD_USB3)
-+		xhci_test_and_clear_bit(xhci, port_array, faked_port_index,
-+					PORT_PLC);
-+
- cleanup:
- 	/* Update event ring dequeue pointer before dropping the lock */
- 	inc_deq(xhci, xhci->event_ring, true);
-@@ -1940,8 +1944,10 @@ static int handle_tx_event(struct xhci_hcd *xhci,
- 	int status = -EINPROGRESS;
- 	struct urb_priv *urb_priv;
- 	struct xhci_ep_ctx *ep_ctx;
-+	struct list_head *tmp;
- 	u32 trb_comp_code;
- 	int ret = 0;
-+	int td_num = 0;
- 
- 	slot_id = TRB_TO_SLOT_ID(le32_to_cpu(event->flags));
- 	xdev = xhci->devs[slot_id];
-@@ -1963,6 +1969,12 @@ static int handle_tx_event(struct xhci_hcd *xhci,
- 		return -ENODEV;
- 	}
- 
-+	/* Count current td numbers if ep->skip is set */
-+	if (ep->skip) {
-+		list_for_each(tmp, &ep_ring->td_list)
-+			td_num++;
-+	}
-+
- 	event_dma = le64_to_cpu(event->buffer);
- 	trb_comp_code = GET_COMP_CODE(le32_to_cpu(event->transfer_len));
- 	/* Look for common error cases */
-@@ -2074,7 +2086,18 @@ static int handle_tx_event(struct xhci_hcd *xhci,
- 			goto cleanup;
- 		}
- 
-+		/* We've skipped all the TDs on the ep ring when ep->skip set */
-+		if (ep->skip && td_num == 0) {
-+			ep->skip = false;
-+			xhci_dbg(xhci, "All tds on the ep_ring skipped. "
-+						"Clear skip flag.\n");
-+			ret = 0;
-+			goto cleanup;
-+		}
-+
- 		td = list_entry(ep_ring->td_list.next, struct xhci_td, td_list);
-+		if (ep->skip)
-+			td_num--;
- 
- 		/* Is this a TRB in the currently executing TD? */
- 		event_seg = trb_in_td(ep_ring->deq_seg, ep_ring->dequeue,
-@@ -2398,7 +2421,7 @@ irqreturn_t xhci_msi_irq(int irq, struct usb_hcd *hcd)
-  *			prepare_transfer()?
-  */
- static void queue_trb(struct xhci_hcd *xhci, struct xhci_ring *ring,
--		bool consumer, bool more_trbs_coming,
-+		bool consumer, bool more_trbs_coming, bool isoc,
- 		u32 field1, u32 field2, u32 field3, u32 field4)
- {
- 	struct xhci_generic_trb *trb;
-@@ -2408,7 +2431,7 @@ static void queue_trb(struct xhci_hcd *xhci, struct xhci_ring *ring,
- 	trb->field[1] = cpu_to_le32(field2);
- 	trb->field[2] = cpu_to_le32(field3);
- 	trb->field[3] = cpu_to_le32(field4);
--	inc_enq(xhci, ring, consumer, more_trbs_coming);
-+	inc_enq(xhci, ring, consumer, more_trbs_coming, isoc);
- }
- 
- /*
-@@ -2416,7 +2439,7 @@ static void queue_trb(struct xhci_hcd *xhci, struct xhci_ring *ring,
-  * FIXME allocate segments if the ring is full.
-  */
- static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring,
--		u32 ep_state, unsigned int num_trbs, gfp_t mem_flags)
-+		u32 ep_state, unsigned int num_trbs, bool isoc, gfp_t mem_flags)
- {
- 	/* Make sure the endpoint has been added to xHC schedule */
- 	switch (ep_state) {
-@@ -2458,10 +2481,11 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring,
- 		next = ring->enqueue;
- 
- 		while (last_trb(xhci, ring, ring->enq_seg, next)) {
--			/* If we're not dealing with 0.95 hardware,
--			 * clear the chain bit.
-+			/* If we're not dealing with 0.95 hardware or isoc rings
-+			 * on AMD 0.96 host, clear the chain bit.
- 			 */
--			if (!xhci_link_trb_quirk(xhci))
-+			if (!xhci_link_trb_quirk(xhci) && !(isoc &&
-+					(xhci->quirks & XHCI_AMD_0x96_HOST)))
- 				next->link.control &= cpu_to_le32(~TRB_CHAIN);
- 			else
- 				next->link.control |= cpu_to_le32(TRB_CHAIN);
-@@ -2494,6 +2518,7 @@ static int prepare_transfer(struct xhci_hcd *xhci,
- 		unsigned int num_trbs,
- 		struct urb *urb,
- 		unsigned int td_index,
-+		bool isoc,
- 		gfp_t mem_flags)
- {
- 	int ret;
-@@ -2511,7 +2536,7 @@ static int prepare_transfer(struct xhci_hcd *xhci,
- 
- 	ret = prepare_ring(xhci, ep_ring,
- 			   le32_to_cpu(ep_ctx->ep_info) & EP_STATE_MASK,
--			   num_trbs, mem_flags);
-+			   num_trbs, isoc, mem_flags);
- 	if (ret)
- 		return ret;
- 
-@@ -2734,7 +2759,7 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 
- 	trb_buff_len = prepare_transfer(xhci, xhci->devs[slot_id],
- 			ep_index, urb->stream_id,
--			num_trbs, urb, 0, mem_flags);
-+			num_trbs, urb, 0, false, mem_flags);
- 	if (trb_buff_len < 0)
- 		return trb_buff_len;
- 
-@@ -2829,7 +2854,7 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 			more_trbs_coming = true;
- 		else
- 			more_trbs_coming = false;
--		queue_trb(xhci, ep_ring, false, more_trbs_coming,
-+		queue_trb(xhci, ep_ring, false, more_trbs_coming, false,
- 				lower_32_bits(addr),
- 				upper_32_bits(addr),
- 				length_field,
-@@ -2920,7 +2945,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 
- 	ret = prepare_transfer(xhci, xhci->devs[slot_id],
- 			ep_index, urb->stream_id,
--			num_trbs, urb, 0, mem_flags);
-+			num_trbs, urb, 0, false, mem_flags);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -2992,7 +3017,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 			more_trbs_coming = true;
- 		else
- 			more_trbs_coming = false;
--		queue_trb(xhci, ep_ring, false, more_trbs_coming,
-+		queue_trb(xhci, ep_ring, false, more_trbs_coming, false,
- 				lower_32_bits(addr),
- 				upper_32_bits(addr),
- 				length_field,
-@@ -3052,7 +3077,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 		num_trbs++;
- 	ret = prepare_transfer(xhci, xhci->devs[slot_id],
- 			ep_index, urb->stream_id,
--			num_trbs, urb, 0, mem_flags);
-+			num_trbs, urb, 0, false, mem_flags);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -3085,7 +3110,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 		}
- 	}
- 
--	queue_trb(xhci, ep_ring, false, true,
-+	queue_trb(xhci, ep_ring, false, true, false,
- 		  setup->bRequestType | setup->bRequest << 8 | le16_to_cpu(setup->wValue) << 16,
- 		  le16_to_cpu(setup->wIndex) | le16_to_cpu(setup->wLength) << 16,
- 		  TRB_LEN(8) | TRB_INTR_TARGET(0),
-@@ -3105,7 +3130,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 	if (urb->transfer_buffer_length > 0) {
- 		if (setup->bRequestType & USB_DIR_IN)
- 			field |= TRB_DIR_IN;
--		queue_trb(xhci, ep_ring, false, true,
-+		queue_trb(xhci, ep_ring, false, true, false,
- 				lower_32_bits(urb->transfer_dma),
- 				upper_32_bits(urb->transfer_dma),
- 				length_field,
-@@ -3121,7 +3146,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 		field = 0;
- 	else
- 		field = TRB_DIR_IN;
--	queue_trb(xhci, ep_ring, false, false,
-+	queue_trb(xhci, ep_ring, false, false, false,
- 			0,
- 			0,
- 			TRB_INTR_TARGET(0),
-@@ -3270,7 +3295,8 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 		trbs_per_td = count_isoc_trbs_needed(xhci, urb, i);
- 
- 		ret = prepare_transfer(xhci, xhci->devs[slot_id], ep_index,
--				urb->stream_id, trbs_per_td, urb, i, mem_flags);
-+				urb->stream_id, trbs_per_td, urb, i, true,
-+				mem_flags);
- 		if (ret < 0) {
- 			if (i == 0)
- 				return ret;
-@@ -3340,7 +3366,7 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 				remainder |
- 				TRB_INTR_TARGET(0);
- 
--			queue_trb(xhci, ep_ring, false, more_trbs_coming,
-+			queue_trb(xhci, ep_ring, false, more_trbs_coming, true,
- 				lower_32_bits(addr),
- 				upper_32_bits(addr),
- 				length_field,
-@@ -3422,7 +3448,7 @@ int xhci_queue_isoc_tx_prepare(struct xhci_hcd *xhci, gfp_t mem_flags,
- 	 * Do not insert any td of the urb to the ring if the check failed.
- 	 */
- 	ret = prepare_ring(xhci, ep_ring, le32_to_cpu(ep_ctx->ep_info) & EP_STATE_MASK,
--			   num_trbs, mem_flags);
-+			   num_trbs, true, mem_flags);
- 	if (ret)
- 		return ret;
- 
-@@ -3481,7 +3507,7 @@ static int queue_command(struct xhci_hcd *xhci, u32 field1, u32 field2,
- 		reserved_trbs++;
- 
- 	ret = prepare_ring(xhci, xhci->cmd_ring, EP_STATE_RUNNING,
--			reserved_trbs, GFP_ATOMIC);
-+			reserved_trbs, false, GFP_ATOMIC);
- 	if (ret < 0) {
- 		xhci_err(xhci, "ERR: No room for command on command ring\n");
- 		if (command_must_succeed)
-@@ -3489,8 +3515,8 @@ static int queue_command(struct xhci_hcd *xhci, u32 field1, u32 field2,
- 					"unfailable commands failed.\n");
- 		return ret;
- 	}
--	queue_trb(xhci, xhci->cmd_ring, false, false, field1, field2, field3,
--			field4 | xhci->cmd_ring->cycle_state);
-+	queue_trb(xhci, xhci->cmd_ring, false, false, false, field1, field2,
-+			field3,	field4 | xhci->cmd_ring->cycle_state);
- 	return 0;
- }
- 
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 7ea48b3..fb61e9d 100644
---- a/drivers/usb/host/xhci.c
-+++ b/drivers/usb/host/xhci.c
-@@ -1889,6 +1889,12 @@ int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
- 	ctrl_ctx->add_flags |= cpu_to_le32(SLOT_FLAG);
- 	ctrl_ctx->add_flags &= cpu_to_le32(~EP0_FLAG);
- 	ctrl_ctx->drop_flags &= cpu_to_le32(~(SLOT_FLAG | EP0_FLAG));
-+
-+	/* Don't issue the command if there's no endpoints to update. */
-+	if (ctrl_ctx->add_flags == cpu_to_le32(SLOT_FLAG) &&
-+			ctrl_ctx->drop_flags == 0)
-+		return 0;
-+
- 	xhci_dbg(xhci, "New Input Control Context:\n");
- 	slot_ctx = xhci_get_slot_ctx(xhci, virt_dev->in_ctx);
- 	xhci_dbg_ctx(xhci, virt_dev->in_ctx,
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index d8bbf5c..49ce76c 100644
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -1311,6 +1311,7 @@ struct xhci_hcd {
- #define XHCI_EP_LIMIT_QUIRK	(1 << 5)
- #define XHCI_BROKEN_MSI		(1 << 6)
- #define XHCI_RESET_ON_RESUME	(1 << 7)
-+#define XHCI_AMD_0x96_HOST	(1 << 9)
- 	unsigned int		num_active_eps;
- 	unsigned int		limit_active_eps;
- 	/* There are two roothubs to keep track of bus suspend info for */
-@@ -1565,6 +1566,8 @@ void xhci_ring_ep_doorbell(struct xhci_hcd *xhci, unsigned int slot_id,
- 		unsigned int ep_index, unsigned int stream_id);
- 
- /* xHCI roothub code */
-+void xhci_test_and_clear_bit(struct xhci_hcd *xhci, __le32 __iomem **port_array,
-+				int port_id, u32 port_bit);
- int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex,
- 		char *buf, u16 wLength);
- int xhci_hub_status_data(struct usb_hcd *hcd, char *buf);
-diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
-index a09dbd2..a04b2ff 100644
---- a/drivers/usb/mon/mon_bin.c
-+++ b/drivers/usb/mon/mon_bin.c
-@@ -1101,7 +1101,7 @@ static long mon_bin_ioctl(struct file *file, unsigned int cmd, unsigned long arg
- 		nevents = mon_bin_queued(rp);
- 
- 		sp = (struct mon_bin_stats __user *)arg;
--		if (put_user(rp->cnt_lost, &sp->dropped))
-+		if (put_user(ndropped, &sp->dropped))
- 			return -EFAULT;
- 		if (put_user(nevents, &sp->queued))
- 			return -EFAULT;
-diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
-index f968a3d..1b51d43 100644
---- a/drivers/usb/serial/ftdi_sio.c
-+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -156,6 +156,7 @@ static struct ftdi_sio_quirk ftdi_8u2232c_quirk = {
-  * /sys/bus/usb/ftdi_sio/new_id, then send patch/report!
-  */
- static struct usb_device_id id_table_combined [] = {
-+	{ USB_DEVICE(FTDI_VID, FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_CTI_MINI_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_CTI_NANO_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },
-@@ -206,6 +207,8 @@ static struct usb_device_id id_table_combined [] = {
- 	{ USB_DEVICE(FTDI_VID, FTDI_XF_640_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_XF_642_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_DSS20_PID) },
-+	{ USB_DEVICE(FTDI_VID, FTDI_URBAN_0_PID) },
-+	{ USB_DEVICE(FTDI_VID, FTDI_URBAN_1_PID) },
- 	{ USB_DEVICE(FTDI_NF_RIC_VID, FTDI_NF_RIC_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_VNHCPCUSB_D_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_MTXORB_0_PID) },
-@@ -744,6 +747,8 @@ static struct usb_device_id id_table_combined [] = {
- 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
- 	{ USB_DEVICE(FTDI_VID, LMI_LM3S_EVAL_BOARD_PID),
- 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
-+	{ USB_DEVICE(FTDI_VID, LMI_LM3S_ICDI_BOARD_PID),
-+		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
- 	{ USB_DEVICE(FTDI_VID, FTDI_TURTELIZER_PID),
- 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
- 	{ USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },
-diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
-index 19156d1..571fa96 100644
---- a/drivers/usb/serial/ftdi_sio_ids.h
-+++ b/drivers/usb/serial/ftdi_sio_ids.h
-@@ -54,6 +54,7 @@
- /* FTDI 2332C Dual channel device, side A=245 FIFO (JTAG), Side B=RS232 UART */
- #define LMI_LM3S_DEVEL_BOARD_PID	0xbcd8
- #define LMI_LM3S_EVAL_BOARD_PID		0xbcd9
-+#define LMI_LM3S_ICDI_BOARD_PID		0xbcda
- 
- #define FTDI_TURTELIZER_PID	0xBDC8 /* JTAG/RS-232 adapter by egnite GmbH */
- 
-@@ -420,9 +421,11 @@
- #define PROTEGO_SPECIAL_4	0xFC73	/* special/unknown device */
- 
- /*
-- * DSS-20 Sync Station for Sony Ericsson P800
-+ * Sony Ericsson product ids
-  */
--#define FTDI_DSS20_PID          0xFC82
-+#define FTDI_DSS20_PID		0xFC82	/* DSS-20 Sync Station for Sony Ericsson P800 */
-+#define FTDI_URBAN_0_PID	0xFC8A	/* Sony Ericsson Urban, uart #0 */
-+#define FTDI_URBAN_1_PID	0xFC8B	/* Sony Ericsson Urban, uart #1 */
- 
- /* www.irtrans.de device */
- #define FTDI_IRTRANS_PID 0xFC60 /* Product Id */
-@@ -1159,4 +1162,8 @@
- /* USB-Nano-485*/
- #define FTDI_CTI_NANO_PID	0xF60B
- 
--
-+/*
-+ * ZeitControl cardsystems GmbH rfid-readers http://zeitconrol.de
-+ */
-+/* TagTracer MIFARE*/
-+#define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID	0xF7C0
-diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index fe22e90..89ae1f6 100644
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -475,31 +475,54 @@ enum option_blacklist_reason {
- 		OPTION_BLACKLIST_RESERVED_IF = 2
- };
- 
-+#define MAX_BL_NUM  8
- struct option_blacklist_info {
--	const u32 infolen;	/* number of interface numbers on blacklist */
--	const u8  *ifaceinfo;	/* pointer to the array holding the numbers */
--	enum option_blacklist_reason reason;
-+	/* bitfield of interface numbers for OPTION_BLACKLIST_SENDSETUP */
-+	const unsigned long sendsetup;
-+	/* bitfield of interface numbers for OPTION_BLACKLIST_RESERVED_IF */
-+	const unsigned long reserved;
- };
- 
--static const u8 four_g_w14_no_sendsetup[] = { 0, 1 };
- static const struct option_blacklist_info four_g_w14_blacklist = {
--	.infolen = ARRAY_SIZE(four_g_w14_no_sendsetup),
--	.ifaceinfo = four_g_w14_no_sendsetup,
--	.reason = OPTION_BLACKLIST_SENDSETUP
-+	.sendsetup = BIT(0) | BIT(1),
- };
- 
--static const u8 alcatel_x200_no_sendsetup[] = { 0, 1 };
- static const struct option_blacklist_info alcatel_x200_blacklist = {
--	.infolen = ARRAY_SIZE(alcatel_x200_no_sendsetup),
--	.ifaceinfo = alcatel_x200_no_sendsetup,
--	.reason = OPTION_BLACKLIST_SENDSETUP
-+	.sendsetup = BIT(0) | BIT(1),
-+};
-+
-+static const struct option_blacklist_info zte_0037_blacklist = {
-+	.sendsetup = BIT(0) | BIT(1),
- };
- 
--static const u8 zte_k3765_z_no_sendsetup[] = { 0, 1, 2 };
- static const struct option_blacklist_info zte_k3765_z_blacklist = {
--	.infolen = ARRAY_SIZE(zte_k3765_z_no_sendsetup),
--	.ifaceinfo = zte_k3765_z_no_sendsetup,
--	.reason = OPTION_BLACKLIST_SENDSETUP
-+	.sendsetup = BIT(0) | BIT(1) | BIT(2),
-+	.reserved = BIT(4),
-+};
-+
-+static const struct option_blacklist_info huawei_cdc12_blacklist = {
-+	.reserved = BIT(1) | BIT(2),
-+};
-+
-+static const struct option_blacklist_info net_intf1_blacklist = {
-+	.reserved = BIT(1),
-+};
-+
-+static const struct option_blacklist_info net_intf3_blacklist = {
-+	.reserved = BIT(3),
-+};
-+
-+static const struct option_blacklist_info net_intf4_blacklist = {
-+	.reserved = BIT(4),
-+};
-+
-+static const struct option_blacklist_info net_intf5_blacklist = {
-+	.reserved = BIT(5),
-+};
-+
-+static const struct option_blacklist_info zte_mf626_blacklist = {
-+	.sendsetup = BIT(0) | BIT(1),
-+	.reserved = BIT(4),
- };
- 
- static const struct usb_device_id option_ids[] = {
-@@ -599,12 +622,15 @@ static const struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3806, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x31) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x32) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x31) },
-@@ -705,7 +731,8 @@ static const struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) },
- 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864G) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf1_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0003, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0004, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0005, 0xff, 0xff, 0xff) },
-@@ -720,51 +747,62 @@ static const struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000f, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0010, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0011, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0012, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0012, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf1_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0013, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0014, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0016, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf3_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0018, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0019, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0020, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0021, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0021, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0022, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0023, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0024, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0025, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0025, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf1_blacklist },
- 	/* { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0026, 0xff, 0xff, 0xff) }, */
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0028, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0029, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0030, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff,
--	  0xff, 0xff), .driver_info = (kernel_ulong_t)&four_g_w14_blacklist },
-+	  0xff, 0xff), .driver_info = (kernel_ulong_t)&zte_mf626_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0034, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&zte_0037_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0038, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0039, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0040, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0042, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0042, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0043, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0044, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0048, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0049, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0049, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf5_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0050, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0051, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0052, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0052, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
- 	/* { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0053, 0xff, 0xff, 0xff) }, */
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0054, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0055, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0055, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf1_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0056, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0057, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0058, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0058, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0059, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0061, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0062, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0063, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0063, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0064, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0065, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0066, 0xff, 0xff, 0xff) },
-@@ -779,11 +817,13 @@ static const struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0083, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0086, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0087, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0104, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0104, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0105, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0106, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0108, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0113, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0113, 0xff, 0xff, 0xff),
-+		.driver_info = (kernel_ulong_t)&net_intf5_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0117, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0118, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0121, 0xff, 0xff, 0xff) },
-@@ -1214,10 +1254,35 @@ static void __exit option_exit(void)
- module_init(option_init);
- module_exit(option_exit);
- 
-+static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason,
-+			   const struct option_blacklist_info *blacklist)
-+{
-+	unsigned long num;
-+	const unsigned long *intf_list;
-+
-+	if (blacklist) {
-+		if (reason == OPTION_BLACKLIST_SENDSETUP)
-+			intf_list = &blacklist->sendsetup;
-+		else if (reason == OPTION_BLACKLIST_RESERVED_IF)
-+			intf_list = &blacklist->reserved;
-+		else {
-+			BUG_ON(reason);
-+			return false;
-+		}
-+
-+		for_each_set_bit(num, intf_list, MAX_BL_NUM + 1) {
-+			if (num == ifnum)
-+				return true;
-+		}
-+	}
-+	return false;
-+}
-+
- static int option_probe(struct usb_serial *serial,
- 			const struct usb_device_id *id)
- {
- 	struct usb_wwan_intf_private *data;
-+
- 	/* D-Link DWM 652 still exposes CD-Rom emulation interface in modem mode */
- 	if (serial->dev->descriptor.idVendor == DLINK_VENDOR_ID &&
- 		serial->dev->descriptor.idProduct == DLINK_PRODUCT_DWM_652 &&
-@@ -1230,14 +1295,14 @@ static int option_probe(struct usb_serial *serial,
- 		serial->interface->cur_altsetting->desc.bInterfaceClass != 0xff)
- 		return -ENODEV;
- 
--	/* Don't bind network interfaces on Huawei K3765, K4505 & K4605 */
--	if (serial->dev->descriptor.idVendor == HUAWEI_VENDOR_ID &&
--		(serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K3765 ||
--			serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4505 ||
--			serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4605) &&
--		(serial->interface->cur_altsetting->desc.bInterfaceNumber == 1 ||
--			serial->interface->cur_altsetting->desc.bInterfaceNumber == 2))
--		return -ENODEV;
-+	/* Don't bind reserved interfaces (like network ones) which often have
-+	 * the same class/subclass/protocol as the serial interfaces.  Look at
-+	 * the Windows driver .INF files for reserved interface numbers.
-+	 */
-+	if (is_blacklisted(
-+		serial->interface->cur_altsetting->desc.bInterfaceNumber,
-+		OPTION_BLACKLIST_RESERVED_IF,
-+		(const struct option_blacklist_info *) id->driver_info))
- 
- 	/* Don't bind network interface on Samsung GT-B3730, it is handled by a separate module */
- 	if (serial->dev->descriptor.idVendor == SAMSUNG_VENDOR_ID &&
-@@ -1246,7 +1311,6 @@ static int option_probe(struct usb_serial *serial,
- 		return -ENODEV;
- 
- 	data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL);
--
- 	if (!data)
- 		return -ENOMEM;
- 	data->send_setup = option_send_setup;
-@@ -1255,23 +1319,6 @@ static int option_probe(struct usb_serial *serial,
- 	return 0;
- }
- 
--static enum option_blacklist_reason is_blacklisted(const u8 ifnum,
--				const struct option_blacklist_info *blacklist)
--{
--	const u8  *info;
--	int i;
--
--	if (blacklist) {
--		info = blacklist->ifaceinfo;
--
--		for (i = 0; i < blacklist->infolen; i++) {
--			if (info[i] == ifnum)
--				return blacklist->reason;
--		}
--	}
--	return OPTION_BLACKLIST_NONE;
--}
--
- static void option_instat_callback(struct urb *urb)
- {
- 	int err;
-@@ -1343,9 +1390,8 @@ static int option_send_setup(struct usb_serial_port *port)
- 	int val = 0;
- 	dbg("%s", __func__);
- 
--	if (is_blacklisted(ifNum,
--			   (struct option_blacklist_info *) intfdata->private)
--	    == OPTION_BLACKLIST_SENDSETUP) {
-+	if (is_blacklisted(ifNum, OPTION_BLACKLIST_SENDSETUP,
-+			(struct option_blacklist_info *) intfdata->private)) {
- 		dbg("No send_setup on blacklisted interface #%d\n", ifNum);
- 		return -EIO;
- 	}
-diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
-index 1d33260..614fabc 100644
---- a/drivers/usb/serial/pl2303.c
-+++ b/drivers/usb/serial/pl2303.c
-@@ -92,6 +92,7 @@ static const struct usb_device_id id_table[] = {
- 	{ USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) },
- 	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) },
- 	{ USB_DEVICE(WINCHIPHEAD_VENDOR_ID, WINCHIPHEAD_USBSER_PRODUCT_ID) },
-+	{ USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },
- 	{ }					/* Terminating entry */
- };
- 
-diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
-index ca0d237..3d10d7f 100644
---- a/drivers/usb/serial/pl2303.h
-+++ b/drivers/usb/serial/pl2303.h
-@@ -148,3 +148,8 @@
- /* WinChipHead USB->RS 232 adapter */
- #define WINCHIPHEAD_VENDOR_ID		0x4348
- #define WINCHIPHEAD_USBSER_PRODUCT_ID	0x5523
-+
-+/* SMART USB Serial Adapter */
-+#define SMART_VENDOR_ID	0x0b8c
-+#define SMART_PRODUCT_ID	0x2303
-+
-diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
-index 27f9ae4..b9bb247 100644
---- a/drivers/usb/serial/qcserial.c
-+++ b/drivers/usb/serial/qcserial.c
-@@ -28,6 +28,7 @@ static const struct usb_device_id id_table[] = {
- 	{USB_DEVICE(0x05c6, 0x9212)},	/* Acer Gobi Modem Device */
- 	{USB_DEVICE(0x03f0, 0x1f1d)},	/* HP un2400 Gobi Modem Device */
- 	{USB_DEVICE(0x03f0, 0x201d)},	/* HP un2400 Gobi QDL Device */
-+	{USB_DEVICE(0x03f0, 0x371d)},	/* HP un2430 Mobile Broadband Module */
- 	{USB_DEVICE(0x04da, 0x250d)},	/* Panasonic Gobi Modem device */
- 	{USB_DEVICE(0x04da, 0x250c)},	/* Panasonic Gobi QDL device */
- 	{USB_DEVICE(0x413c, 0x8172)},	/* Dell Gobi Modem device */
-@@ -79,10 +80,12 @@ static const struct usb_device_id id_table[] = {
- 	{USB_DEVICE(0x1199, 0x9008)},	/* Sierra Wireless Gobi 2000 Modem device (VT773) */
- 	{USB_DEVICE(0x1199, 0x9009)},	/* Sierra Wireless Gobi 2000 Modem device (VT773) */
- 	{USB_DEVICE(0x1199, 0x900a)},	/* Sierra Wireless Gobi 2000 Modem device (VT773) */
-+	{USB_DEVICE(0x1199, 0x9011)},   /* Sierra Wireless Gobi 2000 Modem device (MC8305) */
- 	{USB_DEVICE(0x16d8, 0x8001)},	/* CMDTech Gobi 2000 QDL device (VU922) */
- 	{USB_DEVICE(0x16d8, 0x8002)},	/* CMDTech Gobi 2000 Modem device (VU922) */
- 	{USB_DEVICE(0x05c6, 0x9204)},	/* Gobi 2000 QDL device */
- 	{USB_DEVICE(0x05c6, 0x9205)},	/* Gobi 2000 Modem device */
-+	{USB_DEVICE(0x1199, 0x9013)},	/* Sierra Wireless Gobi 3000 Modem device (MC8355) */
- 	{ }				/* Terminating entry */
- };
- MODULE_DEVICE_TABLE(usb, id_table);
-diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
-index e8ae21b..ff32390 100644
---- a/drivers/usb/storage/transport.c
-+++ b/drivers/usb/storage/transport.c
-@@ -691,6 +691,9 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
- 		int temp_result;
- 		struct scsi_eh_save ses;
- 		int sense_size = US_SENSE_SIZE;
-+		struct scsi_sense_hdr sshdr;
-+		const u8 *scdd;
-+		u8 fm_ili;
- 
- 		/* device supports and needs bigger sense buffer */
- 		if (us->fflags & US_FL_SANE_SENSE)
-@@ -774,32 +777,30 @@ Retry_Sense:
- 			srb->sense_buffer[7] = (US_SENSE_SIZE - 8);
- 		}
- 
-+		scsi_normalize_sense(srb->sense_buffer, SCSI_SENSE_BUFFERSIZE,
-+				     &sshdr);
-+
- 		US_DEBUGP("-- Result from auto-sense is %d\n", temp_result);
- 		US_DEBUGP("-- code: 0x%x, key: 0x%x, ASC: 0x%x, ASCQ: 0x%x\n",
--			  srb->sense_buffer[0],
--			  srb->sense_buffer[2] & 0xf,
--			  srb->sense_buffer[12], 
--			  srb->sense_buffer[13]);
-+			  sshdr.response_code, sshdr.sense_key,
-+			  sshdr.asc, sshdr.ascq);
- #ifdef CONFIG_USB_STORAGE_DEBUG
--		usb_stor_show_sense(
--			  srb->sense_buffer[2] & 0xf,
--			  srb->sense_buffer[12], 
--			  srb->sense_buffer[13]);
-+		usb_stor_show_sense(sshdr.sense_key, sshdr.asc, sshdr.ascq);
- #endif
- 
- 		/* set the result so the higher layers expect this data */
- 		srb->result = SAM_STAT_CHECK_CONDITION;
- 
-+		scdd = scsi_sense_desc_find(srb->sense_buffer,
-+					    SCSI_SENSE_BUFFERSIZE, 4);
-+		fm_ili = (scdd ? scdd[3] : srb->sense_buffer[2]) & 0xA0;
-+
- 		/* We often get empty sense data.  This could indicate that
- 		 * everything worked or that there was an unspecified
- 		 * problem.  We have to decide which.
- 		 */
--		if (	/* Filemark 0, ignore EOM, ILI 0, no sense */
--				(srb->sense_buffer[2] & 0xaf) == 0 &&
--			/* No ASC or ASCQ */
--				srb->sense_buffer[12] == 0 &&
--				srb->sense_buffer[13] == 0) {
--
-+		if (sshdr.sense_key == 0 && sshdr.asc == 0 && sshdr.ascq == 0 &&
-+		    fm_ili == 0) {
- 			/* If things are really okay, then let's show that.
- 			 * Zero out the sense buffer so the higher layers
- 			 * won't realize we did an unsolicited auto-sense.
-@@ -814,7 +815,10 @@ Retry_Sense:
- 			 */
- 			} else {
- 				srb->result = DID_ERROR << 16;
--				srb->sense_buffer[2] = HARDWARE_ERROR;
-+				if ((sshdr.response_code & 0x72) == 0x72)
-+					srb->sense_buffer[1] = HARDWARE_ERROR;
-+				else
-+					srb->sense_buffer[2] = HARDWARE_ERROR;
- 			}
- 		}
- 	}
-diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
-index 0ca0958..c325e69 100644
---- a/drivers/usb/storage/usb.c
-+++ b/drivers/usb/storage/usb.c
-@@ -831,12 +831,22 @@ static int usb_stor_scan_thread(void * __us)
- 
- 	dev_dbg(dev, "device found\n");
- 
--	set_freezable();
--	/* Wait for the timeout to expire or for a disconnect */
-+	set_freezable_with_signal();
-+	/*
-+	 * Wait for the timeout to expire or for a disconnect
-+	 *
-+	 * We can't freeze in this thread or we risk causing khubd to
-+	 * fail to freeze, but we can't be non-freezable either. Nor can
-+	 * khubd freeze while waiting for scanning to complete as it may
-+	 * hold the device lock, causing a hang when suspending devices.
-+	 * So we request a fake signal when freezing and use
-+	 * interruptible sleep to kick us out of our wait early when
-+	 * freezing happens.
-+	 */
- 	if (delay_use > 0) {
- 		dev_dbg(dev, "waiting for device to settle "
- 				"before scanning\n");
--		wait_event_freezable_timeout(us->delay_wait,
-+		wait_event_interruptible_timeout(us->delay_wait,
- 				test_bit(US_FLIDX_DONT_SCAN, &us->dflags),
- 				delay_use * HZ);
- 	}
-diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c
-index caaa27d..cb09aa1f 100644
---- a/drivers/video/carminefb.c
-+++ b/drivers/video/carminefb.c
-@@ -32,11 +32,11 @@
- #define CARMINEFB_DEFAULT_VIDEO_MODE	1
- 
- static unsigned int fb_mode = CARMINEFB_DEFAULT_VIDEO_MODE;
--module_param(fb_mode, uint, 444);
-+module_param(fb_mode, uint, 0444);
- MODULE_PARM_DESC(fb_mode, "Initial video mode as integer.");
- 
- static char *fb_mode_str;
--module_param(fb_mode_str, charp, 444);
-+module_param(fb_mode_str, charp, 0444);
- MODULE_PARM_DESC(fb_mode_str, "Initial video mode in characters.");
- 
- /*
-@@ -46,7 +46,7 @@ MODULE_PARM_DESC(fb_mode_str, "Initial video mode in characters.");
-  * 0b010 Display 1
-  */
- static int fb_displays = CARMINE_USE_DISPLAY0 | CARMINE_USE_DISPLAY1;
--module_param(fb_displays, int, 444);
-+module_param(fb_displays, int, 0444);
- MODULE_PARM_DESC(fb_displays, "Bit mode, which displays are used");
- 
- struct carmine_hw {
-diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
-index 5aac00e..ad93629 100644
---- a/drivers/video/fbmem.c
-+++ b/drivers/video/fbmem.c
-@@ -1738,8 +1738,6 @@ void fb_set_suspend(struct fb_info *info, int state)
- {
- 	struct fb_event event;
- 
--	if (!lock_fb_info(info))
--		return;
- 	event.info = info;
- 	if (state) {
- 		fb_notifier_call_chain(FB_EVENT_SUSPEND, &event);
-@@ -1748,7 +1746,6 @@ void fb_set_suspend(struct fb_info *info, int state)
- 		info->state = FBINFO_STATE_RUNNING;
- 		fb_notifier_call_chain(FB_EVENT_RESUME, &event);
- 	}
--	unlock_fb_info(info);
- }
- 
- /**
-diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
-index 04251ce..67afa9c 100644
---- a/drivers/video/fbsysfs.c
-+++ b/drivers/video/fbsysfs.c
-@@ -399,9 +399,12 @@ static ssize_t store_fbstate(struct device *device,
- 
- 	state = simple_strtoul(buf, &last, 0);
- 
-+	if (!lock_fb_info(fb_info))
-+		return -ENODEV;
- 	console_lock();
- 	fb_set_suspend(fb_info, (int)state);
- 	console_unlock();
-+	unlock_fb_info(fb_info);
- 
- 	return count;
- }
-diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
-index 7d54e2c..647ba98 100644
---- a/drivers/video/sh_mobile_hdmi.c
-+++ b/drivers/video/sh_mobile_hdmi.c
-@@ -1111,6 +1111,7 @@ static long sh_hdmi_clk_configure(struct sh_hdmi *hdmi, unsigned long hdmi_rate,
- static void sh_hdmi_edid_work_fn(struct work_struct *work)
- {
- 	struct sh_hdmi *hdmi = container_of(work, struct sh_hdmi, edid_work.work);
-+	struct fb_info *info;
- 	struct sh_mobile_hdmi_info *pdata = hdmi->dev->platform_data;
- 	struct sh_mobile_lcdc_chan *ch;
- 	int ret;
-@@ -1123,8 +1124,9 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work)
- 
- 	mutex_lock(&hdmi->mutex);
- 
-+	info = hdmi->info;
-+
- 	if (hdmi->hp_state == HDMI_HOTPLUG_CONNECTED) {
--		struct fb_info *info = hdmi->info;
- 		unsigned long parent_rate = 0, hdmi_rate;
- 
- 		ret = sh_hdmi_read_edid(hdmi, &hdmi_rate, &parent_rate);
-@@ -1148,42 +1150,45 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work)
- 
- 		ch = info->par;
- 
--		console_lock();
-+		if (lock_fb_info(info)) {
-+			console_lock();
- 
--		/* HDMI plug in */
--		if (!sh_hdmi_must_reconfigure(hdmi) &&
--		    info->state == FBINFO_STATE_RUNNING) {
--			/*
--			 * First activation with the default monitor - just turn
--			 * on, if we run a resume here, the logo disappears
--			 */
--			if (lock_fb_info(info)) {
-+			/* HDMI plug in */
-+			if (!sh_hdmi_must_reconfigure(hdmi) &&
-+			    info->state == FBINFO_STATE_RUNNING) {
-+				/*
-+				 * First activation with the default monitor - just turn
-+				 * on, if we run a resume here, the logo disappears
-+				 */
- 				info->var.width = hdmi->var.width;
- 				info->var.height = hdmi->var.height;
- 				sh_hdmi_display_on(hdmi, info);
--				unlock_fb_info(info);
-+			} else {
-+				/* New monitor or have to wake up */
-+				fb_set_suspend(info, 0);
- 			}
--		} else {
--			/* New monitor or have to wake up */
--			fb_set_suspend(info, 0);
--		}
- 
--		console_unlock();
-+			console_unlock();
-+			unlock_fb_info(info);
-+		}
- 	} else {
- 		ret = 0;
--		if (!hdmi->info)
-+		if (!info)
- 			goto out;
- 
- 		hdmi->monspec.modedb_len = 0;
- 		fb_destroy_modedb(hdmi->monspec.modedb);
- 		hdmi->monspec.modedb = NULL;
- 
--		console_lock();
-+		if (lock_fb_info(info)) {
-+			console_lock();
- 
--		/* HDMI disconnect */
--		fb_set_suspend(hdmi->info, 1);
-+			/* HDMI disconnect */
-+			fb_set_suspend(info, 1);
- 
--		console_unlock();
-+			console_unlock();
-+			unlock_fb_info(info);
-+		}
- 	}
- 
- out:
-diff --git a/drivers/video/via/via_modesetting.h b/drivers/video/via/via_modesetting.h
-index ae35cfd..0138845 100644
---- a/drivers/video/via/via_modesetting.h
-+++ b/drivers/video/via/via_modesetting.h
-@@ -28,6 +28,11 @@
- 
- #include <linux/types.h>
- 
-+
-+#define VIA_PITCH_SIZE	(1<<3)
-+#define VIA_PITCH_MAX	0x3FF8
-+
-+
- void via_set_primary_address(u32 addr);
- void via_set_secondary_address(u32 addr);
- void via_set_primary_pitch(u32 pitch);
-diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
-index cf43c80..dd1276e 100644
---- a/drivers/video/via/viafbdev.c
-+++ b/drivers/video/via/viafbdev.c
-@@ -151,7 +151,8 @@ static void viafb_update_fix(struct fb_info *info)
- 
- 	info->fix.visual =
- 		bpp == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
--	info->fix.line_length = (info->var.xres_virtual * bpp / 8 + 7) & ~7;
-+	info->fix.line_length = ALIGN(info->var.xres_virtual * bpp / 8,
-+		VIA_PITCH_SIZE);
- }
- 
- static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix,
-@@ -238,8 +239,12 @@ static int viafb_check_var(struct fb_var_screeninfo *var,
- 		depth = 24;
- 
- 	viafb_fill_var_color_info(var, depth);
--	line = (var->xres_virtual * var->bits_per_pixel / 8 + 7) & ~7;
--	if (line * var->yres_virtual > ppar->memsize)
-+	if (var->xres_virtual < var->xres)
-+		var->xres_virtual = var->xres;
-+
-+	line = ALIGN(var->xres_virtual * var->bits_per_pixel / 8,
-+		VIA_PITCH_SIZE);
-+	if (line > VIA_PITCH_MAX || line * var->yres_virtual > ppar->memsize)
- 		return -EINVAL;
- 
- 	/* Based on var passed in to calculate the refresh,
-@@ -348,8 +353,9 @@ static int viafb_pan_display(struct fb_var_screeninfo *var,
- 	struct fb_info *info)
- {
- 	struct viafb_par *viapar = info->par;
--	u32 vram_addr = (var->yoffset * var->xres_virtual + var->xoffset)
--		* (var->bits_per_pixel / 8) + viapar->vram_addr;
-+	u32 vram_addr = viapar->vram_addr
-+		+ var->yoffset * info->fix.line_length
-+		+ var->xoffset * info->var.bits_per_pixel / 8;
- 
- 	DEBUG_MSG(KERN_DEBUG "viafb_pan_display, address = %d\n", vram_addr);
- 	if (!viafb_dual_fb) {
-diff --git a/drivers/w1/slaves/w1_ds2780.c b/drivers/w1/slaves/w1_ds2780.c
-index 274c8f3..505b17d 100644
---- a/drivers/w1/slaves/w1_ds2780.c
-+++ b/drivers/w1/slaves/w1_ds2780.c
-@@ -26,20 +26,14 @@
- #include "../w1_family.h"
- #include "w1_ds2780.h"
- 
--int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count,
--			int io)
-+static int w1_ds2780_do_io(struct device *dev, char *buf, int addr,
-+			size_t count, int io)
- {
- 	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
- 
--	if (!dev)
--		return -ENODEV;
-+	if (addr > DS2780_DATA_SIZE || addr < 0)
-+		return 0;
- 
--	mutex_lock(&sl->master->mutex);
--
--	if (addr > DS2780_DATA_SIZE || addr < 0) {
--		count = 0;
--		goto out;
--	}
- 	count = min_t(int, count, DS2780_DATA_SIZE - addr);
- 
- 	if (w1_reset_select_slave(sl) == 0) {
-@@ -47,7 +41,6 @@ int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count,
- 			w1_write_8(sl->master, W1_DS2780_WRITE_DATA);
- 			w1_write_8(sl->master, addr);
- 			w1_write_block(sl->master, buf, count);
--			/* XXX w1_write_block returns void, not n_written */
- 		} else {
- 			w1_write_8(sl->master, W1_DS2780_READ_DATA);
- 			w1_write_8(sl->master, addr);
-@@ -55,13 +48,42 @@ int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count,
- 		}
- 	}
- 
--out:
-+	return count;
-+}
-+
-+int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count,
-+			int io)
-+{
-+	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
-+	int ret;
-+
-+	if (!dev)
-+		return -ENODEV;
-+
-+	mutex_lock(&sl->master->mutex);
-+
-+	ret = w1_ds2780_do_io(dev, buf, addr, count, io);
-+
- 	mutex_unlock(&sl->master->mutex);
- 
--	return count;
-+	return ret;
- }
- EXPORT_SYMBOL(w1_ds2780_io);
- 
-+int w1_ds2780_io_nolock(struct device *dev, char *buf, int addr, size_t count,
-+			int io)
-+{
-+	int ret;
-+
-+	if (!dev)
-+		return -ENODEV;
-+
-+	ret = w1_ds2780_do_io(dev, buf, addr, count, io);
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(w1_ds2780_io_nolock);
-+
- int w1_ds2780_eeprom_cmd(struct device *dev, int addr, int cmd)
- {
- 	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
-diff --git a/drivers/w1/slaves/w1_ds2780.h b/drivers/w1/slaves/w1_ds2780.h
-index a1fba79..7373793 100644
---- a/drivers/w1/slaves/w1_ds2780.h
-+++ b/drivers/w1/slaves/w1_ds2780.h
-@@ -124,6 +124,8 @@
- 
- extern int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count,
- 			int io);
-+extern int w1_ds2780_io_nolock(struct device *dev, char *buf, int addr,
-+			size_t count, int io);
- extern int w1_ds2780_eeprom_cmd(struct device *dev, int addr, int cmd);
- 
- #endif /* !_W1_DS2780_H */
-diff --git a/drivers/xen/events.c b/drivers/xen/events.c
-index 30df85d..a5493f8 100644
---- a/drivers/xen/events.c
-+++ b/drivers/xen/events.c
-@@ -1026,7 +1026,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
- 	if (irq < 0)
- 		return irq;
- 
--	irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME;
-+	irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME | IRQF_EARLY_RESUME;
- 	retval = request_irq(irq, handler, irqflags, devname, dev_id);
- 	if (retval != 0) {
- 		unbind_from_irq(irq);
-diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
-index 6e8c15a..84f317e 100644
---- a/drivers/xen/swiotlb-xen.c
-+++ b/drivers/xen/swiotlb-xen.c
-@@ -278,9 +278,10 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
- 	/*
- 	 * Ensure that the address returned is DMA'ble
- 	 */
--	if (!dma_capable(dev, dev_addr, size))
--		panic("map_single: bounce buffer is not DMA'ble");
--
-+	if (!dma_capable(dev, dev_addr, size)) {
-+		swiotlb_tbl_unmap_single(dev, map, size, dir);
-+		dev_addr = 0;
-+	}
- 	return dev_addr;
- }
- EXPORT_SYMBOL_GPL(xen_swiotlb_map_page);
-diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 303983f..9ba2ac7 100644
---- a/fs/binfmt_elf.c
-+++ b/fs/binfmt_elf.c
-@@ -796,7 +796,16 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
- 			 * might try to exec.  This is because the brk will
- 			 * follow the loader, and is not movable.  */
- #if defined(CONFIG_X86) || defined(CONFIG_ARM)
--			load_bias = 0;
-+			/* Memory randomization might have been switched off
-+			 * in runtime via sysctl.
-+			 * If that is the case, retain the original non-zero
-+			 * load_bias value in order to establish proper
-+			 * non-randomized mappings.
-+			 */
-+			if (current->flags & PF_RANDOMIZE)
-+				load_bias = 0;
-+			else
-+				load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
- #else
- 			load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
- #endif
-diff --git a/fs/block_dev.c b/fs/block_dev.c
-index 194cf66..34503ba 100644
---- a/fs/block_dev.c
-+++ b/fs/block_dev.c
-@@ -1075,6 +1075,7 @@ static int __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part);
- static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- {
- 	struct gendisk *disk;
-+	struct module *owner;
- 	int ret;
- 	int partno;
- 	int perm = 0;
-@@ -1100,6 +1101,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- 	disk = get_gendisk(bdev->bd_dev, &partno);
- 	if (!disk)
- 		goto out;
-+	owner = disk->fops->owner;
- 
- 	disk_block_events(disk);
- 	mutex_lock_nested(&bdev->bd_mutex, for_part);
-@@ -1127,8 +1129,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- 					bdev->bd_disk = NULL;
- 					mutex_unlock(&bdev->bd_mutex);
- 					disk_unblock_events(disk);
--					module_put(disk->fops->owner);
- 					put_disk(disk);
-+					module_put(owner);
- 					goto restart;
- 				}
- 			}
-@@ -1184,8 +1186,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- 				goto out_unlock_bdev;
- 		}
- 		/* only one opener holds refs to the module and disk */
--		module_put(disk->fops->owner);
- 		put_disk(disk);
-+		module_put(owner);
- 	}
- 	bdev->bd_openers++;
- 	if (for_part)
-@@ -1205,8 +1207,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
-  out_unlock_bdev:
- 	mutex_unlock(&bdev->bd_mutex);
- 	disk_unblock_events(disk);
--	module_put(disk->fops->owner);
- 	put_disk(disk);
-+	module_put(owner);
-  out:
- 	bdput(bdev);
- 
-@@ -1432,14 +1434,15 @@ static int __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)
- 	if (!bdev->bd_openers) {
- 		struct module *owner = disk->fops->owner;
- 
--		put_disk(disk);
--		module_put(owner);
- 		disk_put_part(bdev->bd_part);
- 		bdev->bd_part = NULL;
- 		bdev->bd_disk = NULL;
- 		if (bdev != bdev->bd_contains)
- 			victim = bdev->bd_contains;
- 		bdev->bd_contains = NULL;
-+
-+		put_disk(disk);
-+		module_put(owner);
- 	}
- 	mutex_unlock(&bdev->bd_mutex);
- 	bdput(bdev);
-diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
-index 2451627..cb85825 100644
---- a/fs/cifs/connect.c
-+++ b/fs/cifs/connect.c
-@@ -2767,10 +2767,10 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
- 
- /*
-  * When the server doesn't allow large posix writes, only allow a wsize of
-- * 128k minus the size of the WRITE_AND_X header. That allows for a write up
-+ * 2^17-1 minus the size of the WRITE_AND_X header. That allows for a write up
-  * to the maximum size described by RFC1002.
-  */
--#define CIFS_MAX_RFC1002_WSIZE (128 * 1024 - sizeof(WRITE_REQ) + 4)
-+#define CIFS_MAX_RFC1002_WSIZE ((1<<17) - 1 - sizeof(WRITE_REQ) + 4)
- 
- /*
-  * The default wsize is 1M. find_get_pages seems to return a maximum of 256
-diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
-index a7b2dcd..745e5cd 100644
---- a/fs/cifs/inode.c
-+++ b/fs/cifs/inode.c
-@@ -562,7 +562,16 @@ int cifs_get_file_info(struct file *filp)
- 
- 	xid = GetXid();
- 	rc = CIFSSMBQFileInfo(xid, tcon, cfile->netfid, &find_data);
--	if (rc == -EOPNOTSUPP || rc == -EINVAL) {
-+	switch (rc) {
-+	case 0:
-+		cifs_all_info_to_fattr(&fattr, &find_data, cifs_sb, false);
-+		break;
-+	case -EREMOTE:
-+		cifs_create_dfs_fattr(&fattr, inode->i_sb);
-+		rc = 0;
-+		break;
-+	case -EOPNOTSUPP:
-+	case -EINVAL:
- 		/*
- 		 * FIXME: legacy server -- fall back to path-based call?
- 		 * for now, just skip revalidating and mark inode for
-@@ -570,18 +579,14 @@ int cifs_get_file_info(struct file *filp)
- 		 */
- 		rc = 0;
- 		CIFS_I(inode)->time = 0;
-+	default:
- 		goto cgfi_exit;
--	} else if (rc == -EREMOTE) {
--		cifs_create_dfs_fattr(&fattr, inode->i_sb);
--		rc = 0;
--	} else if (rc)
--		goto cgfi_exit;
-+	}
- 
- 	/*
- 	 * don't bother with SFU junk here -- just mark inode as needing
- 	 * revalidation.
- 	 */
--	cifs_all_info_to_fattr(&fattr, &find_data, cifs_sb, false);
- 	fattr.cf_uniqueid = CIFS_I(inode)->uniqueid;
- 	fattr.cf_flags |= CIFS_FATTR_NEED_REVAL;
- 	cifs_fattr_to_inode(inode, &fattr);
-diff --git a/fs/eventpoll.c b/fs/eventpoll.c
-index f9cfd16..2acaf60 100644
---- a/fs/eventpoll.c
-+++ b/fs/eventpoll.c
-@@ -70,6 +70,15 @@
-  * simultaneous inserts (A into B and B into A) from racing and
-  * constructing a cycle without either insert observing that it is
-  * going to.
-+ * It is necessary to acquire multiple "ep->mtx"es at once in the
-+ * case when one epoll fd is added to another. In this case, we
-+ * always acquire the locks in the order of nesting (i.e. after
-+ * epoll_ctl(e1, EPOLL_CTL_ADD, e2), e1->mtx will always be acquired
-+ * before e2->mtx). Since we disallow cycles of epoll file
-+ * descriptors, this ensures that the mutexes are well-ordered. In
-+ * order to communicate this nesting to lockdep, when walking a tree
-+ * of epoll file descriptors, we use the current recursion depth as
-+ * the lockdep subkey.
-  * It is possible to drop the "ep->mtx" and to use the global
-  * mutex "epmutex" (together with "ep->lock") to have it working,
-  * but having "ep->mtx" will make the interface more scalable.
-@@ -464,13 +473,15 @@ static void ep_unregister_pollwait(struct eventpoll *ep, struct epitem *epi)
-  * @ep: Pointer to the epoll private data structure.
-  * @sproc: Pointer to the scan callback.
-  * @priv: Private opaque data passed to the @sproc callback.
-+ * @depth: The current depth of recursive f_op->poll calls.
-  *
-  * Returns: The same integer error code returned by the @sproc callback.
-  */
- static int ep_scan_ready_list(struct eventpoll *ep,
- 			      int (*sproc)(struct eventpoll *,
- 					   struct list_head *, void *),
--			      void *priv)
-+			      void *priv,
-+			      int depth)
- {
- 	int error, pwake = 0;
- 	unsigned long flags;
-@@ -481,7 +492,7 @@ static int ep_scan_ready_list(struct eventpoll *ep,
- 	 * We need to lock this because we could be hit by
- 	 * eventpoll_release_file() and epoll_ctl().
- 	 */
--	mutex_lock(&ep->mtx);
-+	mutex_lock_nested(&ep->mtx, depth);
- 
- 	/*
- 	 * Steal the ready list, and re-init the original one to the
-@@ -670,7 +681,7 @@ static int ep_read_events_proc(struct eventpoll *ep, struct list_head *head,
- 
- static int ep_poll_readyevents_proc(void *priv, void *cookie, int call_nests)
- {
--	return ep_scan_ready_list(priv, ep_read_events_proc, NULL);
-+	return ep_scan_ready_list(priv, ep_read_events_proc, NULL, call_nests + 1);
- }
- 
- static unsigned int ep_eventpoll_poll(struct file *file, poll_table *wait)
-@@ -737,7 +748,7 @@ void eventpoll_release_file(struct file *file)
- 
- 		ep = epi->ep;
- 		list_del_init(&epi->fllink);
--		mutex_lock(&ep->mtx);
-+		mutex_lock_nested(&ep->mtx, 0);
- 		ep_remove(ep, epi);
- 		mutex_unlock(&ep->mtx);
- 	}
-@@ -1134,7 +1145,7 @@ static int ep_send_events(struct eventpoll *ep,
- 	esed.maxevents = maxevents;
- 	esed.events = events;
- 
--	return ep_scan_ready_list(ep, ep_send_events_proc, &esed);
-+	return ep_scan_ready_list(ep, ep_send_events_proc, &esed, 0);
- }
- 
- static inline struct timespec ep_set_mstimeout(long ms)
-@@ -1267,7 +1278,7 @@ static int ep_loop_check_proc(void *priv, void *cookie, int call_nests)
- 	struct rb_node *rbp;
- 	struct epitem *epi;
- 
--	mutex_lock(&ep->mtx);
-+	mutex_lock_nested(&ep->mtx, call_nests + 1);
- 	for (rbp = rb_first(&ep->rbr); rbp; rbp = rb_next(rbp)) {
- 		epi = rb_entry(rbp, struct epitem, rbn);
- 		if (unlikely(is_file_epoll(epi->ffd.file))) {
-@@ -1409,7 +1420,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
- 	}
- 
- 
--	mutex_lock(&ep->mtx);
-+	mutex_lock_nested(&ep->mtx, 0);
- 
- 	/*
- 	 * Try to lookup the file inside our RB tree, Since we grabbed "mtx"
-diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
-index 354619a..1a34c1c 100644
---- a/fs/ext4/ext4.h
-+++ b/fs/ext4/ext4.h
-@@ -175,6 +175,7 @@ struct mpage_da_data {
-  */
- #define	EXT4_IO_END_UNWRITTEN	0x0001
- #define EXT4_IO_END_ERROR	0x0002
-+#define EXT4_IO_END_QUEUED	0x0004
- 
- struct ext4_io_page {
- 	struct page	*p_page;
-@@ -357,8 +358,7 @@ struct flex_groups {
- 
- /* Flags that should be inherited by new inodes from their parent. */
- #define EXT4_FL_INHERITED (EXT4_SECRM_FL | EXT4_UNRM_FL | EXT4_COMPR_FL |\
--			   EXT4_SYNC_FL | EXT4_IMMUTABLE_FL | EXT4_APPEND_FL |\
--			   EXT4_NODUMP_FL | EXT4_NOATIME_FL |\
-+			   EXT4_SYNC_FL | EXT4_NODUMP_FL | EXT4_NOATIME_FL |\
- 			   EXT4_NOCOMPR_FL | EXT4_JOURNAL_DATA_FL |\
- 			   EXT4_NOTAIL_FL | EXT4_DIRSYNC_FL)
- 
-diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
-index c94774c..1265904 100644
---- a/fs/ext4/inode.c
-+++ b/fs/ext4/inode.c
-@@ -190,9 +190,6 @@ void ext4_evict_inode(struct inode *inode)
- 
- 	trace_ext4_evict_inode(inode);
- 
--	mutex_lock(&inode->i_mutex);
--	ext4_flush_completed_IO(inode);
--	mutex_unlock(&inode->i_mutex);
- 	ext4_ioend_wait(inode);
- 
- 	if (inode->i_nlink) {
-diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
-index 458a394..3d36d5a 100644
---- a/fs/ext4/namei.c
-+++ b/fs/ext4/namei.c
-@@ -1589,7 +1589,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry,
- 			dxtrace(dx_show_index("node", frames[1].entries));
- 			dxtrace(dx_show_index("node",
- 			       ((struct dx_node *) bh2->b_data)->entries));
--			err = ext4_handle_dirty_metadata(handle, inode, bh2);
-+			err = ext4_handle_dirty_metadata(handle, dir, bh2);
- 			if (err)
- 				goto journal_error;
- 			brelse (bh2);
-@@ -1615,7 +1615,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry,
- 			if (err)
- 				goto journal_error;
- 		}
--		err = ext4_handle_dirty_metadata(handle, inode, frames[0].bh);
-+		err = ext4_handle_dirty_metadata(handle, dir, frames[0].bh);
- 		if (err) {
- 			ext4_std_error(inode->i_sb, err);
- 			goto cleanup;
-@@ -1866,7 +1866,7 @@ retry:
- 	ext4_set_de_type(dir->i_sb, de, S_IFDIR);
- 	inode->i_nlink = 2;
- 	BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");
--	err = ext4_handle_dirty_metadata(handle, dir, dir_block);
-+	err = ext4_handle_dirty_metadata(handle, inode, dir_block);
- 	if (err)
- 		goto out_clear_inode;
- 	err = ext4_mark_inode_dirty(handle, inode);
-@@ -2540,7 +2540,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
- 		PARENT_INO(dir_bh->b_data, new_dir->i_sb->s_blocksize) =
- 						cpu_to_le32(new_dir->i_ino);
- 		BUFFER_TRACE(dir_bh, "call ext4_handle_dirty_metadata");
--		retval = ext4_handle_dirty_metadata(handle, old_dir, dir_bh);
-+		retval = ext4_handle_dirty_metadata(handle, old_inode, dir_bh);
- 		if (retval) {
- 			ext4_std_error(old_dir->i_sb, retval);
- 			goto end_rename;
-diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
-index 97e5e98..bd6a85e 100644
---- a/fs/ext4/page-io.c
-+++ b/fs/ext4/page-io.c
-@@ -142,7 +142,23 @@ static void ext4_end_io_work(struct work_struct *work)
- 	unsigned long		flags;
- 	int			ret;
- 
--	mutex_lock(&inode->i_mutex);
-+	if (!mutex_trylock(&inode->i_mutex)) {
-+		/*
-+		 * Requeue the work instead of waiting so that the work
-+		 * items queued after this can be processed.
-+		 */
-+		queue_work(EXT4_SB(inode->i_sb)->dio_unwritten_wq, &io->work);
-+		/*
-+		 * To prevent the ext4-dio-unwritten thread from keeping
-+		 * requeueing end_io requests and occupying cpu for too long,
-+		 * yield the cpu if it sees an end_io request that has already
-+		 * been requeued.
-+		 */
-+		if (io->flag & EXT4_IO_END_QUEUED)
-+			yield();
-+		io->flag |= EXT4_IO_END_QUEUED;
-+		return;
-+	}
- 	ret = ext4_end_io_nolock(io);
- 	if (ret < 0) {
- 		mutex_unlock(&inode->i_mutex);
-diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
-index c757adc..19fe4e3 100644
---- a/fs/ext4/xattr.c
-+++ b/fs/ext4/xattr.c
-@@ -820,8 +820,14 @@ inserted:
- 			if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))
- 				goal = goal & EXT4_MAX_BLOCK_FILE_PHYS;
- 
-+			/*
-+			 * take i_data_sem because we will test
-+			 * i_delalloc_reserved_flag in ext4_mb_new_blocks
-+			 */
-+			down_read((&EXT4_I(inode)->i_data_sem));
- 			block = ext4_new_meta_blocks(handle, inode, goal, 0,
- 						     NULL, &error);
-+			up_read((&EXT4_I(inode)->i_data_sem));
- 			if (error)
- 				goto cleanup;
- 
-diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c
-index 85c098a..9d71c95 100644
---- a/fs/hppfs/hppfs.c
-+++ b/fs/hppfs/hppfs.c
-@@ -16,6 +16,7 @@
- #include <linux/statfs.h>
- #include <linux/types.h>
- #include <linux/pid_namespace.h>
-+#include <linux/namei.h>
- #include <asm/uaccess.h>
- #include "os.h"
- 
-diff --git a/fs/namei.c b/fs/namei.c
-index b456c7a..f7593c0 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -136,7 +136,7 @@ static int do_getname(const char __user *filename, char *page)
- 	return retval;
- }
- 
--static char *getname_flags(const char __user * filename, int flags)
-+static char *getname_flags(const char __user *filename, int flags, int *empty)
- {
- 	char *tmp, *result;
- 
-@@ -147,6 +147,8 @@ static char *getname_flags(const char __user * filename, int flags)
- 
- 		result = tmp;
- 		if (retval < 0) {
-+			if (retval == -ENOENT && empty)
-+				*empty = 1;
- 			if (retval != -ENOENT || !(flags & LOOKUP_EMPTY)) {
- 				__putname(tmp);
- 				result = ERR_PTR(retval);
-@@ -159,7 +161,7 @@ static char *getname_flags(const char __user * filename, int flags)
- 
- char *getname(const char __user * filename)
- {
--	return getname_flags(filename, 0);
-+	return getname_flags(filename, 0, 0);
- }
- 
- #ifdef CONFIG_AUDITSYSCALL
-@@ -779,17 +781,20 @@ static int follow_automount(struct path *path, unsigned flags,
- 	if ((flags & LOOKUP_NO_AUTOMOUNT) && !(flags & LOOKUP_CONTINUE))
- 		return -EISDIR; /* we actually want to stop here */
- 
--	/* We want to mount if someone is trying to open/create a file of any
--	 * type under the mountpoint, wants to traverse through the mountpoint
--	 * or wants to open the mounted directory.
-+	/* We don't want to mount if someone's just doing a stat -
-+	 * unless they're stat'ing a directory and appended a '/' to
-+	 * the name.
- 	 *
--	 * We don't want to mount if someone's just doing a stat and they've
--	 * set AT_SYMLINK_NOFOLLOW - unless they're stat'ing a directory and
--	 * appended a '/' to the name.
-+	 * We do, however, want to mount if someone wants to open or
-+	 * create a file of any type under the mountpoint, wants to
-+	 * traverse through the mountpoint or wants to open the
-+	 * mounted directory.  Also, autofs may mark negative dentries
-+	 * as being automount points.  These will need the attentions
-+	 * of the daemon to instantiate them before they can be used.
- 	 */
--	if (!(flags & LOOKUP_FOLLOW) &&
--	    !(flags & (LOOKUP_CONTINUE | LOOKUP_DIRECTORY |
--		       LOOKUP_OPEN | LOOKUP_CREATE)))
-+	if (!(flags & (LOOKUP_CONTINUE | LOOKUP_DIRECTORY |
-+		     LOOKUP_OPEN | LOOKUP_CREATE | LOOKUP_AUTOMOUNT)) &&
-+	    path->dentry->d_inode)
- 		return -EISDIR;
- 
- 	current->total_link_count++;
-@@ -905,7 +910,7 @@ static int follow_managed(struct path *path, unsigned flags)
- 		mntput(path->mnt);
- 	if (ret == -EISDIR)
- 		ret = 0;
--	return ret;
-+	return ret < 0 ? ret : need_mntput;
- }
- 
- int follow_down_one(struct path *path)
-@@ -953,6 +958,7 @@ static bool __follow_mount_rcu(struct nameidata *nd, struct path *path,
- 			break;
- 		path->mnt = mounted;
- 		path->dentry = mounted->mnt_root;
-+		nd->flags |= LOOKUP_JUMPED;
- 		nd->seq = read_seqcount_begin(&path->dentry->d_seq);
- 		/*
- 		 * Update the inode too. We don't need to re-check the
-@@ -1227,6 +1233,8 @@ retry:
- 		path_put_conditional(path, nd);
- 		return err;
- 	}
-+	if (err)
-+		nd->flags |= LOOKUP_JUMPED;
- 	*inode = path->dentry->d_inode;
- 	return 0;
- }
-@@ -1747,11 +1755,11 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
- 	return __lookup_hash(&this, base, NULL);
- }
- 
--int user_path_at(int dfd, const char __user *name, unsigned flags,
--		 struct path *path)
-+int user_path_at_empty(int dfd, const char __user *name, unsigned flags,
-+		 struct path *path, int *empty)
- {
- 	struct nameidata nd;
--	char *tmp = getname_flags(name, flags);
-+	char *tmp = getname_flags(name, flags, empty);
- 	int err = PTR_ERR(tmp);
- 	if (!IS_ERR(tmp)) {
- 
-@@ -1765,6 +1773,12 @@ int user_path_at(int dfd, const char __user *name, unsigned flags,
- 	return err;
- }
- 
-+int user_path_at(int dfd, const char __user *name, unsigned flags,
-+		 struct path *path)
-+{
-+	return user_path_at_empty(dfd, name, flags, path, 0);
-+}
-+
- static int user_path_parent(int dfd, const char __user *path,
- 			struct nameidata *nd, char **name)
- {
-@@ -2107,6 +2121,10 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
- 	}
- 
- 	/* create side of things */
-+	/*
-+	 * This will *only* deal with leaving RCU mode - LOOKUP_JUMPED has been
-+	 * cleared when we got to the last component we are about to look up
-+	 */
- 	error = complete_walk(nd);
- 	if (error)
- 		return ERR_PTR(error);
-@@ -2175,6 +2193,9 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
- 	if (error < 0)
- 		goto exit_dput;
- 
-+	if (error)
-+		nd->flags |= LOOKUP_JUMPED;
-+
- 	error = -ENOENT;
- 	if (!path->dentry->d_inode)
- 		goto exit_dput;
-@@ -2184,6 +2205,10 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
- 
- 	path_to_nameidata(path, nd);
- 	nd->inode = path->dentry->d_inode;
-+	/* Why this, you ask?  _Now_ we might have grown LOOKUP_JUMPED... */
-+	error = complete_walk(nd);
-+	if (error)
-+		goto exit;
- 	error = -EISDIR;
- 	if (S_ISDIR(nd->inode->i_mode))
- 		goto exit;
-diff --git a/fs/namespace.c b/fs/namespace.c
-index fe59bd1..537dd96 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -1109,6 +1109,7 @@ static int show_vfsstat(struct seq_file *m, void *v)
- 
- 	/* device */
- 	if (mnt->mnt_sb->s_op->show_devname) {
-+		seq_puts(m, "device ");
- 		err = mnt->mnt_sb->s_op->show_devname(m, mnt);
- 	} else {
- 		if (mnt->mnt_devname) {
-@@ -1757,7 +1758,7 @@ static int do_loopback(struct path *path, char *old_name,
- 		return err;
- 	if (!old_name || !*old_name)
- 		return -EINVAL;
--	err = kern_path(old_name, LOOKUP_FOLLOW, &old_path);
-+	err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
- 	if (err)
- 		return err;
- 
-diff --git a/fs/nfs/super.c b/fs/nfs/super.c
-index ce40e5c..858d31b 100644
---- a/fs/nfs/super.c
-+++ b/fs/nfs/super.c
-@@ -2793,7 +2793,7 @@ static struct dentry *nfs_follow_remote_path(struct vfsmount *root_mnt,
- 		goto out_put_mnt_ns;
- 
- 	ret = vfs_path_lookup(root_mnt->mnt_root, root_mnt,
--			export_path, LOOKUP_FOLLOW, nd);
-+			export_path, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, nd);
- 
- 	nfs_referral_loop_unprotect();
- 	put_mnt_ns(ns_private);
-diff --git a/fs/nfs/write.c b/fs/nfs/write.c
-index 7271680..f2f80c0 100644
---- a/fs/nfs/write.c
-+++ b/fs/nfs/write.c
-@@ -428,7 +428,6 @@ static void
- nfs_mark_request_dirty(struct nfs_page *req)
- {
- 	__set_page_dirty_nobuffers(req->wb_page);
--	__mark_inode_dirty(req->wb_page->mapping->host, I_DIRTY_DATASYNC);
- }
- 
- #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
-@@ -762,6 +761,8 @@ int nfs_updatepage(struct file *file, struct page *page,
- 	status = nfs_writepage_setup(ctx, page, offset, count);
- 	if (status < 0)
- 		nfs_set_pageerror(page);
-+	else
-+		__set_page_dirty_nobuffers(page);
- 
- 	dprintk("NFS:       nfs_updatepage returns %d (isize %lld)\n",
- 			status, (long long)i_size_read(inode));
-@@ -1525,6 +1526,10 @@ static int nfs_commit_unstable_pages(struct inode *inode, struct writeback_contr
- 	int flags = FLUSH_SYNC;
- 	int ret = 0;
- 
-+	/* no commits means nothing needs to be done */
-+	if (!nfsi->ncommit)
-+		return ret;
-+
- 	if (wbc->sync_mode == WB_SYNC_NONE) {
- 		/* Don't commit yet if this is a non-blocking flush and there
- 		 * are a lot of outstanding writes for this mapping.
-@@ -1659,34 +1664,20 @@ out_error:
- int nfs_migrate_page(struct address_space *mapping, struct page *newpage,
- 		struct page *page)
- {
--	struct nfs_page *req;
--	int ret;
-+	/*
-+	 * If PagePrivate is set, then the page is currently associated with
-+	 * an in-progress read or write request. Don't try to migrate it.
-+	 *
-+	 * FIXME: we could do this in principle, but we'll need a way to ensure
-+	 *        that we can safely release the inode reference while holding
-+	 *        the page lock.
-+	 */
-+	if (PagePrivate(page))
-+		return -EBUSY;
- 
- 	nfs_fscache_release_page(page, GFP_KERNEL);
- 
--	req = nfs_find_and_lock_request(page, false);
--	ret = PTR_ERR(req);
--	if (IS_ERR(req))
--		goto out;
--
--	ret = migrate_page(mapping, newpage, page);
--	if (!req)
--		goto out;
--	if (ret)
--		goto out_unlock;
--	page_cache_get(newpage);
--	spin_lock(&mapping->host->i_lock);
--	req->wb_page = newpage;
--	SetPagePrivate(newpage);
--	set_page_private(newpage, (unsigned long)req);
--	ClearPagePrivate(page);
--	set_page_private(page, 0);
--	spin_unlock(&mapping->host->i_lock);
--	page_cache_release(page);
--out_unlock:
--	nfs_clear_page_tag_locked(req);
--out:
--	return ret;
-+	return migrate_page(mapping, newpage, page);
- }
- #endif
- 
-diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
-index 3a6dbd7..0b8830c 100644
---- a/fs/nfsd/nfs4proc.c
-+++ b/fs/nfsd/nfs4proc.c
-@@ -156,6 +156,8 @@ do_open_permission(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfs
- 		!(open->op_share_access & NFS4_SHARE_ACCESS_WRITE))
- 		return nfserr_inval;
- 
-+	accmode |= NFSD_MAY_READ_IF_EXEC;
-+
- 	if (open->op_share_access & NFS4_SHARE_ACCESS_READ)
- 		accmode |= NFSD_MAY_READ;
- 	if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE)
-@@ -682,7 +684,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
- 	readdir->rd_bmval[1] &= nfsd_suppattrs1(cstate->minorversion);
- 	readdir->rd_bmval[2] &= nfsd_suppattrs2(cstate->minorversion);
- 
--	if ((cookie > ~(u32)0) || (cookie == 1) || (cookie == 2) ||
-+	if ((cookie == 1) || (cookie == 2) ||
- 	    (cookie == 0 && memcmp(readdir->rd_verf.data, zeroverf.data, NFS4_VERIFIER_SIZE)))
- 		return nfserr_bad_cookie;
- 
-@@ -921,7 +923,7 @@ _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
- 	count = 4 + (verify->ve_attrlen >> 2);
- 	buf = kmalloc(count << 2, GFP_KERNEL);
- 	if (!buf)
--		return nfserr_resource;
-+		return nfserr_jukebox;
- 
- 	status = nfsd4_encode_fattr(&cstate->current_fh,
- 				    cstate->current_fh.fh_export,
-diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
-index ffb59ef..be26814 100644
---- a/fs/nfsd/nfs4recover.c
-+++ b/fs/nfsd/nfs4recover.c
-@@ -88,7 +88,7 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname)
- 	struct xdr_netobj cksum;
- 	struct hash_desc desc;
- 	struct scatterlist sg;
--	__be32 status = nfserr_resource;
-+	__be32 status = nfserr_jukebox;
- 
- 	dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n",
- 			clname->len, clname->data);
-diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
-index 3b8ad35..ecd8152 100644
---- a/fs/nfsd/nfs4state.c
-+++ b/fs/nfsd/nfs4state.c
-@@ -188,8 +188,15 @@ static void nfs4_file_put_fd(struct nfs4_file *fp, int oflag)
- static void __nfs4_file_put_access(struct nfs4_file *fp, int oflag)
- {
- 	if (atomic_dec_and_test(&fp->fi_access[oflag])) {
--		nfs4_file_put_fd(fp, O_RDWR);
- 		nfs4_file_put_fd(fp, oflag);
-+		/*
-+		 * It's also safe to get rid of the RDWR open *if*
-+		 * we no longer have need of the other kind of access
-+		 * or if we already have the other kind of open:
-+		 */
-+		if (fp->fi_fds[1-oflag]
-+			|| atomic_read(&fp->fi_access[1 - oflag]) == 0)
-+			nfs4_file_put_fd(fp, O_RDWR);
- 	}
- }
- 
-@@ -1903,7 +1910,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
- 	 * of 5 bullet points, labeled as CASE0 - CASE4 below.
- 	 */
- 	unconf = find_unconfirmed_client_by_str(dname, strhashval);
--	status = nfserr_resource;
-+	status = nfserr_jukebox;
- 	if (!conf) {
- 		/*
- 		 * RFC 3530 14.2.33 CASE 4:
-@@ -2440,7 +2447,7 @@ renew:
- 	if (open->op_stateowner == NULL) {
- 		sop = alloc_init_open_stateowner(strhashval, clp, open);
- 		if (sop == NULL)
--			return nfserr_resource;
-+			return nfserr_jukebox;
- 		open->op_stateowner = sop;
- 	}
- 	list_del_init(&sop->so_close_lru);
-@@ -2576,7 +2583,7 @@ nfs4_new_open(struct svc_rqst *rqstp, struct nfs4_stateid **stpp,
- 
- 	stp = nfs4_alloc_stateid();
- 	if (stp == NULL)
--		return nfserr_resource;
-+		return nfserr_jukebox;
- 
- 	status = nfs4_get_vfs_file(rqstp, fp, cur_fh, open);
- 	if (status) {
-@@ -2807,7 +2814,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
- 		status = nfserr_bad_stateid;
- 		if (open->op_claim_type == NFS4_OPEN_CLAIM_DELEGATE_CUR)
- 			goto out;
--		status = nfserr_resource;
-+		status = nfserr_jukebox;
- 		fp = alloc_init_file(ino);
- 		if (fp == NULL)
- 			goto out;
-@@ -3381,8 +3388,9 @@ static inline void nfs4_file_downgrade(struct nfs4_stateid *stp, unsigned int to
- 	int i;
- 
- 	for (i = 1; i < 4; i++) {
--		if (test_bit(i, &stp->st_access_bmap) && !(i & to_access)) {
--			nfs4_file_put_access(stp->st_file, i);
-+		if (test_bit(i, &stp->st_access_bmap)
-+					&& ((i & to_access) != i)) {
-+			nfs4_file_put_access(stp->st_file, nfs4_access_to_omode(i));
- 			__clear_bit(i, &stp->st_access_bmap);
- 		}
- 	}
-@@ -3413,6 +3421,8 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp,
- 	if (!access_valid(od->od_share_access, cstate->minorversion)
- 			|| !deny_valid(od->od_share_deny))
- 		return nfserr_inval;
-+	/* We don't yet support WANT bits: */
-+	od->od_share_access &= NFS4_SHARE_ACCESS_MASK;
- 
- 	nfs4_lock_state();
- 	if ((status = nfs4_preprocess_seqid_op(cstate,
-@@ -3840,7 +3850,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
- 		/* XXX: Do we need to check for duplicate stateowners on
- 		 * the same file, or should they just be allowed (and
- 		 * create new stateids)? */
--		status = nfserr_resource;
-+		status = nfserr_jukebox;
- 		lock_sop = alloc_init_lock_stateowner(strhashval,
- 				open_sop->so_client, open_stp, lock);
- 		if (lock_sop == NULL)
-@@ -3924,9 +3934,9 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
- 	case (EDEADLK):
- 		status = nfserr_deadlock;
- 		break;
--	default:        
-+	default:
- 		dprintk("NFSD: nfsd4_lock: vfs_lock_file() failed! status %d\n",err);
--		status = nfserr_resource;
-+		status = nfserrno(err);
- 		break;
- 	}
- out:
-diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index 9901811..6c74097 100644
---- a/fs/nfsd/nfs4xdr.c
-+++ b/fs/nfsd/nfs4xdr.c
-@@ -1548,6 +1548,18 @@ static void write_cinfo(__be32 **p, struct nfsd4_change_info *c)
- 								\
- 	save = resp->p;
- 
-+static bool seqid_mutating_err(__be32 err)
-+{
-+	/* rfc 3530 section 8.1.5: */
-+	return	err != nfserr_stale_clientid &&
-+		err != nfserr_stale_stateid &&
-+		err != nfserr_bad_stateid &&
-+		err != nfserr_bad_seqid &&
-+		err != nfserr_bad_xdr &&
-+		err != nfserr_resource &&
-+		err != nfserr_nofilehandle;
-+}
-+
- /*
-  * Routine for encoding the result of a "seqid-mutating" NFSv4 operation.  This
-  * is where sequence id's are incremented, and the replay cache is filled.
-diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
-index 6bd2f3c..858c7ba 100644
---- a/fs/nfsd/state.h
-+++ b/fs/nfsd/state.h
-@@ -447,12 +447,6 @@ struct nfs4_stateid {
- #define WR_STATE	        0x00000020
- #define CLOSE_STATE             0x00000040
- 
--#define seqid_mutating_err(err)                       \
--	(((err) != nfserr_stale_clientid) &&    \
--	((err) != nfserr_bad_seqid) &&          \
--	((err) != nfserr_stale_stateid) &&      \
--	((err) != nfserr_bad_stateid))
--
- struct nfsd4_compound_state;
- 
- extern __be32 nfs4_preprocess_stateid_op(struct nfsd4_compound_state *cstate,
-diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
-index fd0acca..acf88ae 100644
---- a/fs/nfsd/vfs.c
-+++ b/fs/nfsd/vfs.c
-@@ -2114,7 +2114,8 @@ nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp,
- 
- 	/* Allow read access to binaries even when mode 111 */
- 	if (err == -EACCES && S_ISREG(inode->i_mode) &&
--	    acc == (NFSD_MAY_READ | NFSD_MAY_OWNER_OVERRIDE))
-+	     (acc == (NFSD_MAY_READ | NFSD_MAY_OWNER_OVERRIDE) ||
-+	      acc == (NFSD_MAY_READ | NFSD_MAY_READ_IF_EXEC)))
- 		err = inode_permission(inode, MAY_EXEC);
- 
- 	return err? nfserrno(err) : 0;
-diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
-index e0bbac0..a22e40e 100644
---- a/fs/nfsd/vfs.h
-+++ b/fs/nfsd/vfs.h
-@@ -25,6 +25,7 @@
- #define NFSD_MAY_BYPASS_GSS_ON_ROOT 256
- #define NFSD_MAY_NOT_BREAK_LEASE 512
- #define NFSD_MAY_BYPASS_GSS	1024
-+#define NFSD_MAY_READ_IF_EXEC	2048
- 
- #define NFSD_MAY_CREATE		(NFSD_MAY_EXEC|NFSD_MAY_WRITE)
- #define NFSD_MAY_REMOVE		(NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC)
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 5bff4c6..f039017 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -1920,6 +1920,14 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
- 		spin_lock(&files->file_lock);
- 		file = fcheck_files(files, fd);
- 		if (file) {
-+			unsigned int f_flags;
-+			struct fdtable *fdt;
-+
-+			fdt = files_fdtable(files);
-+			f_flags = file->f_flags & ~O_CLOEXEC;
-+			if (FD_ISSET(fd, fdt->close_on_exec))
-+				f_flags |= O_CLOEXEC;
-+
- 			if (path) {
- 				*path = file->f_path;
- 				path_get(&file->f_path);
-@@ -1929,7 +1937,7 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
- 					 "pos:\t%lli\n"
- 					 "flags:\t0%o\n",
- 					 (long long) file->f_pos,
--					 file->f_flags);
-+					 f_flags);
- 			spin_unlock(&files->file_lock);
- 			put_files_struct(files);
- 			return 0;
-diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 5afaa58..c7d4ee6 100644
---- a/fs/proc/task_mmu.c
-+++ b/fs/proc/task_mmu.c
-@@ -1039,6 +1039,9 @@ static int show_numa_map(struct seq_file *m, void *v)
- 		seq_printf(m, " stack");
- 	}
- 
-+	if (is_vm_hugetlb_page(vma))
-+		seq_printf(m, " huge");
-+
- 	walk_page_range(vma->vm_start, vma->vm_end, &walk);
- 
- 	if (!md->pages)
-diff --git a/fs/quota/quota.c b/fs/quota/quota.c
-index b34bdb2..10b6be3 100644
---- a/fs/quota/quota.c
-+++ b/fs/quota/quota.c
-@@ -355,7 +355,7 @@ SYSCALL_DEFINE4(quotactl, unsigned int, cmd, const char __user *, special,
- 	 * resolution (think about autofs) and thus deadlocks could arise.
- 	 */
- 	if (cmds == Q_QUOTAON) {
--		ret = user_path_at(AT_FDCWD, addr, LOOKUP_FOLLOW, &path);
-+		ret = user_path_at(AT_FDCWD, addr, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &path);
- 		if (ret)
- 			pathp = ERR_PTR(ret);
- 		else
-diff --git a/fs/stat.c b/fs/stat.c
-index 9610391..02a6061 100644
---- a/fs/stat.c
-+++ b/fs/stat.c
-@@ -296,15 +296,16 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname,
- {
- 	struct path path;
- 	int error;
-+	int empty = 0;
- 
- 	if (bufsiz <= 0)
- 		return -EINVAL;
- 
--	error = user_path_at(dfd, pathname, LOOKUP_EMPTY, &path);
-+	error = user_path_at_empty(dfd, pathname, LOOKUP_EMPTY, &path, &empty);
- 	if (!error) {
- 		struct inode *inode = path.dentry->d_inode;
- 
--		error = -EINVAL;
-+		error = empty ? -ENOENT : -EINVAL;
- 		if (inode->i_op->readlink) {
- 			error = security_inode_readlink(path.dentry);
- 			if (!error) {
-diff --git a/fs/statfs.c b/fs/statfs.c
-index 8244924..9cf04a1 100644
---- a/fs/statfs.c
-+++ b/fs/statfs.c
-@@ -76,7 +76,7 @@ EXPORT_SYMBOL(vfs_statfs);
- int user_statfs(const char __user *pathname, struct kstatfs *st)
- {
- 	struct path path;
--	int error = user_path(pathname, &path);
-+	int error = user_path_at(AT_FDCWD, pathname, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &path);
- 	if (!error) {
- 		error = vfs_statfs(&path, st);
- 		path_put(&path);
-diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
-index 91567bb..03eb1d6 100644
---- a/include/drm/drm_dp_helper.h
-+++ b/include/drm/drm_dp_helper.h
-@@ -72,6 +72,7 @@
- 
- #define DP_MAIN_LINK_CHANNEL_CODING         0x006
- 
-+#define DP_EDP_CONFIGURATION_CAP            0x00d
- #define DP_TRAINING_AUX_RD_INTERVAL         0x00e
- 
- /* link configuration */
-@@ -133,6 +134,8 @@
- #define DP_MAIN_LINK_CHANNEL_CODING_SET	    0x108
- # define DP_SET_ANSI_8B10B		    (1 << 0)
- 
-+#define DP_EDP_CONFIGURATION_SET            0x10a
-+
- #define DP_LANE0_1_STATUS		    0x202
- #define DP_LANE2_3_STATUS		    0x203
- # define DP_LANE_CR_DONE		    (1 << 0)
-diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
-index 2dfa707..0bfcb76 100644
---- a/include/linux/ext2_fs.h
-+++ b/include/linux/ext2_fs.h
-@@ -196,8 +196,8 @@ struct ext2_group_desc
- 
- /* Flags that should be inherited by new inodes from their parent. */
- #define EXT2_FL_INHERITED (EXT2_SECRM_FL | EXT2_UNRM_FL | EXT2_COMPR_FL |\
--			   EXT2_SYNC_FL | EXT2_IMMUTABLE_FL | EXT2_APPEND_FL |\
--			   EXT2_NODUMP_FL | EXT2_NOATIME_FL | EXT2_COMPRBLK_FL|\
-+			   EXT2_SYNC_FL | EXT2_NODUMP_FL |\
-+			   EXT2_NOATIME_FL | EXT2_COMPRBLK_FL |\
- 			   EXT2_NOCOMP_FL | EXT2_JOURNAL_DATA_FL |\
- 			   EXT2_NOTAIL_FL | EXT2_DIRSYNC_FL)
- 
-diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
-index 5e06acf..7b14d25 100644
---- a/include/linux/ext3_fs.h
-+++ b/include/linux/ext3_fs.h
-@@ -180,8 +180,8 @@ struct ext3_group_desc
- 
- /* Flags that should be inherited by new inodes from their parent. */
- #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\
--			   EXT3_SYNC_FL | EXT3_IMMUTABLE_FL | EXT3_APPEND_FL |\
--			   EXT3_NODUMP_FL | EXT3_NOATIME_FL | EXT3_COMPRBLK_FL|\
-+			   EXT3_SYNC_FL | EXT3_NODUMP_FL |\
-+			   EXT3_NOATIME_FL | EXT3_COMPRBLK_FL |\
- 			   EXT3_NOCOMPR_FL | EXT3_JOURNAL_DATA_FL |\
- 			   EXT3_NOTAIL_FL | EXT3_DIRSYNC_FL)
- 
-diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index f6efed0..b9490bf 100644
---- a/include/linux/interrupt.h
-+++ b/include/linux/interrupt.h
-@@ -59,6 +59,8 @@
-  * IRQF_NO_SUSPEND - Do not disable this IRQ during suspend
-  * IRQF_FORCE_RESUME - Force enable it on resume even if IRQF_NO_SUSPEND is set
-  * IRQF_NO_THREAD - Interrupt cannot be threaded
-+ * IRQF_EARLY_RESUME - Resume IRQ early during syscore instead of at device
-+ *                resume time.
-  */
- #define IRQF_DISABLED		0x00000020
- #define IRQF_SAMPLE_RANDOM	0x00000040
-@@ -72,6 +74,7 @@
- #define IRQF_NO_SUSPEND		0x00004000
- #define IRQF_FORCE_RESUME	0x00008000
- #define IRQF_NO_THREAD		0x00010000
-+#define IRQF_EARLY_RESUME	0x00020000
- 
- #define IRQF_TIMER		(__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD)
- 
-diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
-index 8cdcc2a1..1feeb52 100644
---- a/include/linux/io-mapping.h
-+++ b/include/linux/io-mapping.h
-@@ -117,6 +117,8 @@ io_mapping_unmap(void __iomem *vaddr)
- 
- #else
- 
-+#include <linux/uaccess.h>
-+
- /* this struct isn't actually defined anywhere */
- struct io_mapping;
- 
-@@ -138,12 +140,14 @@ static inline void __iomem *
- io_mapping_map_atomic_wc(struct io_mapping *mapping,
- 			 unsigned long offset)
- {
-+	pagefault_disable();
- 	return ((char __force __iomem *) mapping) + offset;
- }
- 
- static inline void
- io_mapping_unmap_atomic(void __iomem *vaddr)
- {
-+	pagefault_enable();
- }
- 
- /* Non-atomic map/unmap */
-diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
-index f97672a..265e2c3 100644
---- a/include/linux/jiffies.h
-+++ b/include/linux/jiffies.h
-@@ -303,7 +303,7 @@ extern void jiffies_to_timespec(const unsigned long jiffies,
- extern unsigned long timeval_to_jiffies(const struct timeval *value);
- extern void jiffies_to_timeval(const unsigned long jiffies,
- 			       struct timeval *value);
--extern clock_t jiffies_to_clock_t(long x);
-+extern clock_t jiffies_to_clock_t(unsigned long x);
- extern unsigned long clock_t_to_jiffies(unsigned long x);
- extern u64 jiffies_64_to_clock_t(u64 x);
- extern u64 nsec_to_clock_t(u64 x);
-diff --git a/include/linux/mm.h b/include/linux/mm.h
-index ec6e33d..18eea05 100644
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -355,36 +355,50 @@ static inline struct page *compound_head(struct page *page)
- 	return page;
- }
- 
-+/*
-+ * The atomic page->_mapcount, starts from -1: so that transitions
-+ * both from it and to it can be tracked, using atomic_inc_and_test
-+ * and atomic_add_negative(-1).
-+ */
-+static inline void reset_page_mapcount(struct page *page)
-+{
-+	atomic_set(&(page)->_mapcount, -1);
-+}
-+
-+static inline int page_mapcount(struct page *page)
-+{
-+	return atomic_read(&(page)->_mapcount) + 1;
-+}
-+
- static inline int page_count(struct page *page)
- {
- 	return atomic_read(&compound_head(page)->_count);
- }
- 
-+static inline void get_huge_page_tail(struct page *page)
-+{
-+	/*
-+	 * __split_huge_page_refcount() cannot run
-+	 * from under us.
-+	 */
-+	VM_BUG_ON(page_mapcount(page) < 0);
-+	VM_BUG_ON(atomic_read(&page->_count) != 0);
-+	atomic_inc(&page->_mapcount);
-+}
-+
-+extern bool __get_page_tail(struct page *page);
-+
- static inline void get_page(struct page *page)
- {
-+	if (unlikely(PageTail(page)))
-+		if (likely(__get_page_tail(page)))
-+			return;
- 	/*
- 	 * Getting a normal page or the head of a compound page
--	 * requires to already have an elevated page->_count. Only if
--	 * we're getting a tail page, the elevated page->_count is
--	 * required only in the head page, so for tail pages the
--	 * bugcheck only verifies that the page->_count isn't
--	 * negative.
-+	 * requires to already have an elevated page->_count.
- 	 */
--	VM_BUG_ON(atomic_read(&page->_count) < !PageTail(page));
-+	VM_BUG_ON(atomic_read(&page->_count) <= 0);
- 	atomic_inc(&page->_count);
--	/*
--	 * Getting a tail page will elevate both the head and tail
--	 * page->_count(s).
--	 */
--	if (unlikely(PageTail(page))) {
--		/*
--		 * This is safe only because
--		 * __split_huge_page_refcount can't run under
--		 * get_page().
--		 */
--		VM_BUG_ON(atomic_read(&page->first_page->_count) <= 0);
--		atomic_inc(&page->first_page->_count);
--	}
- }
- 
- static inline struct page *virt_to_head_page(const void *x)
-@@ -803,21 +817,6 @@ static inline pgoff_t page_index(struct page *page)
- }
- 
- /*
-- * The atomic page->_mapcount, like _count, starts from -1:
-- * so that transitions both from it and to it can be tracked,
-- * using atomic_inc_and_test and atomic_add_negative(-1).
-- */
--static inline void reset_page_mapcount(struct page *page)
--{
--	atomic_set(&(page)->_mapcount, -1);
--}
--
--static inline int page_mapcount(struct page *page)
--{
--	return atomic_read(&(page)->_mapcount) + 1;
--}
--
--/*
-  * Return true if this page is mapped into pagetables.
-  */
- static inline int page_mapped(struct page *page)
-diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 027935c..059839c 100644
---- a/include/linux/mm_types.h
-+++ b/include/linux/mm_types.h
-@@ -36,10 +36,24 @@ struct page {
- 					 * updated asynchronously */
- 	atomic_t _count;		/* Usage count, see below. */
- 	union {
--		atomic_t _mapcount;	/* Count of ptes mapped in mms,
--					 * to show when page is mapped
--					 * & limit reverse map searches.
--					 */
-+		/*
-+		 * Count of ptes mapped in
-+		 * mms, to show when page is
-+		 * mapped & limit reverse map
-+		 * searches.
-+		 *
-+		 * Used also for tail pages
-+		 * refcounting instead of
-+		 * _count. Tail pages cannot
-+		 * be mapped and keeping the
-+		 * tail page _count zero at
-+		 * all times guarantees
-+		 * get_page_unless_zero() will
-+		 * never succeed on tail
-+		 * pages.
-+		 */
-+		atomic_t _mapcount;
-+
- 		struct {		/* SLUB */
- 			u16 inuse;
- 			u16 objects;
-diff --git a/include/linux/namei.h b/include/linux/namei.h
-index eba45ea..82ab16b 100644
---- a/include/linux/namei.h
-+++ b/include/linux/namei.h
-@@ -49,6 +49,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
- #define LOOKUP_FOLLOW		0x0001
- #define LOOKUP_DIRECTORY	0x0002
- #define LOOKUP_CONTINUE		0x0004
-+#define LOOKUP_AUTOMOUNT	0x0008
- 
- #define LOOKUP_PARENT		0x0010
- #define LOOKUP_REVAL		0x0020
-@@ -67,6 +68,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
- #define LOOKUP_EMPTY		0x4000
- 
- extern int user_path_at(int, const char __user *, unsigned, struct path *);
-+extern int user_path_at_empty(int, const char __user *, unsigned, struct path *, int *empty);
- 
- #define user_path(name, path) user_path_at(AT_FDCWD, name, LOOKUP_FOLLOW, path)
- #define user_lpath(name, path) user_path_at(AT_FDCWD, name, 0, path)
-diff --git a/include/linux/phy.h b/include/linux/phy.h
-index 7da5fa8..4d3f63a 100644
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -418,7 +418,7 @@ struct phy_driver {
- 
- 	/*
- 	 * Requests a Tx timestamp for 'skb'. The phy driver promises
--	 * to deliver it to the socket's error queue as soon as a
-+	 * to deliver it using skb_complete_tx_timestamp() as soon as a
- 	 * timestamp becomes available. One of the PTP_CLASS_ values
- 	 * is passed in 'type'.
- 	 */
-diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index c0a4f3a..b920a72 100644
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -1996,8 +1996,13 @@ static inline bool skb_defer_rx_timestamp(struct sk_buff *skb)
- /**
-  * skb_complete_tx_timestamp() - deliver cloned skb with tx timestamps
-  *
-+ * PHY drivers may accept clones of transmitted packets for
-+ * timestamping via their phy_driver.txtstamp method. These drivers
-+ * must call this function to return the skb back to the stack, with
-+ * or without a timestamp.
-+ *
-  * @skb: clone of the the original outgoing packet
-- * @hwtstamps: hardware time stamps
-+ * @hwtstamps: hardware time stamps, may be NULL if not available
-  *
-  */
- void skb_complete_tx_timestamp(struct sk_buff *skb,
-diff --git a/include/linux/tty.h b/include/linux/tty.h
-index 6660c41..1ff6b62 100644
---- a/include/linux/tty.h
-+++ b/include/linux/tty.h
-@@ -472,7 +472,9 @@ extern void proc_clear_tty(struct task_struct *p);
- extern struct tty_struct *get_current_tty(void);
- extern void tty_default_fops(struct file_operations *fops);
- extern struct tty_struct *alloc_tty_struct(void);
--extern int tty_add_file(struct tty_struct *tty, struct file *file);
-+extern int tty_alloc_file(struct file *file);
-+extern void tty_add_file(struct tty_struct *tty, struct file *file);
-+extern void tty_free_file(struct file *file);
- extern void free_tty_struct(struct tty_struct *tty);
- extern void initialize_tty_struct(struct tty_struct *tty,
- 		struct tty_driver *driver, int idx);
-diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
-index 0097136..c0ecc5a 100644
---- a/include/linux/usb/hcd.h
-+++ b/include/linux/usb/hcd.h
-@@ -178,7 +178,7 @@ struct usb_hcd {
- 	 * this structure.
- 	 */
- 	unsigned long hcd_priv[0]
--			__attribute__ ((aligned(sizeof(unsigned long))));
-+			__attribute__ ((aligned(sizeof(s64))));
- };
- 
- /* 2.4 does this a bit differently ... */
-diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
-index 9332e52..687fb11 100644
---- a/include/linux/vmalloc.h
-+++ b/include/linux/vmalloc.h
-@@ -13,6 +13,7 @@ struct vm_area_struct;		/* vma defining user mapping in mm_types.h */
- #define VM_MAP		0x00000004	/* vmap()ed pages */
- #define VM_USERMAP	0x00000008	/* suitable for remap_vmalloc_range */
- #define VM_VPAGES	0x00000010	/* buffer for pages was vmalloc'ed */
-+#define VM_UNLIST	0x00000020	/* vm_struct is not listed in vmlist */
- /* bits [20..32] reserved for arch specific ioremap internals */
- 
- /*
-diff --git a/include/net/flow.h b/include/net/flow.h
-index c6d5fe5..32359fd 100644
---- a/include/net/flow.h
-+++ b/include/net/flow.h
-@@ -7,6 +7,7 @@
- #ifndef _NET_FLOW_H
- #define _NET_FLOW_H
- 
-+#include <linux/socket.h>
- #include <linux/in6.h>
- #include <asm/atomic.h>
- 
-@@ -68,7 +69,7 @@ struct flowi4 {
- #define fl4_ipsec_spi		uli.spi
- #define fl4_mh_type		uli.mht.type
- #define fl4_gre_key		uli.gre_key
--};
-+} __attribute__((__aligned__(BITS_PER_LONG/8)));
- 
- static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
- 				      __u32 mark, __u8 tos, __u8 scope,
-@@ -112,7 +113,7 @@ struct flowi6 {
- #define fl6_ipsec_spi		uli.spi
- #define fl6_mh_type		uli.mht.type
- #define fl6_gre_key		uli.gre_key
--};
-+} __attribute__((__aligned__(BITS_PER_LONG/8)));
- 
- struct flowidn {
- 	struct flowi_common	__fl_common;
-@@ -127,7 +128,7 @@ struct flowidn {
- 	union flowi_uli		uli;
- #define fld_sport		uli.ports.sport
- #define fld_dport		uli.ports.dport
--};
-+} __attribute__((__aligned__(BITS_PER_LONG/8)));
- 
- struct flowi {
- 	union {
-@@ -161,6 +162,24 @@ static inline struct flowi *flowidn_to_flowi(struct flowidn *fldn)
- 	return container_of(fldn, struct flowi, u.dn);
- }
- 
-+typedef unsigned long flow_compare_t;
-+
-+static inline size_t flow_key_size(u16 family)
-+{
-+	switch (family) {
-+	case AF_INET:
-+		BUILD_BUG_ON(sizeof(struct flowi4) % sizeof(flow_compare_t));
-+		return sizeof(struct flowi4) / sizeof(flow_compare_t);
-+	case AF_INET6:
-+		BUILD_BUG_ON(sizeof(struct flowi6) % sizeof(flow_compare_t));
-+		return sizeof(struct flowi6) / sizeof(flow_compare_t);
-+	case AF_DECnet:
-+		BUILD_BUG_ON(sizeof(struct flowidn) % sizeof(flow_compare_t));
-+		return sizeof(struct flowidn) / sizeof(flow_compare_t);
-+	}
-+	return 0;
-+}
-+
- #define FLOW_DIR_IN	0
- #define FLOW_DIR_OUT	1
- #define FLOW_DIR_FWD	2
-diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
-index f76fc00..15e53b1 100644
---- a/kernel/irq/pm.c
-+++ b/kernel/irq/pm.c
-@@ -9,6 +9,7 @@
- #include <linux/irq.h>
- #include <linux/module.h>
- #include <linux/interrupt.h>
-+#include <linux/syscore_ops.h>
- 
- #include "internals.h"
- 
-@@ -39,25 +40,58 @@ void suspend_device_irqs(void)
- }
- EXPORT_SYMBOL_GPL(suspend_device_irqs);
- 
--/**
-- * resume_device_irqs - enable interrupt lines disabled by suspend_device_irqs()
-- *
-- * Enable all interrupt lines previously disabled by suspend_device_irqs() that
-- * have the IRQS_SUSPENDED flag set.
-- */
--void resume_device_irqs(void)
-+static void resume_irqs(bool want_early)
- {
- 	struct irq_desc *desc;
- 	int irq;
- 
- 	for_each_irq_desc(irq, desc) {
- 		unsigned long flags;
-+		bool is_early = desc->action &&
-+			desc->action->flags & IRQF_EARLY_RESUME;
-+
-+		if (is_early != want_early)
-+			continue;
- 
- 		raw_spin_lock_irqsave(&desc->lock, flags);
- 		__enable_irq(desc, irq, true);
- 		raw_spin_unlock_irqrestore(&desc->lock, flags);
- 	}
- }
-+
-+/**
-+ * irq_pm_syscore_ops - enable interrupt lines early
-+ *
-+ * Enable all interrupt lines with %IRQF_EARLY_RESUME set.
-+ */
-+static void irq_pm_syscore_resume(void)
-+{
-+	resume_irqs(true);
-+}
-+
-+static struct syscore_ops irq_pm_syscore_ops = {
-+	.resume		= irq_pm_syscore_resume,
-+};
-+
-+static int __init irq_pm_init_ops(void)
-+{
-+	register_syscore_ops(&irq_pm_syscore_ops);
-+	return 0;
-+}
-+
-+device_initcall(irq_pm_init_ops);
-+
-+/**
-+ * resume_device_irqs - enable interrupt lines disabled by suspend_device_irqs()
-+ *
-+ * Enable all non-%IRQF_EARLY_RESUME interrupt lines previously
-+ * disabled by suspend_device_irqs() that have the IRQS_SUSPENDED flag
-+ * set as well as those with %IRQF_FORCE_RESUME.
-+ */
-+void resume_device_irqs(void)
-+{
-+	resume_irqs(false);
-+}
- EXPORT_SYMBOL_GPL(resume_device_irqs);
- 
- /**
-diff --git a/kernel/kmod.c b/kernel/kmod.c
-index 47613df..fabfe54 100644
---- a/kernel/kmod.c
-+++ b/kernel/kmod.c
-@@ -114,10 +114,12 @@ int __request_module(bool wait, const char *fmt, ...)
- 	atomic_inc(&kmod_concurrent);
- 	if (atomic_read(&kmod_concurrent) > max_modprobes) {
- 		/* We may be blaming an innocent here, but unlikely */
--		if (kmod_loop_msg++ < 5)
-+		if (kmod_loop_msg < 5) {
- 			printk(KERN_ERR
- 			       "request_module: runaway loop modprobe %s\n",
- 			       module_name);
-+			kmod_loop_msg++;
-+		}
- 		atomic_dec(&kmod_concurrent);
- 		return -ENOMEM;
- 	}
-diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
-index 1c41ba2..449ccc9 100644
---- a/kernel/power/suspend.c
-+++ b/kernel/power/suspend.c
-@@ -307,7 +307,7 @@ int enter_state(suspend_state_t state)
-  */
- int pm_suspend(suspend_state_t state)
- {
--	if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX)
-+	if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX)
- 		return enter_state(state);
- 	return -EINVAL;
- }
-diff --git a/kernel/signal.c b/kernel/signal.c
-index 415d85d..43fee1c 100644
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -1894,21 +1894,19 @@ static int do_signal_stop(int signr)
- 		 */
- 		if (!(sig->flags & SIGNAL_STOP_STOPPED))
- 			sig->group_exit_code = signr;
--		else
--			WARN_ON_ONCE(!task_ptrace(current));
- 
- 		current->group_stop &= ~GROUP_STOP_SIGMASK;
- 		current->group_stop |= signr | gstop;
- 		sig->group_stop_count = 1;
- 		for (t = next_thread(current); t != current;
- 		     t = next_thread(t)) {
--			t->group_stop &= ~GROUP_STOP_SIGMASK;
- 			/*
- 			 * Setting state to TASK_STOPPED for a group
- 			 * stop is always done with the siglock held,
- 			 * so this check has no races.
- 			 */
- 			if (!(t->flags & PF_EXITING) && !task_is_stopped(t)) {
-+				t->group_stop &= ~GROUP_STOP_SIGMASK;
- 				t->group_stop |= signr | gstop;
- 				sig->group_stop_count++;
- 				signal_wake_up(t, 0);
-diff --git a/kernel/time.c b/kernel/time.c
-index 8e8dc6d..d776062 100644
---- a/kernel/time.c
-+++ b/kernel/time.c
-@@ -575,7 +575,7 @@ EXPORT_SYMBOL(jiffies_to_timeval);
- /*
-  * Convert jiffies/jiffies_64 to clock_t and back.
-  */
--clock_t jiffies_to_clock_t(long x)
-+clock_t jiffies_to_clock_t(unsigned long x)
- {
- #if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
- # if HZ < USER_HZ
-diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index ee9c921..0731e81a 100644
---- a/kernel/trace/trace.c
-+++ b/kernel/trace/trace.c
-@@ -3704,8 +3704,6 @@ tracing_buffers_read(struct file *filp, char __user *ubuf,
- 	if (info->read < PAGE_SIZE)
- 		goto read;
- 
--	info->read = 0;
--
- 	trace_access_lock(info->cpu);
- 	ret = ring_buffer_read_page(info->tr->buffer,
- 				    &info->spare,
-@@ -3715,6 +3713,8 @@ tracing_buffers_read(struct file *filp, char __user *ubuf,
- 	if (ret < 0)
- 		return 0;
- 
-+	info->read = 0;
-+
- read:
- 	size = PAGE_SIZE - info->read;
- 	if (size > count)
-diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
-index 70af0a7..ad72a03 100644
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -282,7 +282,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
- 							    kobj_bcast_filter,
- 							    kobj);
- 			/* ENOBUFS should be handled in userspace */
--			if (retval == -ENOBUFS)
-+			if (retval == -ENOBUFS || retval == -ESRCH)
- 				retval = 0;
- 		} else
- 			retval = -ENOMEM;
-diff --git a/lib/nlattr.c b/lib/nlattr.c
-index ac09f22..a8408b6 100644
---- a/lib/nlattr.c
-+++ b/lib/nlattr.c
-@@ -20,6 +20,7 @@ static const u16 nla_attr_minlen[NLA_TYPE_MAX+1] = {
- 	[NLA_U16]	= sizeof(u16),
- 	[NLA_U32]	= sizeof(u32),
- 	[NLA_U64]	= sizeof(u64),
-+	[NLA_MSECS]	= sizeof(u64),
- 	[NLA_NESTED]	= NLA_HDRLEN,
- };
- 
-diff --git a/mm/huge_memory.c b/mm/huge_memory.c
-index 81532f2..cc5acf9 100644
---- a/mm/huge_memory.c
-+++ b/mm/huge_memory.c
-@@ -989,7 +989,7 @@ struct page *follow_trans_huge_pmd(struct mm_struct *mm,
- 	page += (addr & ~HPAGE_PMD_MASK) >> PAGE_SHIFT;
- 	VM_BUG_ON(!PageCompound(page));
- 	if (flags & FOLL_GET)
--		get_page(page);
-+		get_page_foll(page);
- 
- out:
- 	return page;
-@@ -1156,6 +1156,7 @@ static void __split_huge_page_refcount(struct page *page)
- 	unsigned long head_index = page->index;
- 	struct zone *zone = page_zone(page);
- 	int zonestat;
-+	int tail_count = 0;
- 
- 	/* prevent PageLRU to go away from under us, and freeze lru stats */
- 	spin_lock_irq(&zone->lru_lock);
-@@ -1164,11 +1165,27 @@ static void __split_huge_page_refcount(struct page *page)
- 	for (i = 1; i < HPAGE_PMD_NR; i++) {
- 		struct page *page_tail = page + i;
- 
--		/* tail_page->_count cannot change */
--		atomic_sub(atomic_read(&page_tail->_count), &page->_count);
--		BUG_ON(page_count(page) <= 0);
--		atomic_add(page_mapcount(page) + 1, &page_tail->_count);
--		BUG_ON(atomic_read(&page_tail->_count) <= 0);
-+		/* tail_page->_mapcount cannot change */
-+		BUG_ON(page_mapcount(page_tail) < 0);
-+		tail_count += page_mapcount(page_tail);
-+		/* check for overflow */
-+		BUG_ON(tail_count < 0);
-+		BUG_ON(atomic_read(&page_tail->_count) != 0);
-+		/*
-+		 * tail_page->_count is zero and not changing from
-+		 * under us. But get_page_unless_zero() may be running
-+		 * from under us on the tail_page. If we used
-+		 * atomic_set() below instead of atomic_add(), we
-+		 * would then run atomic_set() concurrently with
-+		 * get_page_unless_zero(), and atomic_set() is
-+		 * implemented in C not using locked ops. spin_unlock
-+		 * on x86 sometime uses locked ops because of PPro
-+		 * errata 66, 92, so unless somebody can guarantee
-+		 * atomic_set() here would be safe on all archs (and
-+		 * not only on x86), it's safer to use atomic_add().
-+		 */
-+		atomic_add(page_mapcount(page) + page_mapcount(page_tail) + 1,
-+			   &page_tail->_count);
- 
- 		/* after clearing PageTail the gup refcount can be released */
- 		smp_mb();
-@@ -1186,10 +1203,7 @@ static void __split_huge_page_refcount(struct page *page)
- 				      (1L << PG_uptodate)));
- 		page_tail->flags |= (1L << PG_dirty);
- 
--		/*
--		 * 1) clear PageTail before overwriting first_page
--		 * 2) clear PageTail before clearing PageHead for VM_BUG_ON
--		 */
-+		/* clear PageTail before overwriting first_page */
- 		smp_wmb();
- 
- 		/*
-@@ -1206,7 +1220,6 @@ static void __split_huge_page_refcount(struct page *page)
- 		 * status is achieved setting a reserved bit in the
- 		 * pmd, not by clearing the present bit.
- 		*/
--		BUG_ON(page_mapcount(page_tail));
- 		page_tail->_mapcount = page->_mapcount;
- 
- 		BUG_ON(page_tail->mapping);
-@@ -1223,6 +1236,8 @@ static void __split_huge_page_refcount(struct page *page)
- 
- 		lru_add_page_tail(zone, page, page_tail);
- 	}
-+	atomic_sub(tail_count, &page->_count);
-+	BUG_ON(atomic_read(&page->_count) <= 0);
- 
- 	__dec_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES);
- 	__mod_zone_page_state(zone, NR_ANON_PAGES, HPAGE_PMD_NR);
-diff --git a/mm/internal.h b/mm/internal.h
-index d071d38..2189af4 100644
---- a/mm/internal.h
-+++ b/mm/internal.h
-@@ -37,6 +37,52 @@ static inline void __put_page(struct page *page)
- 	atomic_dec(&page->_count);
- }
- 
-+static inline void __get_page_tail_foll(struct page *page,
-+					bool get_page_head)
-+{
-+	/*
-+	 * If we're getting a tail page, the elevated page->_count is
-+	 * required only in the head page and we will elevate the head
-+	 * page->_count and tail page->_mapcount.
-+	 *
-+	 * We elevate page_tail->_mapcount for tail pages to force
-+	 * page_tail->_count to be zero at all times to avoid getting
-+	 * false positives from get_page_unless_zero() with
-+	 * speculative page access (like in
-+	 * page_cache_get_speculative()) on tail pages.
-+	 */
-+	VM_BUG_ON(atomic_read(&page->first_page->_count) <= 0);
-+	VM_BUG_ON(atomic_read(&page->_count) != 0);
-+	VM_BUG_ON(page_mapcount(page) < 0);
-+	if (get_page_head)
-+		atomic_inc(&page->first_page->_count);
-+	atomic_inc(&page->_mapcount);
-+}
-+
-+/*
-+ * This is meant to be called as the FOLL_GET operation of
-+ * follow_page() and it must be called while holding the proper PT
-+ * lock while the pte (or pmd_trans_huge) is still mapping the page.
-+ */
-+static inline void get_page_foll(struct page *page)
-+{
-+	if (unlikely(PageTail(page)))
-+		/*
-+		 * This is safe only because
-+		 * __split_huge_page_refcount() can't run under
-+		 * get_page_foll() because we hold the proper PT lock.
-+		 */
-+		__get_page_tail_foll(page, true);
-+	else {
-+		/*
-+		 * Getting a normal page or the head of a compound page
-+		 * requires to already have an elevated page->_count.
-+		 */
-+		VM_BUG_ON(atomic_read(&page->_count) <= 0);
-+		atomic_inc(&page->_count);
-+	}
-+}
-+
- extern unsigned long highest_memmap_pfn;
- 
- /*
-diff --git a/mm/memory.c b/mm/memory.c
-index d961e19..95a7799 100644
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -1514,7 +1514,7 @@ split_fallthrough:
- 	}
- 
- 	if (flags & FOLL_GET)
--		get_page(page);
-+		get_page_foll(page);
- 	if (flags & FOLL_TOUCH) {
- 		if ((flags & FOLL_WRITE) &&
- 		    !pte_dirty(pte) && !PageDirty(page))
-diff --git a/mm/swap.c b/mm/swap.c
-index 3a442f1..87627f1 100644
---- a/mm/swap.c
-+++ b/mm/swap.c
-@@ -78,39 +78,22 @@ static void put_compound_page(struct page *page)
- {
- 	if (unlikely(PageTail(page))) {
- 		/* __split_huge_page_refcount can run under us */
--		struct page *page_head = page->first_page;
--		smp_rmb();
--		/*
--		 * If PageTail is still set after smp_rmb() we can be sure
--		 * that the page->first_page we read wasn't a dangling pointer.
--		 * See __split_huge_page_refcount() smp_wmb().
--		 */
--		if (likely(PageTail(page) && get_page_unless_zero(page_head))) {
-+		struct page *page_head = compound_trans_head(page);
-+
-+		if (likely(page != page_head &&
-+			   get_page_unless_zero(page_head))) {
- 			unsigned long flags;
- 			/*
--			 * Verify that our page_head wasn't converted
--			 * to a a regular page before we got a
--			 * reference on it.
-+			 * page_head wasn't a dangling pointer but it
-+			 * may not be a head page anymore by the time
-+			 * we obtain the lock. That is ok as long as it
-+			 * can't be freed from under us.
- 			 */
--			if (unlikely(!PageHead(page_head))) {
--				/* PageHead is cleared after PageTail */
--				smp_rmb();
--				VM_BUG_ON(PageTail(page));
--				goto out_put_head;
--			}
--			/*
--			 * Only run compound_lock on a valid PageHead,
--			 * after having it pinned with
--			 * get_page_unless_zero() above.
--			 */
--			smp_mb();
--			/* page_head wasn't a dangling pointer */
- 			flags = compound_lock_irqsave(page_head);
- 			if (unlikely(!PageTail(page))) {
- 				/* __split_huge_page_refcount run before us */
- 				compound_unlock_irqrestore(page_head, flags);
- 				VM_BUG_ON(PageHead(page_head));
--			out_put_head:
- 				if (put_page_testzero(page_head))
- 					__put_single_page(page_head);
- 			out_put_single:
-@@ -121,16 +104,17 @@ static void put_compound_page(struct page *page)
- 			VM_BUG_ON(page_head != page->first_page);
- 			/*
- 			 * We can release the refcount taken by
--			 * get_page_unless_zero now that
--			 * split_huge_page_refcount is blocked on the
--			 * compound_lock.
-+			 * get_page_unless_zero() now that
-+			 * __split_huge_page_refcount() is blocked on
-+			 * the compound_lock.
- 			 */
- 			if (put_page_testzero(page_head))
- 				VM_BUG_ON(1);
- 			/* __split_huge_page_refcount will wait now */
--			VM_BUG_ON(atomic_read(&page->_count) <= 0);
--			atomic_dec(&page->_count);
-+			VM_BUG_ON(page_mapcount(page) <= 0);
-+			atomic_dec(&page->_mapcount);
- 			VM_BUG_ON(atomic_read(&page_head->_count) <= 0);
-+			VM_BUG_ON(atomic_read(&page->_count) != 0);
- 			compound_unlock_irqrestore(page_head, flags);
- 			if (put_page_testzero(page_head)) {
- 				if (PageHead(page_head))
-@@ -160,6 +144,45 @@ void put_page(struct page *page)
- }
- EXPORT_SYMBOL(put_page);
- 
-+/*
-+ * This function is exported but must not be called by anything other
-+ * than get_page(). It implements the slow path of get_page().
-+ */
-+bool __get_page_tail(struct page *page)
-+{
-+	/*
-+	 * This takes care of get_page() if run on a tail page
-+	 * returned by one of the get_user_pages/follow_page variants.
-+	 * get_user_pages/follow_page itself doesn't need the compound
-+	 * lock because it runs __get_page_tail_foll() under the
-+	 * proper PT lock that already serializes against
-+	 * split_huge_page().
-+	 */
-+	unsigned long flags;
-+	bool got = false;
-+	struct page *page_head = compound_trans_head(page);
-+
-+	if (likely(page != page_head && get_page_unless_zero(page_head))) {
-+		/*
-+		 * page_head wasn't a dangling pointer but it
-+		 * may not be a head page anymore by the time
-+		 * we obtain the lock. That is ok as long as it
-+		 * can't be freed from under us.
-+		 */
-+		flags = compound_lock_irqsave(page_head);
-+		/* here __split_huge_page_refcount won't run anymore */
-+		if (likely(PageTail(page))) {
-+			__get_page_tail_foll(page, false);
-+			got = true;
-+		}
-+		compound_unlock_irqrestore(page_head, flags);
-+		if (unlikely(!got))
-+			put_page(page_head);
-+	}
-+	return got;
-+}
-+EXPORT_SYMBOL(__get_page_tail);
-+
- /**
-  * put_pages_list() - release a list of pages
-  * @pages: list of pages threaded on page->lru
-diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index 45ece89..65d5fd2 100644
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1267,18 +1267,22 @@ EXPORT_SYMBOL_GPL(map_vm_area);
- DEFINE_RWLOCK(vmlist_lock);
- struct vm_struct *vmlist;
- 
--static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va,
-+static void setup_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va,
- 			      unsigned long flags, void *caller)
- {
--	struct vm_struct *tmp, **p;
--
- 	vm->flags = flags;
- 	vm->addr = (void *)va->va_start;
- 	vm->size = va->va_end - va->va_start;
- 	vm->caller = caller;
- 	va->private = vm;
- 	va->flags |= VM_VM_AREA;
-+}
-+
-+static void insert_vmalloc_vmlist(struct vm_struct *vm)
-+{
-+	struct vm_struct *tmp, **p;
- 
-+	vm->flags &= ~VM_UNLIST;
- 	write_lock(&vmlist_lock);
- 	for (p = &vmlist; (tmp = *p) != NULL; p = &tmp->next) {
- 		if (tmp->addr >= vm->addr)
-@@ -1289,6 +1293,13 @@ static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va,
- 	write_unlock(&vmlist_lock);
- }
- 
-+static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va,
-+			      unsigned long flags, void *caller)
-+{
-+	setup_vmalloc_vm(vm, va, flags, caller);
-+	insert_vmalloc_vmlist(vm);
-+}
-+
- static struct vm_struct *__get_vm_area_node(unsigned long size,
- 		unsigned long align, unsigned long flags, unsigned long start,
- 		unsigned long end, int node, gfp_t gfp_mask, void *caller)
-@@ -1327,7 +1338,18 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
- 		return NULL;
- 	}
- 
--	insert_vmalloc_vm(area, va, flags, caller);
-+	/*
-+	 * When this function is called from __vmalloc_node_range,
-+	 * we do not add vm_struct to vmlist here to avoid
-+	 * accessing uninitialized members of vm_struct such as
-+	 * pages and nr_pages fields. They will be set later.
-+	 * To distinguish it from others, we use a VM_UNLIST flag.
-+	 */
-+	if (flags & VM_UNLIST)
-+		setup_vmalloc_vm(area, va, flags, caller);
-+	else
-+		insert_vmalloc_vm(area, va, flags, caller);
-+
- 	return area;
- }
- 
-@@ -1395,17 +1417,20 @@ struct vm_struct *remove_vm_area(const void *addr)
- 	va = find_vmap_area((unsigned long)addr);
- 	if (va && va->flags & VM_VM_AREA) {
- 		struct vm_struct *vm = va->private;
--		struct vm_struct *tmp, **p;
--		/*
--		 * remove from list and disallow access to this vm_struct
--		 * before unmap. (address range confliction is maintained by
--		 * vmap.)
--		 */
--		write_lock(&vmlist_lock);
--		for (p = &vmlist; (tmp = *p) != vm; p = &tmp->next)
--			;
--		*p = tmp->next;
--		write_unlock(&vmlist_lock);
-+
-+		if (!(vm->flags & VM_UNLIST)) {
-+			struct vm_struct *tmp, **p;
-+			/*
-+			 * remove from list and disallow access to
-+			 * this vm_struct before unmap. (address range
-+			 * confliction is maintained by vmap.)
-+			 */
-+			write_lock(&vmlist_lock);
-+			for (p = &vmlist; (tmp = *p) != vm; p = &tmp->next)
-+				;
-+			*p = tmp->next;
-+			write_unlock(&vmlist_lock);
-+		}
- 
- 		vmap_debug_free_range(va->va_start, va->va_end);
- 		free_unmap_vmap_area(va);
-@@ -1616,8 +1641,8 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
- 	if (!size || (size >> PAGE_SHIFT) > totalram_pages)
- 		return NULL;
- 
--	area = __get_vm_area_node(size, align, VM_ALLOC, start, end, node,
--				  gfp_mask, caller);
-+	area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
-+				  start, end, node, gfp_mask, caller);
- 
- 	if (!area)
- 		return NULL;
-@@ -1625,6 +1650,12 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
- 	addr = __vmalloc_area_node(area, gfp_mask, prot, node, caller);
- 
- 	/*
-+	 * In this function, newly allocated vm_struct is not added
-+	 * to vmlist at __get_vm_area_node(). so, it is added here.
-+	 */
-+	insert_vmalloc_vmlist(area);
-+
-+	/*
- 	 * A ref_count = 3 is needed because the vm_struct and vmap_area
- 	 * structures allocated in the __get_vm_area_node() function contain
- 	 * references to the virtual address of the vmalloc'ed block.
-diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
-index 32b8f9f..ff3ed60 100644
---- a/net/bridge/br_device.c
-+++ b/net/bridge/br_device.c
-@@ -91,7 +91,6 @@ static int br_dev_open(struct net_device *dev)
- {
- 	struct net_bridge *br = netdev_priv(dev);
- 
--	netif_carrier_off(dev);
- 	netdev_update_features(dev);
- 	netif_start_queue(dev);
- 	br_stp_enable_bridge(br);
-@@ -108,8 +107,6 @@ static int br_dev_stop(struct net_device *dev)
- {
- 	struct net_bridge *br = netdev_priv(dev);
- 
--	netif_carrier_off(dev);
--
- 	br_stp_disable_bridge(br);
- 	br_multicast_stop(br);
- 
-diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
-index 6f156c1..4490873 100644
---- a/net/bridge/br_if.c
-+++ b/net/bridge/br_if.c
-@@ -161,9 +161,10 @@ static void del_nbp(struct net_bridge_port *p)
- 	call_rcu(&p->rcu, destroy_nbp_rcu);
- }
- 
--/* called with RTNL */
--static void del_br(struct net_bridge *br, struct list_head *head)
-+/* Delete bridge device */
-+void br_dev_delete(struct net_device *dev, struct list_head *head)
- {
-+	struct net_bridge *br = netdev_priv(dev);
- 	struct net_bridge_port *p, *n;
- 
- 	list_for_each_entry_safe(p, n, &br->port_list, list) {
-@@ -268,7 +269,7 @@ int br_del_bridge(struct net *net, const char *name)
- 	}
- 
- 	else
--		del_br(netdev_priv(dev), NULL);
-+		br_dev_delete(dev, NULL);
- 
- 	rtnl_unlock();
- 	return ret;
-@@ -445,7 +446,7 @@ void __net_exit br_net_exit(struct net *net)
- 	rtnl_lock();
- 	for_each_netdev(net, dev)
- 		if (dev->priv_flags & IFF_EBRIDGE)
--			del_br(netdev_priv(dev), &list);
-+			br_dev_delete(dev, &list);
- 
- 	unregister_netdevice_many(&list);
- 	rtnl_unlock();
-diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
-index ffb0dc4..2c16055 100644
---- a/net/bridge/br_netlink.c
-+++ b/net/bridge/br_netlink.c
-@@ -208,6 +208,7 @@ static struct rtnl_link_ops br_link_ops __read_mostly = {
- 	.priv_size	= sizeof(struct net_bridge),
- 	.setup		= br_dev_setup,
- 	.validate	= br_validate,
-+	.dellink	= br_dev_delete,
- };
- 
- int __init br_netlink_init(void)
-diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index 78cc364..857a021 100644
---- a/net/bridge/br_private.h
-+++ b/net/bridge/br_private.h
-@@ -294,6 +294,7 @@ static inline int br_is_root_bridge(const struct net_bridge *br)
- 
- /* br_device.c */
- extern void br_dev_setup(struct net_device *dev);
-+extern void br_dev_delete(struct net_device *dev, struct list_head *list);
- extern netdev_tx_t br_dev_xmit(struct sk_buff *skb,
- 			       struct net_device *dev);
- #ifdef CONFIG_NET_POLL_CONTROLLER
-diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
-index 682c0fe..dbdaa95 100644
---- a/net/caif/caif_dev.c
-+++ b/net/caif/caif_dev.c
-@@ -209,8 +209,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
- 	enum cfcnfg_phy_preference pref;
- 	enum cfcnfg_phy_type phy_type;
- 	struct cfcnfg *cfg;
--	struct caif_device_entry_list *caifdevs =
--	    caif_device_list(dev_net(dev));
-+	struct caif_device_entry_list *caifdevs;
- 
- 	if (dev->type != ARPHRD_CAIF)
- 		return 0;
-@@ -219,6 +218,8 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
- 	if (cfg == NULL)
- 		return 0;
- 
-+	caifdevs = caif_device_list(dev_net(dev));
-+
- 	switch (what) {
- 	case NETDEV_REGISTER:
- 		caifd = caif_device_alloc(dev);
-diff --git a/net/can/bcm.c b/net/can/bcm.c
-index 184a657..c6cc66f 100644
---- a/net/can/bcm.c
-+++ b/net/can/bcm.c
-@@ -343,6 +343,18 @@ static void bcm_send_to_user(struct bcm_op *op, struct bcm_msg_head *head,
- 	}
- }
- 
-+static void bcm_tx_start_timer(struct bcm_op *op)
-+{
-+	if (op->kt_ival1.tv64 && op->count)
-+		hrtimer_start(&op->timer,
-+			      ktime_add(ktime_get(), op->kt_ival1),
-+			      HRTIMER_MODE_ABS);
-+	else if (op->kt_ival2.tv64)
-+		hrtimer_start(&op->timer,
-+			      ktime_add(ktime_get(), op->kt_ival2),
-+			      HRTIMER_MODE_ABS);
-+}
-+
- static void bcm_tx_timeout_tsklet(unsigned long data)
- {
- 	struct bcm_op *op = (struct bcm_op *)data;
-@@ -364,26 +376,12 @@ static void bcm_tx_timeout_tsklet(unsigned long data)
- 
- 			bcm_send_to_user(op, &msg_head, NULL, 0);
- 		}
--	}
--
--	if (op->kt_ival1.tv64 && (op->count > 0)) {
--
--		/* send (next) frame */
- 		bcm_can_tx(op);
--		hrtimer_start(&op->timer,
--			      ktime_add(ktime_get(), op->kt_ival1),
--			      HRTIMER_MODE_ABS);
- 
--	} else {
--		if (op->kt_ival2.tv64) {
-+	} else if (op->kt_ival2.tv64)
-+		bcm_can_tx(op);
- 
--			/* send (next) frame */
--			bcm_can_tx(op);
--			hrtimer_start(&op->timer,
--				      ktime_add(ktime_get(), op->kt_ival2),
--				      HRTIMER_MODE_ABS);
--		}
--	}
-+	bcm_tx_start_timer(op);
- }
- 
- /*
-@@ -963,23 +961,20 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
- 			hrtimer_cancel(&op->timer);
- 	}
- 
--	if ((op->flags & STARTTIMER) &&
--	    ((op->kt_ival1.tv64 && op->count) || op->kt_ival2.tv64)) {
--
-+	if (op->flags & STARTTIMER) {
-+		hrtimer_cancel(&op->timer);
- 		/* spec: send can_frame when starting timer */
- 		op->flags |= TX_ANNOUNCE;
--
--		if (op->kt_ival1.tv64 && (op->count > 0)) {
--			/* op->count-- is done in bcm_tx_timeout_handler */
--			hrtimer_start(&op->timer, op->kt_ival1,
--				      HRTIMER_MODE_REL);
--		} else
--			hrtimer_start(&op->timer, op->kt_ival2,
--				      HRTIMER_MODE_REL);
- 	}
- 
--	if (op->flags & TX_ANNOUNCE)
-+	if (op->flags & TX_ANNOUNCE) {
- 		bcm_can_tx(op);
-+		if (op->count)
-+			op->count--;
-+	}
-+
-+	if (op->flags & STARTTIMER)
-+		bcm_tx_start_timer(op);
- 
- 	return msg_head->nframes * CFSIZ + MHSIZ;
- }
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 9c58c1e..f14f601 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -6105,6 +6105,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
- 	*/
- 	call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
- 	call_netdevice_notifiers(NETDEV_UNREGISTER_BATCH, dev);
-+	rtmsg_ifinfo(RTM_DELLINK, dev, ~0U);
- 
- 	/*
- 	 *	Flush the unicast and multicast chains
-diff --git a/net/core/flow.c b/net/core/flow.c
-index 990703b..a6bda2a 100644
---- a/net/core/flow.c
-+++ b/net/core/flow.c
-@@ -172,29 +172,26 @@ static void flow_new_hash_rnd(struct flow_cache *fc,
- 
- static u32 flow_hash_code(struct flow_cache *fc,
- 			  struct flow_cache_percpu *fcp,
--			  const struct flowi *key)
-+			  const struct flowi *key,
-+			  size_t keysize)
- {
- 	const u32 *k = (const u32 *) key;
-+	const u32 length = keysize * sizeof(flow_compare_t) / sizeof(u32);
- 
--	return jhash2(k, (sizeof(*key) / sizeof(u32)), fcp->hash_rnd)
-+	return jhash2(k, length, fcp->hash_rnd)
- 		& (flow_cache_hash_size(fc) - 1);
- }
- 
--typedef unsigned long flow_compare_t;
--
- /* I hear what you're saying, use memcmp.  But memcmp cannot make
-- * important assumptions that we can here, such as alignment and
-- * constant size.
-+ * important assumptions that we can here, such as alignment.
-  */
--static int flow_key_compare(const struct flowi *key1, const struct flowi *key2)
-+static int flow_key_compare(const struct flowi *key1, const struct flowi *key2,
-+			    size_t keysize)
- {
- 	const flow_compare_t *k1, *k1_lim, *k2;
--	const int n_elem = sizeof(struct flowi) / sizeof(flow_compare_t);
--
--	BUILD_BUG_ON(sizeof(struct flowi) % sizeof(flow_compare_t));
- 
- 	k1 = (const flow_compare_t *) key1;
--	k1_lim = k1 + n_elem;
-+	k1_lim = k1 + keysize;
- 
- 	k2 = (const flow_compare_t *) key2;
- 
-@@ -215,6 +212,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
- 	struct flow_cache_entry *fle, *tfle;
- 	struct hlist_node *entry;
- 	struct flow_cache_object *flo;
-+	size_t keysize;
- 	unsigned int hash;
- 
- 	local_bh_disable();
-@@ -222,6 +220,11 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
- 
- 	fle = NULL;
- 	flo = NULL;
-+
-+	keysize = flow_key_size(family);
-+	if (!keysize)
-+		goto nocache;
-+
- 	/* Packet really early in init?  Making flow_cache_init a
- 	 * pre-smp initcall would solve this.  --RR */
- 	if (!fcp->hash_table)
-@@ -230,11 +233,11 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
- 	if (fcp->hash_rnd_recalc)
- 		flow_new_hash_rnd(fc, fcp);
- 
--	hash = flow_hash_code(fc, fcp, key);
-+	hash = flow_hash_code(fc, fcp, key, keysize);
- 	hlist_for_each_entry(tfle, entry, &fcp->hash_table[hash], u.hlist) {
- 		if (tfle->family == family &&
- 		    tfle->dir == dir &&
--		    flow_key_compare(key, &tfle->key) == 0) {
-+		    flow_key_compare(key, &tfle->key, keysize) == 0) {
- 			fle = tfle;
- 			break;
- 		}
-@@ -248,7 +251,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
- 		if (fle) {
- 			fle->family = family;
- 			fle->dir = dir;
--			memcpy(&fle->key, key, sizeof(*key));
-+			memcpy(&fle->key, key, keysize * sizeof(flow_compare_t));
- 			fle->object = NULL;
- 			hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
- 			fcp->hash_count++;
-diff --git a/net/core/sock.c b/net/core/sock.c
-index 6e81978..aebb419 100644
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -1257,6 +1257,7 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority)
- 			/* It is still raw copy of parent, so invalidate
- 			 * destructor and make plain sk_free() */
- 			newsk->sk_destruct = NULL;
-+			bh_unlock_sock(newsk);
- 			sk_free(newsk);
- 			newsk = NULL;
- 			goto out;
-diff --git a/net/core/timestamping.c b/net/core/timestamping.c
-index 7e7ca37..97d036a 100644
---- a/net/core/timestamping.c
-+++ b/net/core/timestamping.c
-@@ -57,9 +57,13 @@ void skb_clone_tx_timestamp(struct sk_buff *skb)
- 	case PTP_CLASS_V2_VLAN:
- 		phydev = skb->dev->phydev;
- 		if (likely(phydev->drv->txtstamp)) {
-+			if (!atomic_inc_not_zero(&sk->sk_refcnt))
-+				return;
- 			clone = skb_clone(skb, GFP_ATOMIC);
--			if (!clone)
-+			if (!clone) {
-+				sock_put(sk);
- 				return;
-+			}
- 			clone->sk = sk;
- 			phydev->drv->txtstamp(phydev, clone, type);
- 		}
-@@ -76,8 +80,11 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
- 	struct sock_exterr_skb *serr;
- 	int err;
- 
--	if (!hwtstamps)
-+	if (!hwtstamps) {
-+		sock_put(sk);
-+		kfree_skb(skb);
- 		return;
-+	}
- 
- 	*skb_hwtstamps(skb) = *hwtstamps;
- 	serr = SKB_EXT_ERR(skb);
-@@ -86,6 +93,7 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
- 	serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING;
- 	skb->sk = NULL;
- 	err = sock_queue_err_skb(sk, skb);
-+	sock_put(sk);
- 	if (err)
- 		kfree_skb(skb);
- }
-diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index b6771f9..c68040f 100644
---- a/net/ipv4/tcp_input.c
-+++ b/net/ipv4/tcp_input.c
-@@ -1380,9 +1380,7 @@ static int tcp_shifted_skb(struct sock *sk, struct sk_buff *skb,
- 
- 	BUG_ON(!pcount);
- 
--	/* Tweak before seqno plays */
--	if (!tcp_is_fack(tp) && tcp_is_sack(tp) && tp->lost_skb_hint &&
--	    !before(TCP_SKB_CB(tp->lost_skb_hint)->seq, TCP_SKB_CB(skb)->seq))
-+	if (skb == tp->lost_skb_hint)
- 		tp->lost_cnt_hint += pcount;
- 
- 	TCP_SKB_CB(prev)->end_seq += shifted;
-diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
-index b3e6956..69790aa 100644
---- a/net/ipv4/tcp_ipv4.c
-+++ b/net/ipv4/tcp_ipv4.c
-@@ -909,18 +909,21 @@ int tcp_v4_md5_do_add(struct sock *sk, __be32 addr,
- 			}
- 			sk_nocaps_add(sk, NETIF_F_GSO_MASK);
- 		}
--		if (tcp_alloc_md5sig_pool(sk) == NULL) {
-+
-+		md5sig = tp->md5sig_info;
-+		if (md5sig->entries4 == 0 &&
-+		    tcp_alloc_md5sig_pool(sk) == NULL) {
- 			kfree(newkey);
- 			return -ENOMEM;
- 		}
--		md5sig = tp->md5sig_info;
- 
- 		if (md5sig->alloced4 == md5sig->entries4) {
- 			keys = kmalloc((sizeof(*keys) *
- 					(md5sig->entries4 + 1)), GFP_ATOMIC);
- 			if (!keys) {
- 				kfree(newkey);
--				tcp_free_md5sig_pool();
-+				if (md5sig->entries4 == 0)
-+					tcp_free_md5sig_pool();
- 				return -ENOMEM;
- 			}
- 
-@@ -964,6 +967,7 @@ int tcp_v4_md5_do_del(struct sock *sk, __be32 addr)
- 				kfree(tp->md5sig_info->keys4);
- 				tp->md5sig_info->keys4 = NULL;
- 				tp->md5sig_info->alloced4 = 0;
-+				tcp_free_md5sig_pool();
- 			} else if (tp->md5sig_info->entries4 != i) {
- 				/* Need to do some manipulation */
- 				memmove(&tp->md5sig_info->keys4[i],
-@@ -971,7 +975,6 @@ int tcp_v4_md5_do_del(struct sock *sk, __be32 addr)
- 					(tp->md5sig_info->entries4 - i) *
- 					 sizeof(struct tcp4_md5sig_key));
- 			}
--			tcp_free_md5sig_pool();
- 			return 0;
- 		}
- 	}
-diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
-index 981e43e..581fe0a 100644
---- a/net/ipv4/xfrm4_policy.c
-+++ b/net/ipv4/xfrm4_policy.c
-@@ -79,13 +79,13 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
- 	struct rtable *rt = (struct rtable *)xdst->route;
- 	const struct flowi4 *fl4 = &fl->u.ip4;
- 
--	rt->rt_key_dst = fl4->daddr;
--	rt->rt_key_src = fl4->saddr;
--	rt->rt_key_tos = fl4->flowi4_tos;
--	rt->rt_route_iif = fl4->flowi4_iif;
--	rt->rt_iif = fl4->flowi4_iif;
--	rt->rt_oif = fl4->flowi4_oif;
--	rt->rt_mark = fl4->flowi4_mark;
-+	xdst->u.rt.rt_key_dst = fl4->daddr;
-+	xdst->u.rt.rt_key_src = fl4->saddr;
-+	xdst->u.rt.rt_key_tos = fl4->flowi4_tos;
-+	xdst->u.rt.rt_route_iif = fl4->flowi4_iif;
-+	xdst->u.rt.rt_iif = fl4->flowi4_iif;
-+	xdst->u.rt.rt_oif = fl4->flowi4_oif;
-+	xdst->u.rt.rt_mark = fl4->flowi4_mark;
- 
- 	xdst->u.dst.dev = dev;
- 	dev_hold(dev);
-diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
-index 7c43e86..296510a 100644
---- a/net/ipv6/tcp_ipv6.c
-+++ b/net/ipv6/tcp_ipv6.c
-@@ -605,7 +605,8 @@ static int tcp_v6_md5_do_add(struct sock *sk, const struct in6_addr *peer,
- 			}
- 			sk_nocaps_add(sk, NETIF_F_GSO_MASK);
- 		}
--		if (tcp_alloc_md5sig_pool(sk) == NULL) {
-+		if (tp->md5sig_info->entries6 == 0 &&
-+			tcp_alloc_md5sig_pool(sk) == NULL) {
- 			kfree(newkey);
- 			return -ENOMEM;
- 		}
-@@ -614,8 +615,9 @@ static int tcp_v6_md5_do_add(struct sock *sk, const struct in6_addr *peer,
- 				       (tp->md5sig_info->entries6 + 1)), GFP_ATOMIC);
- 
- 			if (!keys) {
--				tcp_free_md5sig_pool();
- 				kfree(newkey);
-+				if (tp->md5sig_info->entries6 == 0)
-+					tcp_free_md5sig_pool();
- 				return -ENOMEM;
- 			}
- 
-@@ -661,6 +663,7 @@ static int tcp_v6_md5_do_del(struct sock *sk, const struct in6_addr *peer)
- 				kfree(tp->md5sig_info->keys6);
- 				tp->md5sig_info->keys6 = NULL;
- 				tp->md5sig_info->alloced6 = 0;
-+				tcp_free_md5sig_pool();
- 			} else {
- 				/* shrink the database */
- 				if (tp->md5sig_info->entries6 != i)
-@@ -669,7 +672,6 @@ static int tcp_v6_md5_do_del(struct sock *sk, const struct in6_addr *peer)
- 						(tp->md5sig_info->entries6 - i)
- 						* sizeof (tp->md5sig_info->keys6[0]));
- 			}
--			tcp_free_md5sig_pool();
- 			return 0;
- 		}
- 	}
-@@ -1407,6 +1409,8 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
- 		newtp->af_specific = &tcp_sock_ipv6_mapped_specific;
- #endif
- 
-+		newnp->ipv6_ac_list = NULL;
-+		newnp->ipv6_fl_list = NULL;
- 		newnp->pktoptions  = NULL;
- 		newnp->opt	   = NULL;
- 		newnp->mcast_oif   = inet6_iif(skb);
-@@ -1471,6 +1475,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
- 	   First: no IPv4 options.
- 	 */
- 	newinet->inet_opt = NULL;
-+	newnp->ipv6_ac_list = NULL;
- 	newnp->ipv6_fl_list = NULL;
- 
- 	/* Clone RX bits */
-diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
-index ed8a233..71c292e 100644
---- a/net/l2tp/l2tp_core.c
-+++ b/net/l2tp/l2tp_core.c
-@@ -1045,8 +1045,10 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len
- 	headroom = NET_SKB_PAD + sizeof(struct iphdr) +
- 		uhlen + hdr_len;
- 	old_headroom = skb_headroom(skb);
--	if (skb_cow_head(skb, headroom))
-+	if (skb_cow_head(skb, headroom)) {
-+		dev_kfree_skb(skb);
- 		goto abort;
-+	}
- 
- 	new_headroom = skb_headroom(skb);
- 	skb_orphan(skb);
-diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index be70c70..143a006 100644
---- a/net/mac80211/cfg.c
-+++ b/net/mac80211/cfg.c
-@@ -1798,7 +1798,7 @@ ieee80211_offchan_tx_done(struct ieee80211_work *wk, struct sk_buff *skb)
- 	 * so in that case userspace will have to deal with it.
- 	 */
- 
--	if (wk->offchan_tx.wait && wk->offchan_tx.frame)
-+	if (wk->offchan_tx.wait && !wk->offchan_tx.status)
- 		cfg80211_mgmt_tx_status(wk->sdata->dev,
- 					(unsigned long) wk->offchan_tx.frame,
- 					wk->ie, wk->ie_len, false, GFP_KERNEL);
-diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
-index 090b0ec..3fdac77 100644
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -328,6 +328,7 @@ struct ieee80211_work {
- 		struct {
- 			struct sk_buff *frame;
- 			u32 wait;
-+			bool status;
- 		} offchan_tx;
- 	};
- 
-@@ -372,6 +373,7 @@ struct ieee80211_if_managed {
- 
- 	unsigned long timers_running; /* used for quiesce/restart */
- 	bool powersave; /* powersave requested for this iface */
-+	bool broken_ap; /* AP is broken -- turn off powersave */
- 	enum ieee80211_smps_mode req_smps, /* requested smps mode */
- 				 ap_smps, /* smps mode AP thinks we're in */
- 				 driver_smps_mode; /* smps mode request */
-diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
-index 7a334fd..1563250 100644
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -613,6 +613,9 @@ static bool ieee80211_powersave_allowed(struct ieee80211_sub_if_data *sdata)
- 	if (!mgd->powersave)
- 		return false;
- 
-+	if (mgd->broken_ap)
-+		return false;
-+
- 	if (!mgd->associated)
- 		return false;
- 
-@@ -1450,10 +1453,21 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,
- 	capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info);
- 
- 	if ((aid & (BIT(15) | BIT(14))) != (BIT(15) | BIT(14)))
--		printk(KERN_DEBUG "%s: invalid aid value %d; bits 15:14 not "
--		       "set\n", sdata->name, aid);
-+		printk(KERN_DEBUG
-+		       "%s: invalid AID value 0x%x; bits 15:14 not set\n",
-+		       sdata->name, aid);
- 	aid &= ~(BIT(15) | BIT(14));
- 
-+	ifmgd->broken_ap = false;
-+
-+	if (aid == 0 || aid > IEEE80211_MAX_AID) {
-+		printk(KERN_DEBUG
-+		       "%s: invalid AID value %d (out of range), turn off PS\n",
-+		       sdata->name, aid);
-+		aid = 0;
-+		ifmgd->broken_ap = true;
-+	}
-+
- 	pos = mgmt->u.assoc_resp.variable;
- 	ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
- 
-diff --git a/net/mac80211/status.c b/net/mac80211/status.c
-index 1658efa..04cdbaf 100644
---- a/net/mac80211/status.c
-+++ b/net/mac80211/status.c
-@@ -336,7 +336,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
- 				continue;
- 			if (wk->offchan_tx.frame != skb)
- 				continue;
--			wk->offchan_tx.frame = NULL;
-+			wk->offchan_tx.status = true;
- 			break;
- 		}
- 		rcu_read_unlock();
-diff --git a/net/mac80211/work.c b/net/mac80211/work.c
-index d2e7f0e..52b758d 100644
---- a/net/mac80211/work.c
-+++ b/net/mac80211/work.c
-@@ -553,7 +553,7 @@ ieee80211_offchannel_tx(struct ieee80211_work *wk)
- 		/*
- 		 * After this, offchan_tx.frame remains but now is no
- 		 * longer a valid pointer -- we still need it as the
--		 * cookie for canceling this work.
-+		 * cookie for canceling this work/status matching.
- 		 */
- 		ieee80211_tx_skb(wk->sdata, wk->offchan_tx.frame);
- 
-@@ -1060,14 +1060,13 @@ static void ieee80211_work_work(struct work_struct *work)
- 			continue;
- 		if (wk->chan != local->tmp_channel)
- 			continue;
--		if (ieee80211_work_ct_coexists(wk->chan_type,
--					       local->tmp_channel_type))
-+		if (!ieee80211_work_ct_coexists(wk->chan_type,
-+						local->tmp_channel_type))
- 			continue;
- 		remain_off_channel = true;
- 	}
- 
- 	if (!remain_off_channel && local->tmp_channel) {
--		bool on_oper_chan = ieee80211_cfg_on_oper_channel(local);
- 		local->tmp_channel = NULL;
- 		/* If tmp_channel wasn't operating channel, then
- 		 * we need to go back on-channel.
-@@ -1077,7 +1076,7 @@ static void ieee80211_work_work(struct work_struct *work)
- 		 * we still need to do a hardware config.  Currently,
- 		 * we cannot be here while scanning, however.
- 		 */
--		if (ieee80211_cfg_on_oper_channel(local) && !on_oper_chan)
-+		if (!ieee80211_cfg_on_oper_channel(local))
- 			ieee80211_hw_config(local, 0);
- 
- 		/* At the least, we need to disable offchannel_ps,
-diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index c0c3cda..fafb968 100644
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -654,7 +654,10 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
- 	return 0;
- 
- drop_n_acct:
--	po->stats.tp_drops = atomic_inc_return(&sk->sk_drops);
-+	spin_lock(&sk->sk_receive_queue.lock);
-+	po->stats.tp_drops++;
-+	atomic_inc(&sk->sk_drops);
-+	spin_unlock(&sk->sk_receive_queue.lock);
- 
- drop_n_restore:
- 	if (skb_head != skb->data && skb_shared(skb)) {
-diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
-index 4cb70dc..e50502d 100644
---- a/net/sunrpc/auth_unix.c
-+++ b/net/sunrpc/auth_unix.c
-@@ -129,6 +129,9 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
- 	for (i = 0; i < groups ; i++)
- 		if (cred->uc_gids[i] != GROUP_AT(acred->group_info, i))
- 			return 0;
-+	if (groups < NFS_NGROUPS &&
-+	    cred->uc_gids[groups] != NOGROUP)
-+		return 0;
- 	return 1;
- }
- 
-diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
-index 5fdf10d..b1a3cee 100644
---- a/scripts/kconfig/menu.c
-+++ b/scripts/kconfig/menu.c
-@@ -596,11 +596,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
- 	struct symbol *sym = menu->sym;
- 
- 	if (menu_has_help(menu)) {
--		if (sym->name) {
-+		if (sym->name)
- 			str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
--			str_append(help, _(menu_get_help(menu)));
--			str_append(help, "\n");
--		}
-+		str_append(help, _(menu_get_help(menu)));
-+		str_append(help, "\n");
- 	} else {
- 		str_append(help, nohelp_text);
- 	}
-diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
-index cf1fa36..3c2381c 100644
---- a/sound/pci/hda/patch_conexant.c
-+++ b/sound/pci/hda/patch_conexant.c
-@@ -136,6 +136,7 @@ struct conexant_spec {
- 	unsigned int thinkpad:1;
- 	unsigned int hp_laptop:1;
- 	unsigned int asus:1;
-+	unsigned int single_adc_amp:1;
- 
- 	unsigned int adc_switching:1;
- 
-@@ -4205,6 +4206,8 @@ static int cx_auto_add_capture_volume(struct hda_codec *codec, hda_nid_t nid,
- 		int idx = get_input_connection(codec, adc_nid, nid);
- 		if (idx < 0)
- 			continue;
-+		if (spec->single_adc_amp)
-+			idx = 0;
- 		return cx_auto_add_volume_idx(codec, label, pfx,
- 					      cidx, adc_nid, HDA_INPUT, idx);
- 	}
-@@ -4245,14 +4248,21 @@ static int cx_auto_build_input_controls(struct hda_codec *codec)
- 	struct hda_input_mux *imux = &spec->private_imux;
- 	const char *prev_label;
- 	int input_conn[HDA_MAX_NUM_INPUTS];
--	int i, err, cidx;
-+	int i, j, err, cidx;
- 	int multi_connection;
- 
-+	if (!imux->num_items)
-+		return 0;
-+
- 	multi_connection = 0;
- 	for (i = 0; i < imux->num_items; i++) {
- 		cidx = get_input_connection(codec, spec->imux_info[i].adc,
- 					    spec->imux_info[i].pin);
--		input_conn[i] = (spec->imux_info[i].adc << 8) | cidx;
-+		if (cidx < 0)
-+			continue;
-+		input_conn[i] = spec->imux_info[i].adc;
-+		if (!spec->single_adc_amp)
-+			input_conn[i] |= cidx << 8;
- 		if (i > 0 && input_conn[i] != input_conn[0])
- 			multi_connection = 1;
- 	}
-@@ -4281,6 +4291,15 @@ static int cx_auto_build_input_controls(struct hda_codec *codec)
- 			err = cx_auto_add_capture_volume(codec, nid,
- 							 "Capture", "", cidx);
- 		} else {
-+			bool dup_found = false;
-+			for (j = 0; j < i; j++) {
-+				if (input_conn[j] == input_conn[i]) {
-+					dup_found = true;
-+					break;
-+				}
-+			}
-+			if (dup_found)
-+				continue;
- 			err = cx_auto_add_capture_volume(codec, nid,
- 							 label, " Capture", cidx);
- 		}
-@@ -4357,6 +4376,13 @@ static int patch_conexant_auto(struct hda_codec *codec)
- 		return -ENOMEM;
- 	codec->spec = spec;
- 	codec->pin_amp_workaround = 1;
-+
-+	switch (codec->vendor_id) {
-+	case 0x14f15045:
-+		spec->single_adc_amp = 1;
-+		break;
-+	}
-+
- 	err = cx_auto_search_adcs(codec);
- 	if (err < 0)
- 		return err;
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 4c7cd6b..e7dc034 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -2088,25 +2088,27 @@ static void alc_auto_init_digital(struct hda_codec *codec)
- static void alc_auto_parse_digital(struct hda_codec *codec)
- {
- 	struct alc_spec *spec = codec->spec;
--	int i, err;
-+	int i, err, nums;
- 	hda_nid_t dig_nid;
- 
- 	/* support multiple SPDIFs; the secondary is set up as a slave */
-+	nums = 0;
- 	for (i = 0; i < spec->autocfg.dig_outs; i++) {
- 		err = snd_hda_get_connections(codec,
- 					      spec->autocfg.dig_out_pins[i],
- 					      &dig_nid, 1);
--		if (err < 0)
-+		if (err <= 0)
- 			continue;
--		if (!i) {
-+		if (!nums) {
- 			spec->multiout.dig_out_nid = dig_nid;
- 			spec->dig_out_type = spec->autocfg.dig_out_type[0];
- 		} else {
- 			spec->multiout.slave_dig_outs = spec->slave_dig_outs;
--			if (i >= ARRAY_SIZE(spec->slave_dig_outs) - 1)
-+			if (nums >= ARRAY_SIZE(spec->slave_dig_outs) - 1)
- 				break;
--			spec->slave_dig_outs[i - 1] = dig_nid;
-+			spec->slave_dig_outs[nums - 1] = dig_nid;
- 		}
-+		nums++;
- 	}
- 
- 	if (spec->autocfg.dig_in_pin) {
-@@ -20126,6 +20128,8 @@ static const struct hda_codec_preset snd_hda_preset_realtek[] = {
- 	  .patch = patch_alc882 },
- 	{ .id = 0x10ec0662, .rev = 0x100101, .name = "ALC662 rev1",
- 	  .patch = patch_alc662 },
-+	{ .id = 0x10ec0662, .rev = 0x100300, .name = "ALC662 rev3",
-+	  .patch = patch_alc662 },
- 	{ .id = 0x10ec0663, .name = "ALC663", .patch = patch_alc662 },
- 	{ .id = 0x10ec0665, .name = "ALC665", .patch = patch_alc662 },
- 	{ .id = 0x10ec0670, .name = "ALC670", .patch = patch_alc662 },
-diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
-index 5c42f3e..5d2e97a 100644
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -5425,9 +5425,7 @@ static void stac92hd8x_fill_auto_spec(struct hda_codec *codec)
- static int patch_stac92hd83xxx(struct hda_codec *codec)
- {
- 	struct sigmatel_spec *spec;
--	hda_nid_t conn[STAC92HD83_DAC_COUNT + 1];
- 	int err;
--	int num_dacs;
- 
- 	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
- 	if (spec == NULL)
-@@ -5467,26 +5465,8 @@ again:
- 		stac92xx_set_config_regs(codec,
- 				stac92hd83xxx_brd_tbl[spec->board_config]);
- 
--	switch (codec->vendor_id) {
--	case 0x111d76d1:
--	case 0x111d76d9:
--	case 0x111d76df:
--	case 0x111d76e5:
--	case 0x111d7666:
--	case 0x111d7667:
--	case 0x111d7668:
--	case 0x111d7669:
--	case 0x111d76e3:
--	case 0x111d7604:
--	case 0x111d76d4:
--	case 0x111d7605:
--	case 0x111d76d5:
--	case 0x111d76e7:
--		if (spec->board_config == STAC_92HD83XXX_PWR_REF)
--			break;
-+	if (spec->board_config != STAC_92HD83XXX_PWR_REF)
- 		spec->num_pwrs = 0;
--		break;
--	}
- 
- 	codec->patch_ops = stac92xx_patch_ops;
- 
-@@ -5506,7 +5486,11 @@ again:
- 	}
- #endif	
- 
--	err = stac92xx_parse_auto_config(codec, 0x1d, 0);
-+	/* 92HD65/66 series has S/PDIF-IN */
-+	if (codec->vendor_id >= 0x111d76e8 && codec->vendor_id <= 0x111d76f3)
-+		err = stac92xx_parse_auto_config(codec, 0x1d, 0x22);
-+	else
-+		err = stac92xx_parse_auto_config(codec, 0x1d, 0);
- 	if (!err) {
- 		if (spec->board_config < 0) {
- 			printk(KERN_WARNING "hda_codec: No auto-config is "
-@@ -5522,22 +5506,6 @@ again:
- 		return err;
- 	}
- 
--	/* docking output support */
--	num_dacs = snd_hda_get_connections(codec, 0xF,
--				conn, STAC92HD83_DAC_COUNT + 1) - 1;
--	/* skip non-DAC connections */
--	while (num_dacs >= 0 &&
--			(get_wcaps_type(get_wcaps(codec, conn[num_dacs]))
--					!= AC_WID_AUD_OUT))
--		num_dacs--;
--	/* set port E and F to select the last DAC */
--	if (num_dacs >= 0) {
--		snd_hda_codec_write_cache(codec, 0xE, 0,
--			AC_VERB_SET_CONNECT_SEL, num_dacs);
--		snd_hda_codec_write_cache(codec, 0xF, 0,
--			AC_VERB_SET_CONNECT_SEL, num_dacs);
--	}
--
- 	codec->proc_widget_hook = stac92hd_proc_hook;
- 
- 	return 0;
-@@ -6405,6 +6373,18 @@ static const struct hda_codec_preset snd_hda_preset_sigmatel[] = {
- 	{ .id = 0x111d76e3, .name = "92HD98BXX", .patch = patch_stac92hd83xxx},
- 	{ .id = 0x111d76e5, .name = "92HD99BXX", .patch = patch_stac92hd83xxx},
- 	{ .id = 0x111d76e7, .name = "92HD90BXX", .patch = patch_stac92hd83xxx},
-+	{ .id = 0x111d76e8, .name = "92HD66B1X5", .patch = patch_stac92hd83xxx},
-+	{ .id = 0x111d76e9, .name = "92HD66B2X5", .patch = patch_stac92hd83xxx},
-+	{ .id = 0x111d76ea, .name = "92HD66B3X5", .patch = patch_stac92hd83xxx},
-+	{ .id = 0x111d76eb, .name = "92HD66C1X5", .patch = patch_stac92hd83xxx},
-+	{ .id = 0x111d76ec, .name = "92HD66C2X5", .patch = patch_stac92hd83xxx},
-+	{ .id = 0x111d76ed, .name = "92HD66C3X5", .patch = patch_stac92hd83xxx},
-+	{ .id = 0x111d76ee, .name = "92HD66B1X3", .patch = patch_stac92hd83xxx},
-+	{ .id = 0x111d76ef, .name = "92HD66B2X3", .patch = patch_stac92hd83xxx},
-+	{ .id = 0x111d76f0, .name = "92HD66B3X3", .patch = patch_stac92hd83xxx},
-+	{ .id = 0x111d76f1, .name = "92HD66C1X3", .patch = patch_stac92hd83xxx},
-+	{ .id = 0x111d76f2, .name = "92HD66C2X3", .patch = patch_stac92hd83xxx},
-+	{ .id = 0x111d76f3, .name = "92HD66C3/65", .patch = patch_stac92hd83xxx},
- 	{} /* terminator */
- };
- 
-diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c
-index e1a214e..65abd09 100644
---- a/sound/soc/codecs/ak4535.c
-+++ b/sound/soc/codecs/ak4535.c
-@@ -40,11 +40,11 @@ struct ak4535_priv {
- /*
-  * ak4535 register cache
-  */
--static const u16 ak4535_reg[AK4535_CACHEREGNUM] = {
--    0x0000, 0x0080, 0x0000, 0x0003,
--    0x0002, 0x0000, 0x0011, 0x0001,
--    0x0000, 0x0040, 0x0036, 0x0010,
--    0x0000, 0x0000, 0x0057, 0x0000,
-+static const u8 ak4535_reg[AK4535_CACHEREGNUM] = {
-+	0x00, 0x80, 0x00, 0x03,
-+	0x02, 0x00, 0x11, 0x01,
-+	0x00, 0x40, 0x36, 0x10,
-+	0x00, 0x00, 0x57, 0x00,
- };
- 
- /*
-diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
-index 65f4604..79c1b3d 100644
---- a/sound/soc/codecs/ak4642.c
-+++ b/sound/soc/codecs/ak4642.c
-@@ -162,17 +162,17 @@ struct ak4642_priv {
- /*
-  * ak4642 register cache
-  */
--static const u16 ak4642_reg[AK4642_CACHEREGNUM] = {
--	0x0000, 0x0000, 0x0001, 0x0000,
--	0x0002, 0x0000, 0x0000, 0x0000,
--	0x00e1, 0x00e1, 0x0018, 0x0000,
--	0x00e1, 0x0018, 0x0011, 0x0008,
--	0x0000, 0x0000, 0x0000, 0x0000,
--	0x0000, 0x0000, 0x0000, 0x0000,
--	0x0000, 0x0000, 0x0000, 0x0000,
--	0x0000, 0x0000, 0x0000, 0x0000,
--	0x0000, 0x0000, 0x0000, 0x0000,
--	0x0000,
-+static const u8 ak4642_reg[AK4642_CACHEREGNUM] = {
-+	0x00, 0x00, 0x01, 0x00,
-+	0x02, 0x00, 0x00, 0x00,
-+	0xe1, 0xe1, 0x18, 0x00,
-+	0xe1, 0x18, 0x11, 0x08,
-+	0x00, 0x00, 0x00, 0x00,
-+	0x00, 0x00, 0x00, 0x00,
-+	0x00, 0x00, 0x00, 0x00,
-+	0x00, 0x00, 0x00, 0x00,
-+	0x00, 0x00, 0x00, 0x00,
-+	0x00,
- };
- 
- /*
-diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
-index a537e4a..1dae5c4 100644
---- a/sound/soc/codecs/wm8711.c
-+++ b/sound/soc/codecs/wm8711.c
-@@ -150,7 +150,7 @@ static int wm8711_hw_params(struct snd_pcm_substream *substream,
- {
- 	struct snd_soc_codec *codec = dai->codec;
- 	struct wm8711_priv *wm8711 =  snd_soc_codec_get_drvdata(codec);
--	u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfffc;
-+	u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfff3;
- 	int i = get_coeff(wm8711->sysclk, params_rate(params));
- 	u16 srate = (coeff_div[i].sr << 2) |
- 		(coeff_div[i].bosr << 1) | coeff_div[i].usb;
-@@ -231,7 +231,7 @@ static int wm8711_set_dai_fmt(struct snd_soc_dai *codec_dai,
- 		unsigned int fmt)
- {
- 	struct snd_soc_codec *codec = codec_dai->codec;
--	u16 iface = 0;
-+	u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0x000c;
- 
- 	/* set master/slave audio interface */
- 	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c
-index 25af901..c173aee 100644
---- a/sound/soc/codecs/wm8741.c
-+++ b/sound/soc/codecs/wm8741.c
-@@ -337,10 +337,10 @@ static int wm8741_set_dai_fmt(struct snd_soc_dai *codec_dai,
- 		iface |= 0x0004;
- 		break;
- 	case SND_SOC_DAIFMT_DSP_A:
--		iface |= 0x0003;
-+		iface |= 0x000C;
- 		break;
- 	case SND_SOC_DAIFMT_DSP_B:
--		iface |= 0x0013;
-+		iface |= 0x001C;
- 		break;
- 	default:
- 		return -EINVAL;
-diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
-index 9b3bba4..0fce199 100644
---- a/sound/soc/codecs/wm8904.c
-+++ b/sound/soc/codecs/wm8904.c
-@@ -868,7 +868,7 @@ SOC_ENUM("Right Capture Mode", rin_mode),
- SOC_DOUBLE_R("Capture Volume", WM8904_ANALOGUE_LEFT_INPUT_0,
- 	     WM8904_ANALOGUE_RIGHT_INPUT_0, 0, 31, 0),
- SOC_DOUBLE_R("Capture Switch", WM8904_ANALOGUE_LEFT_INPUT_0,
--	     WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 0),
-+	     WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 1),
- 
- SOC_SINGLE("High Pass Filter Switch", WM8904_ADC_DIGITAL_0, 4, 1, 0),
- SOC_ENUM("High Pass Filter Mode", hpf_mode),
-diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
-index 25580e3..d4ecb3f 100644
---- a/sound/soc/codecs/wm8940.c
-+++ b/sound/soc/codecs/wm8940.c
-@@ -472,6 +472,8 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec,
- 		break;
- 	}
- 
-+	codec->dapm.bias_level = level;
-+
- 	return ret;
- }
- 
-diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
-index 5e05eed..4a0f666 100644
---- a/sound/soc/codecs/wm8962.c
-+++ b/sound/soc/codecs/wm8962.c
-@@ -1957,7 +1957,13 @@ static int wm8962_readable_register(struct snd_soc_codec *codec, unsigned int re
- 
- static int wm8962_reset(struct snd_soc_codec *codec)
- {
--	return snd_soc_write(codec, WM8962_SOFTWARE_RESET, 0x6243);
-+	int ret;
-+
-+	ret = snd_soc_write(codec, WM8962_SOFTWARE_RESET, 0x6243);
-+	if (ret != 0)
-+		return ret;
-+
-+	return snd_soc_write(codec, WM8962_PLL_SOFTWARE_RESET, 0);
- }
- 
- static const DECLARE_TLV_DB_SCALE(inpga_tlv, -2325, 75, 0);
-@@ -2018,7 +2024,6 @@ static int wm8962_put_spk_sw(struct snd_kcontrol *kcontrol,
- 			    struct snd_ctl_elem_value *ucontrol)
- {
- 	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
--	u16 *reg_cache = codec->reg_cache;
- 	int ret;
- 
- 	/* Apply the update (if any) */
-@@ -2027,16 +2032,19 @@ static int wm8962_put_spk_sw(struct snd_kcontrol *kcontrol,
- 		return 0;
- 
- 	/* If the left PGA is enabled hit that VU bit... */
--	if (reg_cache[WM8962_PWR_MGMT_2] & WM8962_SPKOUTL_PGA_ENA)
--		return snd_soc_write(codec, WM8962_SPKOUTL_VOLUME,
--				     reg_cache[WM8962_SPKOUTL_VOLUME]);
-+	ret = snd_soc_read(codec, WM8962_PWR_MGMT_2);
-+	if (ret & WM8962_SPKOUTL_PGA_ENA) {
-+		snd_soc_write(codec, WM8962_SPKOUTL_VOLUME,
-+			      snd_soc_read(codec, WM8962_SPKOUTL_VOLUME));
-+		return 1;
-+	}
- 
- 	/* ...otherwise the right.  The VU is stereo. */
--	if (reg_cache[WM8962_PWR_MGMT_2] & WM8962_SPKOUTR_PGA_ENA)
--		return snd_soc_write(codec, WM8962_SPKOUTR_VOLUME,
--				     reg_cache[WM8962_SPKOUTR_VOLUME]);
-+	if (ret & WM8962_SPKOUTR_PGA_ENA)
-+		snd_soc_write(codec, WM8962_SPKOUTR_VOLUME,
-+			      snd_soc_read(codec, WM8962_SPKOUTR_VOLUME));
- 
--	return 0;
-+	return 1;
- }
- 
- static const char *cap_hpf_mode_text[] = {
-@@ -2336,7 +2344,6 @@ static int out_pga_event(struct snd_soc_dapm_widget *w,
- 			 struct snd_kcontrol *kcontrol, int event)
- {
- 	struct snd_soc_codec *codec = w->codec;
--	u16 *reg_cache = codec->reg_cache;
- 	int reg;
- 
- 	switch (w->shift) {
-@@ -2359,7 +2366,7 @@ static int out_pga_event(struct snd_soc_dapm_widget *w,
- 
- 	switch (event) {
- 	case SND_SOC_DAPM_POST_PMU:
--		return snd_soc_write(codec, reg, reg_cache[reg]);
-+		return snd_soc_write(codec, reg, snd_soc_read(codec, reg));
- 	default:
- 		BUG();
- 		return -EINVAL;
-@@ -3027,9 +3034,9 @@ static int wm8962_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
- 	int aif0 = 0;
- 
- 	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
--	case SND_SOC_DAIFMT_DSP_A:
--		aif0 |= WM8962_LRCLK_INV;
- 	case SND_SOC_DAIFMT_DSP_B:
-+		aif0 |= WM8962_LRCLK_INV | 3;
-+	case SND_SOC_DAIFMT_DSP_A:
- 		aif0 |= 3;
- 
- 		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
-@@ -3822,6 +3829,11 @@ static int wm8962_probe(struct snd_soc_codec *codec)
- 	 */
- 	snd_soc_update_bits(codec, WM8962_CLOCKING2, WM8962_SYSCLK_ENA, 0);
- 
-+	/* Ensure that the oscillator and PLLs are disabled */
-+	snd_soc_update_bits(codec, WM8962_PLL2,
-+			    WM8962_OSC_ENA | WM8962_PLL2_ENA | WM8962_PLL3_ENA,
-+			    0);
-+
- 	regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
- 
- 	if (pdata) {
-diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
-index 83014a7..fb9f08a 100644
---- a/sound/soc/codecs/wm8994.c
-+++ b/sound/soc/codecs/wm8994.c
-@@ -1266,7 +1266,7 @@ SND_SOC_DAPM_MUX("AIF2DAC Mux", SND_SOC_NOPM, 0, 0, &aif2dac_mux),
- SND_SOC_DAPM_MUX("AIF2ADC Mux", SND_SOC_NOPM, 0, 0, &aif2adc_mux),
- 
- SND_SOC_DAPM_AIF_IN("AIF3DACDAT", "AIF3 Playback", 0, SND_SOC_NOPM, 0, 0),
--SND_SOC_DAPM_AIF_IN("AIF3ADCDAT", "AIF3 Capture", 0, SND_SOC_NOPM, 0, 0),
-+SND_SOC_DAPM_AIF_OUT("AIF3ADCDAT", "AIF3 Capture", 0, SND_SOC_NOPM, 0, 0),
- 
- SND_SOC_DAPM_SUPPLY("TOCLK", WM8994_CLOCKING_1, 4, 0, NULL, 0),
- 
-diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c
-index fb5d68f..96c381e 100644
---- a/sound/usb/misc/ua101.c
-+++ b/sound/usb/misc/ua101.c
-@@ -459,7 +459,8 @@ static void kill_stream_urbs(struct ua101_stream *stream)
- 	unsigned int i;
- 
- 	for (i = 0; i < stream->queue_length; ++i)
--		usb_kill_urb(&stream->urbs[i]->urb);
-+		if (stream->urbs[i])
-+			usb_kill_urb(&stream->urbs[i]->urb);
- }
- 
- static int enable_iso_interface(struct ua101 *ua, unsigned int intf_index)
-@@ -484,6 +485,9 @@ static void disable_iso_interface(struct ua101 *ua, unsigned int intf_index)
- {
- 	struct usb_host_interface *alts;
- 
-+	if (!ua->intf[intf_index])
-+		return;
-+
- 	alts = ua->intf[intf_index]->cur_altsetting;
- 	if (alts->desc.bAlternateSetting != 0) {
- 		int err = usb_set_interface(ua->dev,
-@@ -1144,27 +1148,37 @@ static void free_stream_urbs(struct ua101_stream *stream)
- {
- 	unsigned int i;
- 
--	for (i = 0; i < stream->queue_length; ++i)
-+	for (i = 0; i < stream->queue_length; ++i) {
- 		kfree(stream->urbs[i]);
-+		stream->urbs[i] = NULL;
-+	}
- }
- 
- static void free_usb_related_resources(struct ua101 *ua,
- 				       struct usb_interface *interface)
- {
- 	unsigned int i;
-+	struct usb_interface *intf;
- 
-+	mutex_lock(&ua->mutex);
- 	free_stream_urbs(&ua->capture);
- 	free_stream_urbs(&ua->playback);
-+	mutex_unlock(&ua->mutex);
- 	free_stream_buffers(ua, &ua->capture);
- 	free_stream_buffers(ua, &ua->playback);
- 
--	for (i = 0; i < ARRAY_SIZE(ua->intf); ++i)
--		if (ua->intf[i]) {
--			usb_set_intfdata(ua->intf[i], NULL);
--			if (ua->intf[i] != interface)
-+	for (i = 0; i < ARRAY_SIZE(ua->intf); ++i) {
-+		mutex_lock(&ua->mutex);
-+		intf = ua->intf[i];
-+		ua->intf[i] = NULL;
-+		mutex_unlock(&ua->mutex);
-+		if (intf) {
-+			usb_set_intfdata(intf, NULL);
-+			if (intf != interface)
- 				usb_driver_release_interface(&ua101_driver,
--							     ua->intf[i]);
-+							     intf);
- 		}
-+	}
- }
- 
- static void ua101_card_free(struct snd_card *card)
-diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
-index f022316..8c50da8 100644
---- a/tools/perf/util/probe-event.c
-+++ b/tools/perf/util/probe-event.c
-@@ -1869,8 +1869,10 @@ static int __del_trace_probe_event(int fd, struct str_node *ent)
- 
- 	pr_debug("Writing event: %s\n", buf);
- 	ret = write(fd, buf, strlen(buf));
--	if (ret < 0)
-+	if (ret < 0) {
-+		ret = -errno;
- 		goto error;
-+	}
- 
- 	printf("Remove event: %s\n", ent->s);
- 	return 0;
diff --git a/3.0.9/0000_README b/3.1.1/0000_README
index 6fac81e..debad5a 100644
--- a/3.0.9/0000_README
+++ b/3.1.1/0000_README
@@ -3,15 +3,7 @@ README
 
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	1007_linux-3.0.8.patch
-From:	http://www.kernel.org
-Desc:	Linux 3.0.8
-
-Patch:	1008_linux-3.0.9.patch
-From:	http://www.kernel.org
-Desc:	Linux 3.0.9
-
-Patch:	4420_grsecurity-2.2.2-3.0.9-201111152003.patch
+Patch:	4420_grsecurity-2.2.2-3.1.1-201111170037.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/3.0.9/4420_grsecurity-2.2.2-3.0.9-201111152003.patch b/3.1.1/4420_grsecurity-2.2.2-3.1.1-201111170037.patch
index 4d8edda..4c833da 100644
--- a/3.0.9/4420_grsecurity-2.2.2-3.0.9-201111152003.patch
+++ b/3.1.1/4420_grsecurity-2.2.2-3.1.1-201111170037.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-3.0.9/arch/alpha/include/asm/elf.h linux-3.0.9/arch/alpha/include/asm/elf.h
---- linux-3.0.9/arch/alpha/include/asm/elf.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/alpha/include/asm/elf.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/alpha/include/asm/elf.h linux-3.1.1/arch/alpha/include/asm/elf.h
+--- linux-3.1.1/arch/alpha/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +15,9 @@ diff -urNp linux-3.0.9/arch/alpha/include/asm/elf.h linux-3.0.9/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.9/arch/alpha/include/asm/pgtable.h linux-3.0.9/arch/alpha/include/asm/pgtable.h
---- linux-3.0.9/arch/alpha/include/asm/pgtable.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/alpha/include/asm/pgtable.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/alpha/include/asm/pgtable.h linux-3.1.1/arch/alpha/include/asm/pgtable.h
+--- linux-3.1.1/arch/alpha/include/asm/pgtable.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/include/asm/pgtable.h	2011-11-16 18:39:07.000000000 -0500
 @@ -101,6 +101,17 @@ struct vm_area_struct;
  #define PAGE_SHARED	__pgprot(_PAGE_VALID | __ACCESS_BITS)
  #define PAGE_COPY	__pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -36,10 +36,10 @@ diff -urNp linux-3.0.9/arch/alpha/include/asm/pgtable.h linux-3.0.9/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.9/arch/alpha/kernel/module.c linux-3.0.9/arch/alpha/kernel/module.c
---- linux-3.0.9/arch/alpha/kernel/module.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/alpha/kernel/module.c	2011-11-15 20:02:59.000000000 -0500
-@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
+diff -urNp linux-3.1.1/arch/alpha/kernel/module.c linux-3.1.1/arch/alpha/kernel/module.c
+--- linux-3.1.1/arch/alpha/kernel/module.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/kernel/module.c	2011-11-16 18:39:07.000000000 -0500
+@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
  	/* The small sections were sorted to the end of the segment.
  	   The following should definitely cover them.  */
@@ -48,10 +48,10 @@ diff -urNp linux-3.0.9/arch/alpha/kernel/module.c linux-3.0.9/arch/alpha/kernel/
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff -urNp linux-3.0.9/arch/alpha/kernel/osf_sys.c linux-3.0.9/arch/alpha/kernel/osf_sys.c
---- linux-3.0.9/arch/alpha/kernel/osf_sys.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/alpha/kernel/osf_sys.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1145,7 +1145,7 @@ arch_get_unmapped_area_1(unsigned long a
+diff -urNp linux-3.1.1/arch/alpha/kernel/osf_sys.c linux-3.1.1/arch/alpha/kernel/osf_sys.c
+--- linux-3.1.1/arch/alpha/kernel/osf_sys.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/kernel/osf_sys.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1147,7 +1147,7 @@ arch_get_unmapped_area_1(unsigned long a
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (limit - len < addr)
  			return -ENOMEM;
@@ -60,7 +60,7 @@ diff -urNp linux-3.0.9/arch/alpha/kernel/osf_sys.c linux-3.0.9/arch/alpha/kernel
  			return addr;
  		addr = vma->vm_end;
  		vma = vma->vm_next;
-@@ -1181,6 +1181,10 @@ arch_get_unmapped_area(struct file *filp
+@@ -1183,6 +1183,10 @@ arch_get_unmapped_area(struct file *filp
  	   merely specific addresses, but regions of memory -- perhaps
  	   this feature should be incorporated into all ports?  */
  
@@ -71,7 +71,7 @@ diff -urNp linux-3.0.9/arch/alpha/kernel/osf_sys.c linux-3.0.9/arch/alpha/kernel
  	if (addr) {
  		addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
  		if (addr != (unsigned long) -ENOMEM)
-@@ -1188,8 +1192,8 @@ arch_get_unmapped_area(struct file *filp
+@@ -1190,8 +1194,8 @@ arch_get_unmapped_area(struct file *filp
  	}
  
  	/* Next, try allocating at TASK_UNMAPPED_BASE.  */
@@ -82,9 +82,9 @@ diff -urNp linux-3.0.9/arch/alpha/kernel/osf_sys.c linux-3.0.9/arch/alpha/kernel
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urNp linux-3.0.9/arch/alpha/mm/fault.c linux-3.0.9/arch/alpha/mm/fault.c
---- linux-3.0.9/arch/alpha/mm/fault.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/alpha/mm/fault.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/alpha/mm/fault.c linux-3.1.1/arch/alpha/mm/fault.c
+--- linux-3.1.1/arch/alpha/mm/fault.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/mm/fault.c	2011-11-16 18:39:07.000000000 -0500
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
  	__reload_thread(pcb);
  }
@@ -192,7 +192,7 @@ diff -urNp linux-3.0.9/arch/alpha/mm/fault.c linux-3.0.9/arch/alpha/mm/fault.c
 +	return 1;
 +}
 +
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	unsigned long i;
 +
@@ -241,9 +241,9 @@ diff -urNp linux-3.0.9/arch/alpha/mm/fault.c linux-3.0.9/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.9/arch/arm/include/asm/elf.h linux-3.0.9/arch/arm/include/asm/elf.h
---- linux-3.0.9/arch/arm/include/asm/elf.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/include/asm/elf.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/include/asm/elf.h linux-3.1.1/arch/arm/include/asm/elf.h
+--- linux-3.1.1/arch/arm/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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 +271,9 @@ diff -urNp linux-3.0.9/arch/arm/include/asm/elf.h linux-3.0.9/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.9/arch/arm/include/asm/kmap_types.h linux-3.0.9/arch/arm/include/asm/kmap_types.h
---- linux-3.0.9/arch/arm/include/asm/kmap_types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/include/asm/kmap_types.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/include/asm/kmap_types.h linux-3.1.1/arch/arm/include/asm/kmap_types.h
+--- linux-3.1.1/arch/arm/include/asm/kmap_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/include/asm/kmap_types.h	2011-11-16 18:39:07.000000000 -0500
 @@ -21,6 +21,7 @@ enum km_type {
  	KM_L1_CACHE,
  	KM_L2_CACHE,
@@ -282,9 +282,9 @@ diff -urNp linux-3.0.9/arch/arm/include/asm/kmap_types.h linux-3.0.9/arch/arm/in
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.9/arch/arm/include/asm/uaccess.h linux-3.0.9/arch/arm/include/asm/uaccess.h
---- linux-3.0.9/arch/arm/include/asm/uaccess.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/include/asm/uaccess.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/include/asm/uaccess.h linux-3.1.1/arch/arm/include/asm/uaccess.h
+--- linux-3.1.1/arch/arm/include/asm/uaccess.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/include/asm/uaccess.h	2011-11-16 18:39:07.000000000 -0500
 @@ -22,6 +22,8 @@
  #define VERIFY_READ 0
  #define VERIFY_WRITE 1
@@ -340,9 +340,9 @@ diff -urNp linux-3.0.9/arch/arm/include/asm/uaccess.h linux-3.0.9/arch/arm/inclu
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff -urNp linux-3.0.9/arch/arm/kernel/armksyms.c linux-3.0.9/arch/arm/kernel/armksyms.c
---- linux-3.0.9/arch/arm/kernel/armksyms.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/kernel/armksyms.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/kernel/armksyms.c linux-3.1.1/arch/arm/kernel/armksyms.c
+--- linux-3.1.1/arch/arm/kernel/armksyms.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/kernel/armksyms.c	2011-11-16 18:39:07.000000000 -0500
 @@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
  #ifdef CONFIG_MMU
  EXPORT_SYMBOL(copy_page);
@@ -354,18 +354,18 @@ diff -urNp linux-3.0.9/arch/arm/kernel/armksyms.c linux-3.0.9/arch/arm/kernel/ar
  EXPORT_SYMBOL(__clear_user);
  
  EXPORT_SYMBOL(__get_user_1);
-diff -urNp linux-3.0.9/arch/arm/kernel/process.c linux-3.0.9/arch/arm/kernel/process.c
---- linux-3.0.9/arch/arm/kernel/process.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/kernel/process.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/kernel/process.c linux-3.1.1/arch/arm/kernel/process.c
+--- linux-3.1.1/arch/arm/kernel/process.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/kernel/process.c	2011-11-16 18:39:07.000000000 -0500
 @@ -28,7 +28,6 @@
  #include <linux/tick.h>
  #include <linux/utsname.h>
  #include <linux/uaccess.h>
 -#include <linux/random.h>
  #include <linux/hw_breakpoint.h>
+ #include <linux/cpuidle.h>
  
- #include <asm/cacheflush.h>
-@@ -479,12 +478,6 @@ unsigned long get_wchan(struct task_stru
+@@ -481,12 +480,6 @@ unsigned long get_wchan(struct task_stru
  	return 0;
  }
  
@@ -378,9 +378,9 @@ diff -urNp linux-3.0.9/arch/arm/kernel/process.c linux-3.0.9/arch/arm/kernel/pro
  #ifdef CONFIG_MMU
  /*
   * The vectors page is always readable from user space for the
-diff -urNp linux-3.0.9/arch/arm/kernel/traps.c linux-3.0.9/arch/arm/kernel/traps.c
---- linux-3.0.9/arch/arm/kernel/traps.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/kernel/traps.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/kernel/traps.c linux-3.1.1/arch/arm/kernel/traps.c
+--- linux-3.1.1/arch/arm/kernel/traps.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/kernel/traps.c	2011-11-16 18:40:08.000000000 -0500
 @@ -257,6 +257,8 @@ static int __die(const char *str, int er
  
  static DEFINE_SPINLOCK(die_lock);
@@ -400,9 +400,9 @@ diff -urNp linux-3.0.9/arch/arm/kernel/traps.c linux-3.0.9/arch/arm/kernel/traps
  	if (ret != NOTIFY_STOP)
  		do_exit(SIGSEGV);
  }
-diff -urNp linux-3.0.9/arch/arm/lib/copy_from_user.S linux-3.0.9/arch/arm/lib/copy_from_user.S
---- linux-3.0.9/arch/arm/lib/copy_from_user.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/lib/copy_from_user.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/lib/copy_from_user.S linux-3.1.1/arch/arm/lib/copy_from_user.S
+--- linux-3.1.1/arch/arm/lib/copy_from_user.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/lib/copy_from_user.S	2011-11-16 18:39:07.000000000 -0500
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -426,9 +426,9 @@ diff -urNp linux-3.0.9/arch/arm/lib/copy_from_user.S linux-3.0.9/arch/arm/lib/co
  
  	.pushsection .fixup,"ax"
  	.align 0
-diff -urNp linux-3.0.9/arch/arm/lib/copy_to_user.S linux-3.0.9/arch/arm/lib/copy_to_user.S
---- linux-3.0.9/arch/arm/lib/copy_to_user.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/lib/copy_to_user.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/lib/copy_to_user.S linux-3.1.1/arch/arm/lib/copy_to_user.S
+--- linux-3.1.1/arch/arm/lib/copy_to_user.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/lib/copy_to_user.S	2011-11-16 18:39:07.000000000 -0500
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -452,9 +452,9 @@ diff -urNp linux-3.0.9/arch/arm/lib/copy_to_user.S linux-3.0.9/arch/arm/lib/copy
  ENDPROC(__copy_to_user_std)
  
  	.pushsection .fixup,"ax"
-diff -urNp linux-3.0.9/arch/arm/lib/uaccess.S linux-3.0.9/arch/arm/lib/uaccess.S
---- linux-3.0.9/arch/arm/lib/uaccess.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/lib/uaccess.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/lib/uaccess.S linux-3.1.1/arch/arm/lib/uaccess.S
+--- linux-3.1.1/arch/arm/lib/uaccess.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/lib/uaccess.S	2011-11-16 18:39:07.000000000 -0500
 @@ -20,7 +20,7 @@
  
  #define PAGE_SHIFT 12
@@ -508,9 +508,9 @@ diff -urNp linux-3.0.9/arch/arm/lib/uaccess.S linux-3.0.9/arch/arm/lib/uaccess.S
  
  		.pushsection .fixup,"ax"
  		.align	0
-diff -urNp linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c
---- linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c
+--- linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c	2011-11-16 18:39:07.000000000 -0500
 @@ -103,7 +103,7 @@ out:
  }
  
@@ -520,9 +520,9 @@ diff -urNp linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.9/arch/arm/l
  {
  	/*
  	 * This test is stubbed out of the main function above to keep
-diff -urNp linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c
---- linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c	2011-11-16 18:40:08.000000000 -0500
 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
  	return sprintf(buf, "0x%X\n", mbox_value);
  }
@@ -532,9 +532,9 @@ diff -urNp linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.9/arch/arm/ma
  
  static int mbox_show(struct seq_file *s, void *data)
  {
-diff -urNp linux-3.0.9/arch/arm/mm/fault.c linux-3.0.9/arch/arm/mm/fault.c
---- linux-3.0.9/arch/arm/mm/fault.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/mm/fault.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/mm/fault.c linux-3.1.1/arch/arm/mm/fault.c
+--- linux-3.1.1/arch/arm/mm/fault.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/mm/fault.c	2011-11-16 18:39:07.000000000 -0500
 @@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk,
  	}
  #endif
@@ -549,12 +549,12 @@ diff -urNp linux-3.0.9/arch/arm/mm/fault.c linux-3.0.9/arch/arm/mm/fault.c
  	tsk->thread.address = addr;
  	tsk->thread.error_code = fsr;
  	tsk->thread.trap_no = 14;
-@@ -379,6 +386,33 @@ do_page_fault(unsigned long addr, unsign
+@@ -383,6 +390,33 @@ do_page_fault(unsigned long addr, unsign
  }
  #endif					/* CONFIG_MMU */
  
 +#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	long i;
 +
@@ -583,9 +583,9 @@ diff -urNp linux-3.0.9/arch/arm/mm/fault.c linux-3.0.9/arch/arm/mm/fault.c
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-3.0.9/arch/arm/mm/mmap.c linux-3.0.9/arch/arm/mm/mmap.c
---- linux-3.0.9/arch/arm/mm/mmap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/mm/mmap.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/arm/mm/mmap.c linux-3.1.1/arch/arm/mm/mmap.c
+--- linux-3.1.1/arch/arm/mm/mmap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/mm/mmap.c	2011-11-16 18:39:07.000000000 -0500
 @@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp
  	if (len > TASK_SIZE)
  		return -ENOMEM;
@@ -635,9 +635,9 @@ diff -urNp linux-3.0.9/arch/arm/mm/mmap.c linux-3.0.9/arch/arm/mm/mmap.c
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-diff -urNp linux-3.0.9/arch/avr32/include/asm/elf.h linux-3.0.9/arch/avr32/include/asm/elf.h
---- linux-3.0.9/arch/avr32/include/asm/elf.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/avr32/include/asm/elf.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/avr32/include/asm/elf.h linux-3.1.1/arch/avr32/include/asm/elf.h
+--- linux-3.1.1/arch/avr32/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/avr32/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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 +654,9 @@ diff -urNp linux-3.0.9/arch/avr32/include/asm/elf.h linux-3.0.9/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.9/arch/avr32/include/asm/kmap_types.h linux-3.0.9/arch/avr32/include/asm/kmap_types.h
---- linux-3.0.9/arch/avr32/include/asm/kmap_types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/avr32/include/asm/kmap_types.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/avr32/include/asm/kmap_types.h linux-3.1.1/arch/avr32/include/asm/kmap_types.h
+--- linux-3.1.1/arch/avr32/include/asm/kmap_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/avr32/include/asm/kmap_types.h	2011-11-16 18:39:07.000000000 -0500
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -667,15 +667,15 @@ diff -urNp linux-3.0.9/arch/avr32/include/asm/kmap_types.h linux-3.0.9/arch/avr3
  };
  
  #undef D
-diff -urNp linux-3.0.9/arch/avr32/mm/fault.c linux-3.0.9/arch/avr32/mm/fault.c
---- linux-3.0.9/arch/avr32/mm/fault.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/avr32/mm/fault.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/avr32/mm/fault.c linux-3.1.1/arch/avr32/mm/fault.c
+--- linux-3.1.1/arch/avr32/mm/fault.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/avr32/mm/fault.c	2011-11-16 18:39:07.000000000 -0500
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
  
 +#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	unsigned long i;
 +
@@ -711,9 +711,9 @@ diff -urNp linux-3.0.9/arch/avr32/mm/fault.c linux-3.0.9/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.9/arch/frv/include/asm/kmap_types.h linux-3.0.9/arch/frv/include/asm/kmap_types.h
---- linux-3.0.9/arch/frv/include/asm/kmap_types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/frv/include/asm/kmap_types.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/frv/include/asm/kmap_types.h linux-3.1.1/arch/frv/include/asm/kmap_types.h
+--- linux-3.1.1/arch/frv/include/asm/kmap_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/frv/include/asm/kmap_types.h	2011-11-16 18:39:07.000000000 -0500
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -722,9 +722,9 @@ diff -urNp linux-3.0.9/arch/frv/include/asm/kmap_types.h linux-3.0.9/arch/frv/in
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.9/arch/frv/mm/elf-fdpic.c linux-3.0.9/arch/frv/mm/elf-fdpic.c
---- linux-3.0.9/arch/frv/mm/elf-fdpic.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/frv/mm/elf-fdpic.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/frv/mm/elf-fdpic.c linux-3.1.1/arch/frv/mm/elf-fdpic.c
+--- linux-3.1.1/arch/frv/mm/elf-fdpic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/frv/mm/elf-fdpic.c	2011-11-16 18:39:07.000000000 -0500
 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
  	if (addr) {
  		addr = PAGE_ALIGN(addr);
@@ -753,9 +753,9 @@ diff -urNp linux-3.0.9/arch/frv/mm/elf-fdpic.c linux-3.0.9/arch/frv/mm/elf-fdpic
  				goto success;
  			addr = vma->vm_end;
  		}
-diff -urNp linux-3.0.9/arch/ia64/include/asm/elf.h linux-3.0.9/arch/ia64/include/asm/elf.h
---- linux-3.0.9/arch/ia64/include/asm/elf.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/include/asm/elf.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/ia64/include/asm/elf.h linux-3.1.1/arch/ia64/include/asm/elf.h
+--- linux-3.1.1/arch/ia64/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -42,6 +42,13 @@
   */
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -770,9 +770,9 @@ diff -urNp linux-3.0.9/arch/ia64/include/asm/elf.h linux-3.0.9/arch/ia64/include
  #define PT_IA_64_UNWIND		0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-3.0.9/arch/ia64/include/asm/pgtable.h linux-3.0.9/arch/ia64/include/asm/pgtable.h
---- linux-3.0.9/arch/ia64/include/asm/pgtable.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/include/asm/pgtable.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/ia64/include/asm/pgtable.h linux-3.1.1/arch/ia64/include/asm/pgtable.h
+--- linux-3.1.1/arch/ia64/include/asm/pgtable.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/include/asm/pgtable.h	2011-11-16 18:39:07.000000000 -0500
 @@ -12,7 +12,7 @@
   *	David Mosberger-Tang <davidm@hpl.hp.com>
   */
@@ -800,9 +800,9 @@ diff -urNp linux-3.0.9/arch/ia64/include/asm/pgtable.h linux-3.0.9/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.9/arch/ia64/include/asm/spinlock.h linux-3.0.9/arch/ia64/include/asm/spinlock.h
---- linux-3.0.9/arch/ia64/include/asm/spinlock.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/include/asm/spinlock.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/ia64/include/asm/spinlock.h linux-3.1.1/arch/ia64/include/asm/spinlock.h
+--- linux-3.1.1/arch/ia64/include/asm/spinlock.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/include/asm/spinlock.h	2011-11-16 18:39:07.000000000 -0500
 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
  	unsigned short	*p = (unsigned short *)&lock->lock + 1, tmp;
  
@@ -812,9 +812,9 @@ diff -urNp linux-3.0.9/arch/ia64/include/asm/spinlock.h linux-3.0.9/arch/ia64/in
  }
  
  static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
-diff -urNp linux-3.0.9/arch/ia64/include/asm/uaccess.h linux-3.0.9/arch/ia64/include/asm/uaccess.h
---- linux-3.0.9/arch/ia64/include/asm/uaccess.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/include/asm/uaccess.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/ia64/include/asm/uaccess.h linux-3.1.1/arch/ia64/include/asm/uaccess.h
+--- linux-3.1.1/arch/ia64/include/asm/uaccess.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/include/asm/uaccess.h	2011-11-16 18:39:07.000000000 -0500
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
  	const void *__cu_from = (from);							\
  	long __cu_len = (n);								\
@@ -833,10 +833,10 @@ diff -urNp linux-3.0.9/arch/ia64/include/asm/uaccess.h linux-3.0.9/arch/ia64/inc
  		__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-diff -urNp linux-3.0.9/arch/ia64/kernel/module.c linux-3.0.9/arch/ia64/kernel/module.c
---- linux-3.0.9/arch/ia64/kernel/module.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/kernel/module.c	2011-11-15 20:02:59.000000000 -0500
-@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
+diff -urNp linux-3.1.1/arch/ia64/kernel/module.c linux-3.1.1/arch/ia64/kernel/module.c
+--- linux-3.1.1/arch/ia64/kernel/module.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/kernel/module.c	2011-11-16 18:39:07.000000000 -0500
+@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
  void
  module_free (struct module *mod, void *module_region)
  {
@@ -846,7 +846,7 @@ diff -urNp linux-3.0.9/arch/ia64/kernel/module.c linux-3.0.9/arch/ia64/kernel/mo
  		unw_remove_unwind_table(mod->arch.init_unw_table);
  		mod->arch.init_unw_table = NULL;
  	}
-@@ -502,15 +501,39 @@ module_frob_arch_sections (Elf_Ehdr *ehd
+@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehd
  }
  
  static inline int
@@ -888,7 +888,7 @@ diff -urNp linux-3.0.9/arch/ia64/kernel/module.c linux-3.0.9/arch/ia64/kernel/mo
  }
  
  static inline int
-@@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_
+@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_
  		break;
  
  	      case RV_BDREL:
@@ -904,7 +904,7 @@ diff -urNp linux-3.0.9/arch/ia64/kernel/module.c linux-3.0.9/arch/ia64/kernel/mo
  		break;
  
  	      case RV_LTV:
-@@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs,
+@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs,
  		 *     addresses have been selected...
  		 */
  		uint64_t gp;
@@ -924,9 +924,9 @@ diff -urNp linux-3.0.9/arch/ia64/kernel/module.c linux-3.0.9/arch/ia64/kernel/mo
  		mod->arch.gp = gp;
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
-diff -urNp linux-3.0.9/arch/ia64/kernel/sys_ia64.c linux-3.0.9/arch/ia64/kernel/sys_ia64.c
---- linux-3.0.9/arch/ia64/kernel/sys_ia64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/kernel/sys_ia64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/ia64/kernel/sys_ia64.c linux-3.1.1/arch/ia64/kernel/sys_ia64.c
+--- linux-3.1.1/arch/ia64/kernel/sys_ia64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/kernel/sys_ia64.c	2011-11-16 18:39:07.000000000 -0500
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
  	if (REGION_NUMBER(addr) == RGN_HPAGE)
  		addr = 0;
@@ -959,9 +959,9 @@ diff -urNp linux-3.0.9/arch/ia64/kernel/sys_ia64.c linux-3.0.9/arch/ia64/kernel/
  			/* Remember the address where we stopped this search:  */
  			mm->free_area_cache = addr + len;
  			return addr;
-diff -urNp linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S
---- linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S
+--- linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S	2011-11-16 18:39:07.000000000 -0500
 @@ -199,7 +199,7 @@ SECTIONS {
  	/* Per-cpu data: */
  	. = ALIGN(PERCPU_PAGE_SIZE);
@@ -971,15 +971,15 @@ diff -urNp linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S linux-3.0.9/arch/ia64/kern
  	/*
  	 * ensure percpu data fits
  	 * into percpu page size
-diff -urNp linux-3.0.9/arch/ia64/mm/fault.c linux-3.0.9/arch/ia64/mm/fault.c
---- linux-3.0.9/arch/ia64/mm/fault.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/mm/fault.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/ia64/mm/fault.c linux-3.1.1/arch/ia64/mm/fault.c
+--- linux-3.1.1/arch/ia64/mm/fault.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/mm/fault.c	2011-11-16 18:39:07.000000000 -0500
 @@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned 
  	return pte_present(pte);
  }
  
 +#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	unsigned long i;
 +
@@ -1023,9 +1023,9 @@ diff -urNp linux-3.0.9/arch/ia64/mm/fault.c linux-3.0.9/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.9/arch/ia64/mm/hugetlbpage.c linux-3.0.9/arch/ia64/mm/hugetlbpage.c
---- linux-3.0.9/arch/ia64/mm/hugetlbpage.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/mm/hugetlbpage.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/ia64/mm/hugetlbpage.c linux-3.1.1/arch/ia64/mm/hugetlbpage.c
+--- linux-3.1.1/arch/ia64/mm/hugetlbpage.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/mm/hugetlbpage.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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 +1035,9 @@ diff -urNp linux-3.0.9/arch/ia64/mm/hugetlbpage.c linux-3.0.9/arch/ia64/mm/huget
  			return addr;
  		addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
  	}
-diff -urNp linux-3.0.9/arch/ia64/mm/init.c linux-3.0.9/arch/ia64/mm/init.c
---- linux-3.0.9/arch/ia64/mm/init.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/mm/init.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/ia64/mm/init.c linux-3.1.1/arch/ia64/mm/init.c
+--- linux-3.1.1/arch/ia64/mm/init.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/mm/init.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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 +1058,9 @@ diff -urNp linux-3.0.9/arch/ia64/mm/init.c linux-3.0.9/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.9/arch/m32r/lib/usercopy.c linux-3.0.9/arch/m32r/lib/usercopy.c
---- linux-3.0.9/arch/m32r/lib/usercopy.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/m32r/lib/usercopy.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/m32r/lib/usercopy.c linux-3.1.1/arch/m32r/lib/usercopy.c
+--- linux-3.1.1/arch/m32r/lib/usercopy.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/m32r/lib/usercopy.c	2011-11-16 18:39:07.000000000 -0500
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1081,9 +1081,9 @@ diff -urNp linux-3.0.9/arch/m32r/lib/usercopy.c linux-3.0.9/arch/m32r/lib/userco
  	prefetchw(to);
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
-diff -urNp linux-3.0.9/arch/mips/include/asm/elf.h linux-3.0.9/arch/mips/include/asm/elf.h
---- linux-3.0.9/arch/mips/include/asm/elf.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/include/asm/elf.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/mips/include/asm/elf.h linux-3.1.1/arch/mips/include/asm/elf.h
+--- linux-3.1.1/arch/mips/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
@@ -1105,9 +1105,9 @@ diff -urNp linux-3.0.9/arch/mips/include/asm/elf.h linux-3.0.9/arch/mips/include
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_ELF_H */
-diff -urNp linux-3.0.9/arch/mips/include/asm/page.h linux-3.0.9/arch/mips/include/asm/page.h
---- linux-3.0.9/arch/mips/include/asm/page.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/include/asm/page.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/mips/include/asm/page.h linux-3.1.1/arch/mips/include/asm/page.h
+--- linux-3.1.1/arch/mips/include/asm/page.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/include/asm/page.h	2011-11-16 18:39:07.000000000 -0500
 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
    #ifdef CONFIG_CPU_MIPS32
      typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1117,9 +1117,9 @@ diff -urNp linux-3.0.9/arch/mips/include/asm/page.h linux-3.0.9/arch/mips/includ
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)	((x).pte)
-diff -urNp linux-3.0.9/arch/mips/include/asm/system.h linux-3.0.9/arch/mips/include/asm/system.h
---- linux-3.0.9/arch/mips/include/asm/system.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/include/asm/system.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/mips/include/asm/system.h linux-3.1.1/arch/mips/include/asm/system.h
+--- linux-3.1.1/arch/mips/include/asm/system.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/include/asm/system.h	2011-11-16 18:39:07.000000000 -0500
 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1128,9 +1128,9 @@ diff -urNp linux-3.0.9/arch/mips/include/asm/system.h linux-3.0.9/arch/mips/incl
 +#define arch_align_stack(x) ((x) & ~0xfUL)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c
---- linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c
+--- linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1145,9 +1145,9 @@ diff -urNp linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c linux-3.0.9/arch/mips/ke
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff -urNp linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c
---- linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/mips/kernel/binfmt_elfo32.c linux-3.1.1/arch/mips/kernel/binfmt_elfo32.c
+--- linux-3.1.1/arch/mips/kernel/binfmt_elfo32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/kernel/binfmt_elfo32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1162,10 +1162,10 @@ diff -urNp linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c linux-3.0.9/arch/mips/ke
  #include <asm/processor.h>
  
  /*
-diff -urNp linux-3.0.9/arch/mips/kernel/process.c linux-3.0.9/arch/mips/kernel/process.c
---- linux-3.0.9/arch/mips/kernel/process.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/kernel/process.c	2011-11-15 20:02:59.000000000 -0500
-@@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
+diff -urNp linux-3.1.1/arch/mips/kernel/process.c linux-3.1.1/arch/mips/kernel/process.c
+--- linux-3.1.1/arch/mips/kernel/process.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/kernel/process.c	2011-11-16 18:39:07.000000000 -0500
+@@ -481,15 +481,3 @@ unsigned long get_wchan(struct task_stru
  out:
  	return pc;
  }
@@ -1181,15 +1181,15 @@ diff -urNp linux-3.0.9/arch/mips/kernel/process.c linux-3.0.9/arch/mips/kernel/p
 -
 -	return sp & ALMASK;
 -}
-diff -urNp linux-3.0.9/arch/mips/mm/fault.c linux-3.0.9/arch/mips/mm/fault.c
---- linux-3.0.9/arch/mips/mm/fault.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/mm/fault.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/mips/mm/fault.c linux-3.1.1/arch/mips/mm/fault.c
+--- linux-3.1.1/arch/mips/mm/fault.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/mm/fault.c	2011-11-16 18:39:07.000000000 -0500
 @@ -28,6 +28,23 @@
  #include <asm/highmem.h>		/* For VMALLOC_END */
  #include <linux/kdebug.h>
  
 +#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	unsigned long i;
 +
@@ -1208,13 +1208,13 @@ diff -urNp linux-3.0.9/arch/mips/mm/fault.c linux-3.0.9/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.9/arch/mips/mm/mmap.c linux-3.0.9/arch/mips/mm/mmap.c
---- linux-3.0.9/arch/mips/mm/mmap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/mm/mmap.c	2011-11-15 20:02:59.000000000 -0500
-@@ -48,14 +48,18 @@ unsigned long arch_get_unmapped_area(str
- 	do_color_align = 0;
- 	if (filp || (flags & MAP_SHARED))
+diff -urNp linux-3.1.1/arch/mips/mm/mmap.c linux-3.1.1/arch/mips/mm/mmap.c
+--- linux-3.1.1/arch/mips/mm/mmap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/mm/mmap.c	2011-11-16 18:39:07.000000000 -0500
+@@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_a
  		do_color_align = 1;
+ 
+ 	/* requesting a specific address */
 +
 +#ifdef CONFIG_PAX_RANDMMAP
 +	if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
@@ -1223,27 +1223,46 @@ diff -urNp linux-3.0.9/arch/mips/mm/mmap.c linux-3.0.9/arch/mips/mm/mmap.c
  	if (addr) {
  		if (do_color_align)
  			addr = COLOUR_ALIGN(addr, pgoff);
- 		else
+@@ -102,8 +107,7 @@ static unsigned long arch_get_unmapped_a
  			addr = PAGE_ALIGN(addr);
- 		vmm = find_vma(current->mm, addr);
+ 
+ 		vma = find_vma(mm, addr);
 -		if (TASK_SIZE - len >= addr &&
--		    (!vmm || addr + len <= vmm->vm_start))
+-		    (!vma || addr + len <= vma->vm_start))
 +		if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len))
  			return addr;
  	}
- 	addr = current->mm->mmap_base;
-@@ -68,7 +72,7 @@ unsigned long arch_get_unmapped_area(str
- 		/* At this point:  (!vmm || addr < vmm->vm_end). */
- 		if (TASK_SIZE - len < addr)
- 			return -ENOMEM;
--		if (!vmm || addr + len <= vmm->vm_start)
-+		if (check_heap_stack_gap(vmm, addr, len))
- 			return addr;
- 		addr = vmm->vm_end;
- 		if (do_color_align)
-@@ -93,30 +97,3 @@ void arch_pick_mmap_layout(struct mm_str
- 	mm->get_unmapped_area = arch_get_unmapped_area;
- 	mm->unmap_area = arch_unmap_area;
+ 
+@@ -118,7 +122,7 @@ static unsigned long arch_get_unmapped_a
+ 			/* At this point:  (!vma || addr < vma->vm_end). */
+ 			if (TASK_SIZE - len < addr)
+ 				return -ENOMEM;
+-			if (!vma || addr + len <= vma->vm_start)
++			if (check_heap_stack_gap(vmm, addr, len))
+ 				return addr;
+ 			addr = vma->vm_end;
+ 			if (do_color_align)
+@@ -145,7 +149,7 @@ static unsigned long arch_get_unmapped_a
+ 		/* make sure it can fit in the remaining address space */
+ 		if (likely(addr > len)) {
+ 			vma = find_vma(mm, addr - len);
+-			if (!vma || addr <= vma->vm_start) {
++			if (check_heap_stack_gap(vmm, addr - len, len))
+ 				/* cache the address as a hint for next time */
+ 				return mm->free_area_cache = addr - len;
+ 			}
+@@ -165,7 +169,7 @@ static unsigned long arch_get_unmapped_a
+ 			 * return with success:
+ 			 */
+ 			vma = find_vma(mm, addr);
+-			if (likely(!vma || addr + len <= vma->vm_start)) {
++			if (check_heap_stack_gap(vmm, addr, len)) {
+ 				/* cache the address as a hint for next time */
+ 				return mm->free_area_cache = addr;
+ 			}
+@@ -242,30 +246,3 @@ void arch_pick_mmap_layout(struct mm_str
+ 		mm->unmap_area = arch_unmap_area_topdown;
+ 	}
  }
 -
 -static inline unsigned long brk_rnd(void)
@@ -1272,9 +1291,9 @@ diff -urNp linux-3.0.9/arch/mips/mm/mmap.c linux-3.0.9/arch/mips/mm/mmap.c
 -
 -	return ret;
 -}
-diff -urNp linux-3.0.9/arch/parisc/include/asm/elf.h linux-3.0.9/arch/parisc/include/asm/elf.h
---- linux-3.0.9/arch/parisc/include/asm/elf.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/parisc/include/asm/elf.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/parisc/include/asm/elf.h linux-3.1.1/arch/parisc/include/asm/elf.h
+--- linux-3.1.1/arch/parisc/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/parisc/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -342,6 +342,13 @@ struct pt_regs;	/* forward declaration..
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1289,9 +1308,9 @@ diff -urNp linux-3.0.9/arch/parisc/include/asm/elf.h linux-3.0.9/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.9/arch/parisc/include/asm/pgtable.h linux-3.0.9/arch/parisc/include/asm/pgtable.h
---- linux-3.0.9/arch/parisc/include/asm/pgtable.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/parisc/include/asm/pgtable.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/parisc/include/asm/pgtable.h linux-3.1.1/arch/parisc/include/asm/pgtable.h
+--- linux-3.1.1/arch/parisc/include/asm/pgtable.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/parisc/include/asm/pgtable.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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 +1329,9 @@ diff -urNp linux-3.0.9/arch/parisc/include/asm/pgtable.h linux-3.0.9/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.9/arch/parisc/kernel/module.c linux-3.0.9/arch/parisc/kernel/module.c
---- linux-3.0.9/arch/parisc/kernel/module.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/parisc/kernel/module.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/parisc/kernel/module.c linux-3.1.1/arch/parisc/kernel/module.c
+--- linux-3.1.1/arch/parisc/kernel/module.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/parisc/kernel/module.c	2011-11-16 18:39:07.000000000 -0500
 @@ -98,16 +98,38 @@
  
  /* three functions to determine where in the module core
@@ -1404,7 +1423,7 @@ diff -urNp linux-3.0.9/arch/parisc/kernel/module.c linux-3.0.9/arch/parisc/kerne
  	return (Elf_Addr)fdesc;
  }
  #endif /* CONFIG_64BIT */
-@@ -857,7 +879,7 @@ register_unwind_table(struct module *me,
+@@ -845,7 +867,7 @@ register_unwind_table(struct module *me,
  
  	table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
  	end = table + sechdrs[me->arch.unwind_section].sh_size;
@@ -1413,9 +1432,9 @@ diff -urNp linux-3.0.9/arch/parisc/kernel/module.c linux-3.0.9/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.9/arch/parisc/kernel/sys_parisc.c linux-3.0.9/arch/parisc/kernel/sys_parisc.c
---- linux-3.0.9/arch/parisc/kernel/sys_parisc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/parisc/kernel/sys_parisc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/parisc/kernel/sys_parisc.c linux-3.1.1/arch/parisc/kernel/sys_parisc.c
+--- linux-3.1.1/arch/parisc/kernel/sys_parisc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/parisc/kernel/sys_parisc.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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 +1462,9 @@ diff -urNp linux-3.0.9/arch/parisc/kernel/sys_parisc.c linux-3.0.9/arch/parisc/k
  
  	if (filp) {
  		addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-3.0.9/arch/parisc/kernel/traps.c linux-3.0.9/arch/parisc/kernel/traps.c
---- linux-3.0.9/arch/parisc/kernel/traps.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/parisc/kernel/traps.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/parisc/kernel/traps.c linux-3.1.1/arch/parisc/kernel/traps.c
+--- linux-3.1.1/arch/parisc/kernel/traps.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/parisc/kernel/traps.c	2011-11-16 18:39:07.000000000 -0500
 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
  
  			down_read(&current->mm->mmap_sem);
@@ -1457,9 +1476,9 @@ diff -urNp linux-3.0.9/arch/parisc/kernel/traps.c linux-3.0.9/arch/parisc/kernel
  				fault_address = regs->iaoq[0];
  				fault_space = regs->iasq[0];
  
-diff -urNp linux-3.0.9/arch/parisc/mm/fault.c linux-3.0.9/arch/parisc/mm/fault.c
---- linux-3.0.9/arch/parisc/mm/fault.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/parisc/mm/fault.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/parisc/mm/fault.c linux-3.1.1/arch/parisc/mm/fault.c
+--- linux-3.1.1/arch/parisc/mm/fault.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/parisc/mm/fault.c	2011-11-16 18:39:07.000000000 -0500
 @@ -15,6 +15,7 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -1575,7 +1594,7 @@ diff -urNp linux-3.0.9/arch/parisc/mm/fault.c linux-3.0.9/arch/parisc/mm/fault.c
 +	return 1;
 +}
 +
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	unsigned long i;
 +
@@ -1629,9 +1648,9 @@ diff -urNp linux-3.0.9/arch/parisc/mm/fault.c linux-3.0.9/arch/parisc/mm/fault.c
  
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-3.0.9/arch/powerpc/include/asm/elf.h linux-3.0.9/arch/powerpc/include/asm/elf.h
---- linux-3.0.9/arch/powerpc/include/asm/elf.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/elf.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/elf.h linux-3.1.1/arch/powerpc/include/asm/elf.h
+--- linux-3.1.1/arch/powerpc/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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 +1683,9 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/elf.h linux-3.0.9/arch/powerpc/i
  #endif /* __KERNEL__ */
  
  /*
-diff -urNp linux-3.0.9/arch/powerpc/include/asm/kmap_types.h linux-3.0.9/arch/powerpc/include/asm/kmap_types.h
---- linux-3.0.9/arch/powerpc/include/asm/kmap_types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/kmap_types.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/kmap_types.h linux-3.1.1/arch/powerpc/include/asm/kmap_types.h
+--- linux-3.1.1/arch/powerpc/include/asm/kmap_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/kmap_types.h	2011-11-16 18:39:07.000000000 -0500
 @@ -27,6 +27,7 @@ enum km_type {
  	KM_PPC_SYNC_PAGE,
  	KM_PPC_SYNC_ICACHE,
@@ -1675,9 +1694,9 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/kmap_types.h linux-3.0.9/arch/po
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.9/arch/powerpc/include/asm/mman.h linux-3.0.9/arch/powerpc/include/asm/mman.h
---- linux-3.0.9/arch/powerpc/include/asm/mman.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/mman.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/mman.h linux-3.1.1/arch/powerpc/include/asm/mman.h
+--- linux-3.1.1/arch/powerpc/include/asm/mman.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/mman.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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,9 +1706,9 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/mman.h linux-3.0.9/arch/powerpc/
  {
  	return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
  }
-diff -urNp linux-3.0.9/arch/powerpc/include/asm/page_64.h linux-3.0.9/arch/powerpc/include/asm/page_64.h
---- linux-3.0.9/arch/powerpc/include/asm/page_64.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/page_64.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/page_64.h linux-3.1.1/arch/powerpc/include/asm/page_64.h
+--- linux-3.1.1/arch/powerpc/include/asm/page_64.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/page_64.h	2011-11-16 18:39:07.000000000 -0500
 @@ -155,15 +155,18 @@ do {						\
   * stack by default, so in the absence of a PT_GNU_STACK program header
   * we turn execute permission off.
@@ -1711,9 +1730,9 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/page_64.h linux-3.0.9/arch/power
  
  #include <asm-generic/getorder.h>
  
-diff -urNp linux-3.0.9/arch/powerpc/include/asm/page.h linux-3.0.9/arch/powerpc/include/asm/page.h
---- linux-3.0.9/arch/powerpc/include/asm/page.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/page.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/page.h linux-3.1.1/arch/powerpc/include/asm/page.h
+--- linux-3.1.1/arch/powerpc/include/asm/page.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/page.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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 +1755,9 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/page.h linux-3.0.9/arch/powerpc/
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff -urNp linux-3.0.9/arch/powerpc/include/asm/pgtable.h linux-3.0.9/arch/powerpc/include/asm/pgtable.h
---- linux-3.0.9/arch/powerpc/include/asm/pgtable.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/pgtable.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/pgtable.h linux-3.1.1/arch/powerpc/include/asm/pgtable.h
+--- linux-3.1.1/arch/powerpc/include/asm/pgtable.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/pgtable.h	2011-11-16 18:39:07.000000000 -0500
 @@ -2,6 +2,7 @@
  #define _ASM_POWERPC_PGTABLE_H
  #ifdef __KERNEL__
@@ -1747,9 +1766,9 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/pgtable.h linux-3.0.9/arch/power
  #ifndef __ASSEMBLY__
  #include <asm/processor.h>		/* For TASK_SIZE */
  #include <asm/mmu.h>
-diff -urNp linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h
---- linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/pte-hash32.h linux-3.1.1/arch/powerpc/include/asm/pte-hash32.h
+--- linux-3.1.1/arch/powerpc/include/asm/pte-hash32.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/pte-hash32.h	2011-11-16 18:39:07.000000000 -0500
 @@ -21,6 +21,7 @@
  #define _PAGE_FILE	0x004	/* when !present: nonlinear file mapping */
  #define _PAGE_USER	0x004	/* usermode access allowed */
@@ -1758,10 +1777,10 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h linux-3.0.9/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.9/arch/powerpc/include/asm/reg.h linux-3.0.9/arch/powerpc/include/asm/reg.h
---- linux-3.0.9/arch/powerpc/include/asm/reg.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/reg.h	2011-11-15 20:02:59.000000000 -0500
-@@ -209,6 +209,7 @@
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/reg.h linux-3.1.1/arch/powerpc/include/asm/reg.h
+--- linux-3.1.1/arch/powerpc/include/asm/reg.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/reg.h	2011-11-16 18:39:07.000000000 -0500
+@@ -212,6 +212,7 @@
  #define SPRN_DBCR	0x136	/* e300 Data Breakpoint Control Reg */
  #define SPRN_DSISR	0x012	/* Data Storage Interrupt Status Register */
  #define   DSISR_NOHPTE		0x40000000	/* no translation found */
@@ -1769,10 +1788,10 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/reg.h linux-3.0.9/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.9/arch/powerpc/include/asm/system.h linux-3.0.9/arch/powerpc/include/asm/system.h
---- linux-3.0.9/arch/powerpc/include/asm/system.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/system.h	2011-11-15 20:02:59.000000000 -0500
-@@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/system.h linux-3.1.1/arch/powerpc/include/asm/system.h
+--- linux-3.1.1/arch/powerpc/include/asm/system.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/system.h	2011-11-16 18:39:07.000000000 -0500
+@@ -530,7 +530,7 @@ __cmpxchg_local(volatile void *ptr, unsi
  #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
  #endif
  
@@ -1781,9 +1800,9 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/system.h linux-3.0.9/arch/powerp
  
  /* Used in very early kernel initialization. */
  extern unsigned long reloc_offset(void);
-diff -urNp linux-3.0.9/arch/powerpc/include/asm/uaccess.h linux-3.0.9/arch/powerpc/include/asm/uaccess.h
---- linux-3.0.9/arch/powerpc/include/asm/uaccess.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/uaccess.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/uaccess.h linux-3.1.1/arch/powerpc/include/asm/uaccess.h
+--- linux-3.1.1/arch/powerpc/include/asm/uaccess.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/uaccess.h	2011-11-16 18:39:07.000000000 -0500
 @@ -13,6 +13,8 @@
  #define VERIFY_READ	0
  #define VERIFY_WRITE	1
@@ -1961,10 +1980,10 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/uaccess.h linux-3.0.9/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.9/arch/powerpc/kernel/exceptions-64e.S linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S
---- linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S	2011-11-15 20:02:59.000000000 -0500
-@@ -567,6 +567,7 @@ storage_fault_common:
+diff -urNp linux-3.1.1/arch/powerpc/kernel/exceptions-64e.S linux-3.1.1/arch/powerpc/kernel/exceptions-64e.S
+--- linux-3.1.1/arch/powerpc/kernel/exceptions-64e.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/exceptions-64e.S	2011-11-16 18:39:07.000000000 -0500
+@@ -587,6 +587,7 @@ storage_fault_common:
  	std	r14,_DAR(r1)
  	std	r15,_DSISR(r1)
  	addi	r3,r1,STACK_FRAME_OVERHEAD
@@ -1972,7 +1991,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S linux-3.0.9/arch/pow
  	mr	r4,r14
  	mr	r5,r15
  	ld	r14,PACA_EXGEN+EX_R14(r13)
-@@ -576,8 +577,7 @@ storage_fault_common:
+@@ -596,8 +597,7 @@ storage_fault_common:
  	cmpdi	r3,0
  	bne-	1f
  	b	.ret_from_except_lite
@@ -1982,10 +2001,10 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S linux-3.0.9/arch/pow
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	ld	r4,_DAR(r1)
  	bl	.bad_page_fault
-diff -urNp linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S
---- linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S	2011-11-15 20:02:59.000000000 -0500
-@@ -956,10 +956,10 @@ handle_page_fault:
+diff -urNp linux-3.1.1/arch/powerpc/kernel/exceptions-64s.S linux-3.1.1/arch/powerpc/kernel/exceptions-64s.S
+--- linux-3.1.1/arch/powerpc/kernel/exceptions-64s.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/exceptions-64s.S	2011-11-16 18:39:07.000000000 -0500
+@@ -1014,10 +1014,10 @@ handle_page_fault:
  11:	ld	r4,_DAR(r1)
  	ld	r5,_DSISR(r1)
  	addi	r3,r1,STACK_FRAME_OVERHEAD
@@ -1997,9 +2016,9 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S linux-3.0.9/arch/pow
  	mr	r5,r3
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	lwz	r4,_DAR(r1)
-diff -urNp linux-3.0.9/arch/powerpc/kernel/module_32.c linux-3.0.9/arch/powerpc/kernel/module_32.c
---- linux-3.0.9/arch/powerpc/kernel/module_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/module_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/kernel/module_32.c linux-3.1.1/arch/powerpc/kernel/module_32.c
+--- linux-3.1.1/arch/powerpc/kernel/module_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/module_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
  			me->arch.core_plt_section = i;
  	}
@@ -2009,7 +2028,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/module_32.c linux-3.0.9/arch/powerpc/
  		return -ENOEXEC;
  	}
  
-@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
+@@ -192,11 +192,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? */
@@ -2029,52 +2048,10 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/module_32.c linux-3.0.9/arch/powerpc/
  
  	/* Find this entry, or if that fails, the next avail. entry */
  	while (entry->jump[0]) {
-diff -urNp linux-3.0.9/arch/powerpc/kernel/module.c linux-3.0.9/arch/powerpc/kernel/module.c
---- linux-3.0.9/arch/powerpc/kernel/module.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/module.c	2011-11-15 20:02:59.000000000 -0500
-@@ -31,11 +31,24 @@
- 
- LIST_HEAD(module_bug_list);
- 
-+#ifdef CONFIG_PAX_KERNEXEC
- void *module_alloc(unsigned long size)
- {
- 	if (size == 0)
- 		return NULL;
- 
-+	return vmalloc(size);
-+}
-+
-+void *module_alloc_exec(unsigned long size)
-+#else
-+void *module_alloc(unsigned long size)
-+#endif
-+
-+{
-+	if (size == 0)
-+		return NULL;
-+
- 	return vmalloc_exec(size);
- }
- 
-@@ -45,6 +58,13 @@ void module_free(struct module *mod, voi
- 	vfree(module_region);
- }
- 
-+#ifdef CONFIG_PAX_KERNEXEC
-+void module_free_exec(struct module *mod, void *module_region)
-+{
-+	module_free(mod, module_region);
-+}
-+#endif
-+
- static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
- 				    const Elf_Shdr *sechdrs,
- 				    const char *name)
-diff -urNp linux-3.0.9/arch/powerpc/kernel/process.c linux-3.0.9/arch/powerpc/kernel/process.c
---- linux-3.0.9/arch/powerpc/kernel/process.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/process.c	2011-11-15 20:02:59.000000000 -0500
-@@ -676,8 +676,8 @@ void show_regs(struct pt_regs * regs)
+diff -urNp linux-3.1.1/arch/powerpc/kernel/process.c linux-3.1.1/arch/powerpc/kernel/process.c
+--- linux-3.1.1/arch/powerpc/kernel/process.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/process.c	2011-11-16 18:40:08.000000000 -0500
+@@ -682,8 +682,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
  	 */
@@ -2085,7 +2062,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/process.c linux-3.0.9/arch/powerpc/ke
  #endif
  	show_stack(current, (unsigned long *) regs->gpr[1]);
  	if (!user_mode(regs))
-@@ -1183,10 +1183,10 @@ void show_stack(struct task_struct *tsk,
+@@ -1187,10 +1187,10 @@ void show_stack(struct task_struct *tsk,
  		newsp = stack[0];
  		ip = stack[STACK_FRAME_LR_SAVE];
  		if (!firstframe || ip != lr) {
@@ -2098,7 +2075,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/process.c linux-3.0.9/arch/powerpc/ke
  				       (void *)current->ret_stack[curr_frame].ret);
  				curr_frame--;
  			}
-@@ -1206,7 +1206,7 @@ void show_stack(struct task_struct *tsk,
+@@ -1210,7 +1210,7 @@ void show_stack(struct task_struct *tsk,
  			struct pt_regs *regs = (struct pt_regs *)
  				(sp + STACK_FRAME_OVERHEAD);
  			lr = regs->link;
@@ -2107,7 +2084,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/process.c linux-3.0.9/arch/powerpc/ke
  			       regs->trap, (void *)regs->nip, (void *)lr);
  			firstframe = 1;
  		}
-@@ -1281,58 +1281,3 @@ void thread_info_cache_init(void)
+@@ -1285,58 +1285,3 @@ void thread_info_cache_init(void)
  }
  
  #endif /* THREAD_SHIFT < PAGE_SHIFT */
@@ -2166,9 +2143,9 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/process.c linux-3.0.9/arch/powerpc/ke
 -
 -	return ret;
 -}
-diff -urNp linux-3.0.9/arch/powerpc/kernel/signal_32.c linux-3.0.9/arch/powerpc/kernel/signal_32.c
---- linux-3.0.9/arch/powerpc/kernel/signal_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/signal_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/kernel/signal_32.c linux-3.1.1/arch/powerpc/kernel/signal_32.c
+--- linux-3.1.1/arch/powerpc/kernel/signal_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/signal_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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 +2155,9 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/signal_32.c linux-3.0.9/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.9/arch/powerpc/kernel/signal_64.c linux-3.0.9/arch/powerpc/kernel/signal_64.c
---- linux-3.0.9/arch/powerpc/kernel/signal_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/signal_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/kernel/signal_64.c linux-3.1.1/arch/powerpc/kernel/signal_64.c
+--- linux-3.1.1/arch/powerpc/kernel/signal_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/signal_64.c	2011-11-16 18:39:07.000000000 -0500
 @@ -430,7 +430,7 @@ int handle_rt_signal64(int signr, struct
  	current->thread.fpscr.val = 0;
  
@@ -2190,9 +2167,9 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/signal_64.c linux-3.0.9/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.9/arch/powerpc/kernel/traps.c linux-3.0.9/arch/powerpc/kernel/traps.c
---- linux-3.0.9/arch/powerpc/kernel/traps.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/traps.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/kernel/traps.c linux-3.1.1/arch/powerpc/kernel/traps.c
+--- linux-3.1.1/arch/powerpc/kernel/traps.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/traps.c	2011-11-16 18:40:08.000000000 -0500
 @@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
  static inline void pmac_backlight_unblank(void) { }
  #endif
@@ -2211,9 +2188,9 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/traps.c linux-3.0.9/arch/powerpc/kern
  	oops_exit();
  	do_exit(err);
  
-diff -urNp linux-3.0.9/arch/powerpc/kernel/vdso.c linux-3.0.9/arch/powerpc/kernel/vdso.c
---- linux-3.0.9/arch/powerpc/kernel/vdso.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/vdso.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/kernel/vdso.c linux-3.1.1/arch/powerpc/kernel/vdso.c
+--- linux-3.1.1/arch/powerpc/kernel/vdso.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/vdso.c	2011-11-16 18:39:07.000000000 -0500
 @@ -36,6 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/vdso.h>
@@ -2240,9 +2217,9 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/vdso.c linux-3.0.9/arch/powerpc/kerne
  	if (IS_ERR_VALUE(vdso_base)) {
  		rc = vdso_base;
  		goto fail_mmapsem;
-diff -urNp linux-3.0.9/arch/powerpc/lib/usercopy_64.c linux-3.0.9/arch/powerpc/lib/usercopy_64.c
---- linux-3.0.9/arch/powerpc/lib/usercopy_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/lib/usercopy_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/lib/usercopy_64.c linux-3.1.1/arch/powerpc/lib/usercopy_64.c
+--- linux-3.1.1/arch/powerpc/lib/usercopy_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/lib/usercopy_64.c	2011-11-16 18:39:07.000000000 -0500
 @@ -9,22 +9,6 @@
  #include <linux/module.h>
  #include <asm/uaccess.h>
@@ -2274,9 +2251,9 @@ diff -urNp linux-3.0.9/arch/powerpc/lib/usercopy_64.c linux-3.0.9/arch/powerpc/l
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-3.0.9/arch/powerpc/mm/fault.c linux-3.0.9/arch/powerpc/mm/fault.c
---- linux-3.0.9/arch/powerpc/mm/fault.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/mm/fault.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/mm/fault.c linux-3.1.1/arch/powerpc/mm/fault.c
+--- linux-3.1.1/arch/powerpc/mm/fault.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/mm/fault.c	2011-11-16 18:39:07.000000000 -0500
 @@ -32,6 +32,10 @@
  #include <linux/perf_event.h>
  #include <linux/magic.h>
@@ -2311,7 +2288,7 @@ diff -urNp linux-3.0.9/arch/powerpc/mm/fault.c linux-3.0.9/arch/powerpc/mm/fault
 +	return 1;
 +}
 +
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	unsigned long i;
 +
@@ -2381,9 +2358,9 @@ diff -urNp linux-3.0.9/arch/powerpc/mm/fault.c linux-3.0.9/arch/powerpc/mm/fault
  		_exception(SIGSEGV, regs, code, address);
  		return 0;
  	}
-diff -urNp linux-3.0.9/arch/powerpc/mm/mmap_64.c linux-3.0.9/arch/powerpc/mm/mmap_64.c
---- linux-3.0.9/arch/powerpc/mm/mmap_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/mm/mmap_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/mm/mmap_64.c linux-3.1.1/arch/powerpc/mm/mmap_64.c
+--- linux-3.1.1/arch/powerpc/mm/mmap_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/mm/mmap_64.c	2011-11-16 18:39:07.000000000 -0500
 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
@@ -2407,9 +2384,9 @@ diff -urNp linux-3.0.9/arch/powerpc/mm/mmap_64.c linux-3.0.9/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.9/arch/powerpc/mm/slice.c linux-3.0.9/arch/powerpc/mm/slice.c
---- linux-3.0.9/arch/powerpc/mm/slice.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/mm/slice.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/powerpc/mm/slice.c linux-3.1.1/arch/powerpc/mm/slice.c
+--- linux-3.1.1/arch/powerpc/mm/slice.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/mm/slice.c	2011-11-16 18:39:07.000000000 -0500
 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
  	if ((mm->task_size - len) < addr)
  		return 0;
@@ -2476,9 +2453,9 @@ diff -urNp linux-3.0.9/arch/powerpc/mm/slice.c linux-3.0.9/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.9/arch/s390/include/asm/elf.h linux-3.0.9/arch/s390/include/asm/elf.h
---- linux-3.0.9/arch/s390/include/asm/elf.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/include/asm/elf.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/s390/include/asm/elf.h linux-3.1.1/arch/s390/include/asm/elf.h
+--- linux-3.1.1/arch/s390/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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.  */
@@ -2496,7 +2473,7 @@ diff -urNp linux-3.0.9/arch/s390/include/asm/elf.h linux-3.0.9/arch/s390/include
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports. */
-@@ -210,7 +216,4 @@ struct linux_binprm;
+@@ -211,7 +217,4 @@ struct linux_binprm;
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
  int arch_setup_additional_pages(struct linux_binprm *, int);
  
@@ -2504,10 +2481,10 @@ diff -urNp linux-3.0.9/arch/s390/include/asm/elf.h linux-3.0.9/arch/s390/include
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif
-diff -urNp linux-3.0.9/arch/s390/include/asm/system.h linux-3.0.9/arch/s390/include/asm/system.h
---- linux-3.0.9/arch/s390/include/asm/system.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/include/asm/system.h	2011-11-15 20:02:59.000000000 -0500
-@@ -255,7 +255,7 @@ extern void (*_machine_restart)(char *co
+diff -urNp linux-3.1.1/arch/s390/include/asm/system.h linux-3.1.1/arch/s390/include/asm/system.h
+--- linux-3.1.1/arch/s390/include/asm/system.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/include/asm/system.h	2011-11-16 18:39:07.000000000 -0500
+@@ -256,7 +256,7 @@ extern void (*_machine_restart)(char *co
  extern void (*_machine_halt)(void);
  extern void (*_machine_power_off)(void);
  
@@ -2516,9 +2493,9 @@ diff -urNp linux-3.0.9/arch/s390/include/asm/system.h linux-3.0.9/arch/s390/incl
  
  static inline int tprot(unsigned long addr)
  {
-diff -urNp linux-3.0.9/arch/s390/include/asm/uaccess.h linux-3.0.9/arch/s390/include/asm/uaccess.h
---- linux-3.0.9/arch/s390/include/asm/uaccess.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/include/asm/uaccess.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/s390/include/asm/uaccess.h linux-3.1.1/arch/s390/include/asm/uaccess.h
+--- linux-3.1.1/arch/s390/include/asm/uaccess.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/include/asm/uaccess.h	2011-11-16 18:39:07.000000000 -0500
 @@ -235,6 +235,10 @@ static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -2551,10 +2528,10 @@ diff -urNp linux-3.0.9/arch/s390/include/asm/uaccess.h linux-3.0.9/arch/s390/inc
  	if (unlikely(sz != -1 && sz < n)) {
  		copy_from_user_overflow();
  		return n;
-diff -urNp linux-3.0.9/arch/s390/kernel/module.c linux-3.0.9/arch/s390/kernel/module.c
---- linux-3.0.9/arch/s390/kernel/module.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/kernel/module.c	2011-11-15 20:02:59.000000000 -0500
-@@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
+diff -urNp linux-3.1.1/arch/s390/kernel/module.c linux-3.1.1/arch/s390/kernel/module.c
+--- linux-3.1.1/arch/s390/kernel/module.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/kernel/module.c	2011-11-16 18:39:07.000000000 -0500
+@@ -161,11 +161,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
  
  	/* Increase core size by size of got & plt and set start
  	   offsets for got and plt. */
@@ -2571,7 +2548,7 @@ diff -urNp linux-3.0.9/arch/s390/kernel/module.c linux-3.0.9/arch/s390/kernel/mo
  	return 0;
  }
  
-@@ -258,7 +258,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -242,7 +242,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
  		if (info->got_initialized == 0) {
  			Elf_Addr *gotent;
  
@@ -2580,7 +2557,7 @@ diff -urNp linux-3.0.9/arch/s390/kernel/module.c linux-3.0.9/arch/s390/kernel/mo
  				info->got_offset;
  			*gotent = val;
  			info->got_initialized = 1;
-@@ -282,7 +282,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -266,7 +266,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
  		else if (r_type == R_390_GOTENT ||
  			 r_type == R_390_GOTPLTENT)
  			*(unsigned int *) loc =
@@ -2589,7 +2566,7 @@ diff -urNp linux-3.0.9/arch/s390/kernel/module.c linux-3.0.9/arch/s390/kernel/mo
  		else if (r_type == R_390_GOT64 ||
  			 r_type == R_390_GOTPLT64)
  			*(unsigned long *) loc = val;
-@@ -296,7 +296,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
  	case R_390_PLTOFF64:	/* 16 bit offset from GOT to PLT. */
  		if (info->plt_initialized == 0) {
  			unsigned int *ip;
@@ -2598,7 +2575,7 @@ diff -urNp linux-3.0.9/arch/s390/kernel/module.c linux-3.0.9/arch/s390/kernel/mo
  				info->plt_offset;
  #ifndef CONFIG_64BIT
  			ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
-@@ -321,7 +321,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -305,7 +305,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
  			       val - loc + 0xffffUL < 0x1ffffeUL) ||
  			      (r_type == R_390_PLT32DBL &&
  			       val - loc + 0xffffffffULL < 0x1fffffffeULL)))
@@ -2607,7 +2584,7 @@ diff -urNp linux-3.0.9/arch/s390/kernel/module.c linux-3.0.9/arch/s390/kernel/mo
  					me->arch.plt_offset +
  					info->plt_offset;
  			val += rela->r_addend - loc;
-@@ -343,7 +343,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -327,7 +327,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
  	case R_390_GOTOFF32:	/* 32 bit offset to GOT.  */
  	case R_390_GOTOFF64:	/* 64 bit offset to GOT. */
  		val = val + rela->r_addend -
@@ -2616,7 +2593,7 @@ diff -urNp linux-3.0.9/arch/s390/kernel/module.c linux-3.0.9/arch/s390/kernel/mo
  		if (r_type == R_390_GOTOFF16)
  			*(unsigned short *) loc = val;
  		else if (r_type == R_390_GOTOFF32)
-@@ -353,7 +353,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -337,7 +337,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
  		break;
  	case R_390_GOTPC:	/* 32 bit PC relative offset to GOT. */
  	case R_390_GOTPCDBL:	/* 32 bit PC rel. off. to GOT shifted by 1. */
@@ -2625,9 +2602,9 @@ diff -urNp linux-3.0.9/arch/s390/kernel/module.c linux-3.0.9/arch/s390/kernel/mo
  			rela->r_addend - loc;
  		if (r_type == R_390_GOTPC)
  			*(unsigned int *) loc = val;
-diff -urNp linux-3.0.9/arch/s390/kernel/process.c linux-3.0.9/arch/s390/kernel/process.c
---- linux-3.0.9/arch/s390/kernel/process.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/kernel/process.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/s390/kernel/process.c linux-3.1.1/arch/s390/kernel/process.c
+--- linux-3.1.1/arch/s390/kernel/process.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/kernel/process.c	2011-11-16 18:39:07.000000000 -0500
 @@ -319,39 +319,3 @@ unsigned long get_wchan(struct task_stru
  	}
  	return 0;
@@ -2668,9 +2645,9 @@ diff -urNp linux-3.0.9/arch/s390/kernel/process.c linux-3.0.9/arch/s390/kernel/p
 -		return base;
 -	return ret;
 -}
-diff -urNp linux-3.0.9/arch/s390/kernel/setup.c linux-3.0.9/arch/s390/kernel/setup.c
---- linux-3.0.9/arch/s390/kernel/setup.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/kernel/setup.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/s390/kernel/setup.c linux-3.1.1/arch/s390/kernel/setup.c
+--- linux-3.1.1/arch/s390/kernel/setup.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/kernel/setup.c	2011-11-16 18:39:07.000000000 -0500
 @@ -271,7 +271,7 @@ static int __init early_parse_mem(char *
  }
  early_param("mem", early_parse_mem);
@@ -2680,9 +2657,9 @@ diff -urNp linux-3.0.9/arch/s390/kernel/setup.c linux-3.0.9/arch/s390/kernel/set
  EXPORT_SYMBOL_GPL(user_mode);
  
  static int set_amode_and_uaccess(unsigned long user_amode,
-diff -urNp linux-3.0.9/arch/s390/mm/mmap.c linux-3.0.9/arch/s390/mm/mmap.c
---- linux-3.0.9/arch/s390/mm/mmap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/mm/mmap.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/s390/mm/mmap.c linux-3.1.1/arch/s390/mm/mmap.c
+--- linux-3.1.1/arch/s390/mm/mmap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/mm/mmap.c	2011-11-16 18:39:07.000000000 -0500
 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
@@ -2729,9 +2706,9 @@ diff -urNp linux-3.0.9/arch/s390/mm/mmap.c linux-3.0.9/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.9/arch/score/include/asm/system.h linux-3.0.9/arch/score/include/asm/system.h
---- linux-3.0.9/arch/score/include/asm/system.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/score/include/asm/system.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/score/include/asm/system.h linux-3.1.1/arch/score/include/asm/system.h
+--- linux-3.1.1/arch/score/include/asm/system.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/score/include/asm/system.h	2011-11-16 18:39:07.000000000 -0500
 @@ -17,7 +17,7 @@ do {								\
  #define finish_arch_switch(prev)	do {} while (0)
  
@@ -2741,9 +2718,9 @@ diff -urNp linux-3.0.9/arch/score/include/asm/system.h linux-3.0.9/arch/score/in
  
  #define mb()		barrier()
  #define rmb()		barrier()
-diff -urNp linux-3.0.9/arch/score/kernel/process.c linux-3.0.9/arch/score/kernel/process.c
---- linux-3.0.9/arch/score/kernel/process.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/score/kernel/process.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/score/kernel/process.c linux-3.1.1/arch/score/kernel/process.c
+--- linux-3.1.1/arch/score/kernel/process.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/score/kernel/process.c	2011-11-16 18:39:07.000000000 -0500
 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
  
  	return task_pt_regs(task)->cp0_epc;
@@ -2753,9 +2730,9 @@ diff -urNp linux-3.0.9/arch/score/kernel/process.c linux-3.0.9/arch/score/kernel
 -{
 -	return sp;
 -}
-diff -urNp linux-3.0.9/arch/sh/mm/mmap.c linux-3.0.9/arch/sh/mm/mmap.c
---- linux-3.0.9/arch/sh/mm/mmap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sh/mm/mmap.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sh/mm/mmap.c linux-3.1.1/arch/sh/mm/mmap.c
+--- linux-3.1.1/arch/sh/mm/mmap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sh/mm/mmap.c	2011-11-16 18:39:07.000000000 -0500
 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
  			addr = PAGE_ALIGN(addr);
  
@@ -2830,9 +2807,9 @@ diff -urNp linux-3.0.9/arch/sh/mm/mmap.c linux-3.0.9/arch/sh/mm/mmap.c
  
  bottomup:
  	/*
-diff -urNp linux-3.0.9/arch/sparc/include/asm/atomic_64.h linux-3.0.9/arch/sparc/include/asm/atomic_64.h
---- linux-3.0.9/arch/sparc/include/asm/atomic_64.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/atomic_64.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/include/asm/atomic_64.h linux-3.1.1/arch/sparc/include/asm/atomic_64.h
+--- linux-3.1.1/arch/sparc/include/asm/atomic_64.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/atomic_64.h	2011-11-16 18:39:07.000000000 -0500
 @@ -14,18 +14,40 @@
  #define ATOMIC64_INIT(i)	{ (i) }
  
@@ -2915,7 +2892,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/atomic_64.h linux-3.0.9/arch/sparc
  #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
  
  #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
-@@ -59,30 +101,65 @@ extern long atomic64_sub_ret(long, atomi
+@@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomi
  #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
  
  #define atomic_inc(v) atomic_add(1, v)
@@ -2954,7 +2931,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/atomic_64.h linux-3.0.9/arch/sparc
 +	return xchg(&v->counter, new);
 +}
  
- static inline int atomic_add_unless(atomic_t *v, int a, int u)
+ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
  {
 -	int c, old;
 +	int c, old, new;
@@ -2979,13 +2956,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/atomic_64.h linux-3.0.9/arch/sparc
  		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)
-@@ -90,20 +167,35 @@ static inline int atomic_add_unless(atom
+@@ -89,20 +166,35 @@ static inline int __atomic_add_unless(at
  #define atomic64_cmpxchg(v, o, n) \
  	((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
  #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
@@ -3025,9 +2996,9 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/atomic_64.h linux-3.0.9/arch/sparc
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-3.0.9/arch/sparc/include/asm/cache.h linux-3.0.9/arch/sparc/include/asm/cache.h
---- linux-3.0.9/arch/sparc/include/asm/cache.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/cache.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/include/asm/cache.h linux-3.1.1/arch/sparc/include/asm/cache.h
+--- linux-3.1.1/arch/sparc/include/asm/cache.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/cache.h	2011-11-16 18:39:07.000000000 -0500
 @@ -10,7 +10,7 @@
  #define ARCH_SLAB_MINALIGN	__alignof__(unsigned long long)
  
@@ -3037,9 +3008,9 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/cache.h linux-3.0.9/arch/sparc/inc
  
  #ifdef CONFIG_SPARC32
  #define SMP_CACHE_BYTES_SHIFT 5
-diff -urNp linux-3.0.9/arch/sparc/include/asm/elf_32.h linux-3.0.9/arch/sparc/include/asm/elf_32.h
---- linux-3.0.9/arch/sparc/include/asm/elf_32.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/elf_32.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/include/asm/elf_32.h linux-3.1.1/arch/sparc/include/asm/elf_32.h
+--- linux-3.1.1/arch/sparc/include/asm/elf_32.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/elf_32.h	2011-11-16 18:39:07.000000000 -0500
 @@ -114,6 +114,13 @@ typedef struct {
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
@@ -3054,9 +3025,9 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/elf_32.h linux-3.0.9/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.9/arch/sparc/include/asm/elf_64.h linux-3.0.9/arch/sparc/include/asm/elf_64.h
---- linux-3.0.9/arch/sparc/include/asm/elf_64.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/elf_64.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/include/asm/elf_64.h linux-3.1.1/arch/sparc/include/asm/elf_64.h
+--- linux-3.1.1/arch/sparc/include/asm/elf_64.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/elf_64.h	2011-11-16 18:39:07.000000000 -0500
 @@ -180,6 +180,13 @@ typedef struct {
  #define ELF_ET_DYN_BASE		0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE	0x0000000070000000UL
@@ -3071,9 +3042,9 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/elf_64.h linux-3.0.9/arch/sparc/in
  extern unsigned long sparc64_elf_hwcap;
  #define ELF_HWCAP	sparc64_elf_hwcap
  
-diff -urNp linux-3.0.9/arch/sparc/include/asm/pgtable_32.h linux-3.0.9/arch/sparc/include/asm/pgtable_32.h
---- linux-3.0.9/arch/sparc/include/asm/pgtable_32.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/pgtable_32.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/include/asm/pgtable_32.h linux-3.1.1/arch/sparc/include/asm/pgtable_32.h
+--- linux-3.1.1/arch/sparc/include/asm/pgtable_32.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/pgtable_32.h	2011-11-16 18:39:07.000000000 -0500
 @@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
  BTFIXUPDEF_INT(page_none)
  BTFIXUPDEF_INT(page_copy)
@@ -3105,9 +3076,9 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/pgtable_32.h linux-3.0.9/arch/spar
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urNp linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h
---- linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/include/asm/pgtsrmmu.h linux-3.1.1/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-3.1.1/arch/sparc/include/asm/pgtsrmmu.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/pgtsrmmu.h	2011-11-16 18:39:07.000000000 -0500
 @@ -115,6 +115,13 @@
  				    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3122,9 +3093,9 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.9/arch/sparc/
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
  				    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urNp linux-3.0.9/arch/sparc/include/asm/spinlock_64.h linux-3.0.9/arch/sparc/include/asm/spinlock_64.h
---- linux-3.0.9/arch/sparc/include/asm/spinlock_64.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/spinlock_64.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/include/asm/spinlock_64.h linux-3.1.1/arch/sparc/include/asm/spinlock_64.h
+--- linux-3.1.1/arch/sparc/include/asm/spinlock_64.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/spinlock_64.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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 +3193,9 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/spinlock_64.h linux-3.0.9/arch/spa
  {
  	unsigned long mask, tmp1, tmp2, result;
  
-diff -urNp linux-3.0.9/arch/sparc/include/asm/thread_info_32.h linux-3.0.9/arch/sparc/include/asm/thread_info_32.h
---- linux-3.0.9/arch/sparc/include/asm/thread_info_32.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/thread_info_32.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/include/asm/thread_info_32.h linux-3.1.1/arch/sparc/include/asm/thread_info_32.h
+--- linux-3.1.1/arch/sparc/include/asm/thread_info_32.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/thread_info_32.h	2011-11-16 18:39:07.000000000 -0500
 @@ -50,6 +50,8 @@ struct thread_info {
  	unsigned long		w_saved;
  
@@ -3234,9 +3205,9 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/thread_info_32.h linux-3.0.9/arch/
  };
  
  /*
-diff -urNp linux-3.0.9/arch/sparc/include/asm/thread_info_64.h linux-3.0.9/arch/sparc/include/asm/thread_info_64.h
---- linux-3.0.9/arch/sparc/include/asm/thread_info_64.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/thread_info_64.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/include/asm/thread_info_64.h linux-3.1.1/arch/sparc/include/asm/thread_info_64.h
+--- linux-3.1.1/arch/sparc/include/asm/thread_info_64.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/thread_info_64.h	2011-11-16 18:39:07.000000000 -0500
 @@ -63,6 +63,8 @@ struct thread_info {
  	struct pt_regs		*kern_una_regs;
  	unsigned int		kern_una_insn;
@@ -3246,9 +3217,9 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/thread_info_64.h linux-3.0.9/arch/
  	unsigned long		fpregs[0] __attribute__ ((aligned(64)));
  };
  
-diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess_32.h linux-3.0.9/arch/sparc/include/asm/uaccess_32.h
---- linux-3.0.9/arch/sparc/include/asm/uaccess_32.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/uaccess_32.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/include/asm/uaccess_32.h linux-3.1.1/arch/sparc/include/asm/uaccess_32.h
+--- linux-3.1.1/arch/sparc/include/asm/uaccess_32.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/uaccess_32.h	2011-11-16 18:39:07.000000000 -0500
 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
  
  static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3300,9 +3271,9 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess_32.h linux-3.0.9/arch/spar
  	return __copy_user((__force void __user *) to, from, n);
  }
  
-diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess_64.h linux-3.0.9/arch/sparc/include/asm/uaccess_64.h
---- linux-3.0.9/arch/sparc/include/asm/uaccess_64.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/uaccess_64.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/include/asm/uaccess_64.h linux-3.1.1/arch/sparc/include/asm/uaccess_64.h
+--- linux-3.1.1/arch/sparc/include/asm/uaccess_64.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/uaccess_64.h	2011-11-16 18:39:07.000000000 -0500
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <linux/string.h>
@@ -3345,9 +3316,9 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess_64.h linux-3.0.9/arch/spar
  	if (unlikely(ret))
  		ret = copy_to_user_fixup(to, from, size);
  	return ret;
-diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess.h linux-3.0.9/arch/sparc/include/asm/uaccess.h
---- linux-3.0.9/arch/sparc/include/asm/uaccess.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/uaccess.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/include/asm/uaccess.h linux-3.1.1/arch/sparc/include/asm/uaccess.h
+--- linux-3.1.1/arch/sparc/include/asm/uaccess.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/uaccess.h	2011-11-16 18:39:07.000000000 -0500
 @@ -1,5 +1,13 @@
  #ifndef ___ASM_SPARC_UACCESS_H
  #define ___ASM_SPARC_UACCESS_H
@@ -3362,9 +3333,9 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess.h linux-3.0.9/arch/sparc/i
  #if defined(__sparc__) && defined(__arch64__)
  #include <asm/uaccess_64.h>
  #else
-diff -urNp linux-3.0.9/arch/sparc/kernel/Makefile linux-3.0.9/arch/sparc/kernel/Makefile
---- linux-3.0.9/arch/sparc/kernel/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/Makefile	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/kernel/Makefile linux-3.1.1/arch/sparc/kernel/Makefile
+--- linux-3.1.1/arch/sparc/kernel/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/Makefile	2011-11-16 18:39:07.000000000 -0500
 @@ -3,7 +3,7 @@
  #
  
@@ -3374,9 +3345,9 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/Makefile linux-3.0.9/arch/sparc/kernel/
  
  extra-y     := head_$(BITS).o
  extra-y     += init_task.o
-diff -urNp linux-3.0.9/arch/sparc/kernel/process_32.c linux-3.0.9/arch/sparc/kernel/process_32.c
---- linux-3.0.9/arch/sparc/kernel/process_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/process_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/kernel/process_32.c linux-3.1.1/arch/sparc/kernel/process_32.c
+--- linux-3.1.1/arch/sparc/kernel/process_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/process_32.c	2011-11-16 18:40:08.000000000 -0500
 @@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
  		       rw->ins[4], rw->ins[5],
  		       rw->ins[6],
@@ -3412,9 +3383,9 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/process_32.c linux-3.0.9/arch/sparc/ker
  		fp = rw->ins[6];
  	} while (++count < 16);
  	printk("\n");
-diff -urNp linux-3.0.9/arch/sparc/kernel/process_64.c linux-3.0.9/arch/sparc/kernel/process_64.c
---- linux-3.0.9/arch/sparc/kernel/process_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/process_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/kernel/process_64.c linux-3.1.1/arch/sparc/kernel/process_64.c
+--- linux-3.1.1/arch/sparc/kernel/process_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/process_64.c	2011-11-16 18:40:08.000000000 -0500
 @@ -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 +3421,9 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/process_64.c linux-3.0.9/arch/sparc/ker
  			       (void *) gp->tpc,
  			       (void *) gp->o7,
  			       (void *) gp->i7,
-diff -urNp linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c
---- linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/kernel/sys_sparc_32.c linux-3.1.1/arch/sparc/kernel/sys_sparc_32.c
+--- linux-3.1.1/arch/sparc/kernel/sys_sparc_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/sys_sparc_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
  	if (ARCH_SUN4C && len > 0x20000000)
  		return -ENOMEM;
@@ -3471,9 +3442,9 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c linux-3.0.9/arch/sparc/k
  			return addr;
  		addr = vmm->vm_end;
  		if (flags & MAP_SHARED)
-diff -urNp linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c
---- linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/kernel/sys_sparc_64.c linux-3.1.1/arch/sparc/kernel/sys_sparc_64.c
+--- linux-3.1.1/arch/sparc/kernel/sys_sparc_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/sys_sparc_64.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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 +3592,9 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c linux-3.0.9/arch/sparc/k
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-3.0.9/arch/sparc/kernel/traps_32.c linux-3.0.9/arch/sparc/kernel/traps_32.c
---- linux-3.0.9/arch/sparc/kernel/traps_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/traps_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/kernel/traps_32.c linux-3.1.1/arch/sparc/kernel/traps_32.c
+--- linux-3.1.1/arch/sparc/kernel/traps_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/traps_32.c	2011-11-16 18:40:08.000000000 -0500
 @@ -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 +3624,9 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/traps_32.c linux-3.0.9/arch/sparc/kerne
  	do_exit(SIGSEGV);
  }
  
-diff -urNp linux-3.0.9/arch/sparc/kernel/traps_64.c linux-3.0.9/arch/sparc/kernel/traps_64.c
---- linux-3.0.9/arch/sparc/kernel/traps_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/traps_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/kernel/traps_64.c linux-3.1.1/arch/sparc/kernel/traps_64.c
+--- linux-3.1.1/arch/sparc/kernel/traps_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/traps_64.c	2011-11-16 18:40:08.000000000 -0500
 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
  		       i + 1,
  		       p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -3793,9 +3764,9 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/traps_64.c linux-3.0.9/arch/sparc/kerne
  	do_exit(SIGSEGV);
  }
  EXPORT_SYMBOL(die_if_kernel);
-diff -urNp linux-3.0.9/arch/sparc/kernel/unaligned_64.c linux-3.0.9/arch/sparc/kernel/unaligned_64.c
---- linux-3.0.9/arch/sparc/kernel/unaligned_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/unaligned_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/kernel/unaligned_64.c linux-3.1.1/arch/sparc/kernel/unaligned_64.c
+--- linux-3.1.1/arch/sparc/kernel/unaligned_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/unaligned_64.c	2011-11-16 18:40:08.000000000 -0500
 @@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs
  	static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
  
@@ -3805,9 +3776,9 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/unaligned_64.c linux-3.0.9/arch/sparc/k
  		       regs->tpc, (void *) regs->tpc);
  	}
  }
-diff -urNp linux-3.0.9/arch/sparc/lib/atomic_64.S linux-3.0.9/arch/sparc/lib/atomic_64.S
---- linux-3.0.9/arch/sparc/lib/atomic_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/lib/atomic_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/lib/atomic_64.S linux-3.1.1/arch/sparc/lib/atomic_64.S
+--- linux-3.1.1/arch/sparc/lib/atomic_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/lib/atomic_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -18,7 +18,12 @@
  atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
  	BACKOFF_SETUP(%o2)
@@ -4042,9 +4013,9 @@ diff -urNp linux-3.0.9/arch/sparc/lib/atomic_64.S linux-3.0.9/arch/sparc/lib/ato
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, BACKOFF_LABEL(2f, 1b)
-diff -urNp linux-3.0.9/arch/sparc/lib/ksyms.c linux-3.0.9/arch/sparc/lib/ksyms.c
---- linux-3.0.9/arch/sparc/lib/ksyms.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/lib/ksyms.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/lib/ksyms.c linux-3.1.1/arch/sparc/lib/ksyms.c
+--- linux-3.1.1/arch/sparc/lib/ksyms.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/lib/ksyms.c	2011-11-16 18:39:07.000000000 -0500
 @@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* Atomic counter implementation. */
@@ -4064,9 +4035,9 @@ diff -urNp linux-3.0.9/arch/sparc/lib/ksyms.c linux-3.0.9/arch/sparc/lib/ksyms.c
  EXPORT_SYMBOL(atomic64_sub_ret);
  
  /* Atomic bit operations. */
-diff -urNp linux-3.0.9/arch/sparc/lib/Makefile linux-3.0.9/arch/sparc/lib/Makefile
---- linux-3.0.9/arch/sparc/lib/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/lib/Makefile	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/lib/Makefile linux-3.1.1/arch/sparc/lib/Makefile
+--- linux-3.1.1/arch/sparc/lib/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/lib/Makefile	2011-11-16 18:39:07.000000000 -0500
 @@ -2,7 +2,7 @@
  #
  
@@ -4076,9 +4047,9 @@ diff -urNp linux-3.0.9/arch/sparc/lib/Makefile linux-3.0.9/arch/sparc/lib/Makefi
  
  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.9/arch/sparc/Makefile linux-3.0.9/arch/sparc/Makefile
---- linux-3.0.9/arch/sparc/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/Makefile	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/Makefile linux-3.1.1/arch/sparc/Makefile
+--- linux-3.1.1/arch/sparc/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/Makefile	2011-11-16 18:40:08.000000000 -0500
 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sparc
  # Export what is needed by arch/sparc/boot/Makefile
  export VMLINUX_INIT VMLINUX_MAIN
@@ -4088,9 +4059,9 @@ diff -urNp linux-3.0.9/arch/sparc/Makefile linux-3.0.9/arch/sparc/Makefile
  VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
  VMLINUX_MAIN += $(drivers-y) $(net-y)
  
-diff -urNp linux-3.0.9/arch/sparc/mm/fault_32.c linux-3.0.9/arch/sparc/mm/fault_32.c
---- linux-3.0.9/arch/sparc/mm/fault_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/mm/fault_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/mm/fault_32.c linux-3.1.1/arch/sparc/mm/fault_32.c
+--- linux-3.1.1/arch/sparc/mm/fault_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/mm/fault_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -22,6 +22,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -4351,7 +4322,7 @@ diff -urNp linux-3.0.9/arch/sparc/mm/fault_32.c linux-3.0.9/arch/sparc/mm/fault_
 +	return 1;
 +}
 +
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	unsigned long i;
 +
@@ -4395,9 +4366,9 @@ diff -urNp linux-3.0.9/arch/sparc/mm/fault_32.c linux-3.0.9/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.9/arch/sparc/mm/fault_64.c linux-3.0.9/arch/sparc/mm/fault_64.c
---- linux-3.0.9/arch/sparc/mm/fault_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/mm/fault_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/mm/fault_64.c linux-3.1.1/arch/sparc/mm/fault_64.c
+--- linux-3.1.1/arch/sparc/mm/fault_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/mm/fault_64.c	2011-11-16 18:40:08.000000000 -0500
 @@ -21,6 +21,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -4856,7 +4827,7 @@ diff -urNp linux-3.0.9/arch/sparc/mm/fault_64.c linux-3.0.9/arch/sparc/mm/fault_
 +	return 1;
 +}
 +
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	unsigned long i;
 +
@@ -4905,9 +4876,9 @@ diff -urNp linux-3.0.9/arch/sparc/mm/fault_64.c linux-3.0.9/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.9/arch/sparc/mm/hugetlbpage.c linux-3.0.9/arch/sparc/mm/hugetlbpage.c
---- linux-3.0.9/arch/sparc/mm/hugetlbpage.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/mm/hugetlbpage.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/mm/hugetlbpage.c linux-3.1.1/arch/sparc/mm/hugetlbpage.c
+--- linux-3.1.1/arch/sparc/mm/hugetlbpage.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/mm/hugetlbpage.c	2011-11-16 18:39:07.000000000 -0500
 @@ -68,7 +68,7 @@ full_search:
  			}
  			return -ENOMEM;
@@ -4967,9 +4938,9 @@ diff -urNp linux-3.0.9/arch/sparc/mm/hugetlbpage.c linux-3.0.9/arch/sparc/mm/hug
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-3.0.9/arch/sparc/mm/init_32.c linux-3.0.9/arch/sparc/mm/init_32.c
---- linux-3.0.9/arch/sparc/mm/init_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/mm/init_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/mm/init_32.c linux-3.1.1/arch/sparc/mm/init_32.c
+--- linux-3.1.1/arch/sparc/mm/init_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/mm/init_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -316,6 +316,9 @@ extern void device_scan(void);
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
@@ -5004,9 +4975,9 @@ diff -urNp linux-3.0.9/arch/sparc/mm/init_32.c linux-3.0.9/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.9/arch/sparc/mm/Makefile linux-3.0.9/arch/sparc/mm/Makefile
---- linux-3.0.9/arch/sparc/mm/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/mm/Makefile	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/mm/Makefile linux-3.1.1/arch/sparc/mm/Makefile
+--- linux-3.1.1/arch/sparc/mm/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/mm/Makefile	2011-11-16 18:39:07.000000000 -0500
 @@ -2,7 +2,7 @@
  #
  
@@ -5014,11 +4985,11 @@ diff -urNp linux-3.0.9/arch/sparc/mm/Makefile linux-3.0.9/arch/sparc/mm/Makefile
 -ccflags-y := -Werror
 +#ccflags-y := -Werror
  
- obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
+ obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o gup.o
  obj-y                   += fault_$(BITS).o
-diff -urNp linux-3.0.9/arch/sparc/mm/srmmu.c linux-3.0.9/arch/sparc/mm/srmmu.c
---- linux-3.0.9/arch/sparc/mm/srmmu.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/mm/srmmu.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/sparc/mm/srmmu.c linux-3.1.1/arch/sparc/mm/srmmu.c
+--- linux-3.1.1/arch/sparc/mm/srmmu.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/mm/srmmu.c	2011-11-16 18:39:07.000000000 -0500
 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
  	PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
  	BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -5033,9 +5004,9 @@ diff -urNp linux-3.0.9/arch/sparc/mm/srmmu.c linux-3.0.9/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.9/arch/um/include/asm/kmap_types.h linux-3.0.9/arch/um/include/asm/kmap_types.h
---- linux-3.0.9/arch/um/include/asm/kmap_types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/include/asm/kmap_types.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/um/include/asm/kmap_types.h linux-3.1.1/arch/um/include/asm/kmap_types.h
+--- linux-3.1.1/arch/um/include/asm/kmap_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/include/asm/kmap_types.h	2011-11-16 18:39:07.000000000 -0500
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -5044,9 +5015,9 @@ diff -urNp linux-3.0.9/arch/um/include/asm/kmap_types.h linux-3.0.9/arch/um/incl
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.9/arch/um/include/asm/page.h linux-3.0.9/arch/um/include/asm/page.h
---- linux-3.0.9/arch/um/include/asm/page.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/include/asm/page.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/um/include/asm/page.h linux-3.1.1/arch/um/include/asm/page.h
+--- linux-3.1.1/arch/um/include/asm/page.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/include/asm/page.h	2011-11-16 18:39:07.000000000 -0500
 @@ -14,6 +14,9 @@
  #define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)
  #define PAGE_MASK	(~(PAGE_SIZE-1))
@@ -5057,9 +5028,9 @@ diff -urNp linux-3.0.9/arch/um/include/asm/page.h linux-3.0.9/arch/um/include/as
  #ifndef __ASSEMBLY__
  
  struct page;
-diff -urNp linux-3.0.9/arch/um/kernel/process.c linux-3.0.9/arch/um/kernel/process.c
---- linux-3.0.9/arch/um/kernel/process.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/kernel/process.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/um/kernel/process.c linux-3.1.1/arch/um/kernel/process.c
+--- linux-3.1.1/arch/um/kernel/process.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/kernel/process.c	2011-11-16 18:39:07.000000000 -0500
 @@ -404,22 +404,6 @@ int singlestepping(void * t)
  	return 2;
  }
@@ -5083,9 +5054,9 @@ diff -urNp linux-3.0.9/arch/um/kernel/process.c linux-3.0.9/arch/um/kernel/proce
  unsigned long get_wchan(struct task_struct *p)
  {
  	unsigned long stack_page, sp, ip;
-diff -urNp linux-3.0.9/arch/um/Makefile linux-3.0.9/arch/um/Makefile
---- linux-3.0.9/arch/um/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/Makefile	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/um/Makefile linux-3.1.1/arch/um/Makefile
+--- linux-3.1.1/arch/um/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/Makefile	2011-11-16 18:39:07.000000000 -0500
 @@ -49,6 +49,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINE
  	$(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
  	$(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64
@@ -5097,9 +5068,9 @@ diff -urNp linux-3.0.9/arch/um/Makefile linux-3.0.9/arch/um/Makefile
  include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
  
  #This will adjust *FLAGS accordingly to the platform.
-diff -urNp linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h
---- linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/um/sys-i386/shared/sysdep/system.h linux-3.1.1/arch/um/sys-i386/shared/sysdep/system.h
+--- linux-3.1.1/arch/um/sys-i386/shared/sysdep/system.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/sys-i386/shared/sysdep/system.h	2011-11-16 18:39:07.000000000 -0500
 @@ -17,7 +17,7 @@
  # define AT_VECTOR_SIZE_ARCH 1
  #endif
@@ -5109,9 +5080,9 @@ diff -urNp linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h linux-3.0.9/arch/
  
  void default_idle(void);
  
-diff -urNp linux-3.0.9/arch/um/sys-i386/syscalls.c linux-3.0.9/arch/um/sys-i386/syscalls.c
---- linux-3.0.9/arch/um/sys-i386/syscalls.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/sys-i386/syscalls.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/um/sys-i386/syscalls.c linux-3.1.1/arch/um/sys-i386/syscalls.c
+--- linux-3.1.1/arch/um/sys-i386/syscalls.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/sys-i386/syscalls.c	2011-11-16 18:39:07.000000000 -0500
 @@ -11,6 +11,21 @@
  #include "asm/uaccess.h"
  #include "asm/unistd.h"
@@ -5134,9 +5105,9 @@ diff -urNp linux-3.0.9/arch/um/sys-i386/syscalls.c linux-3.0.9/arch/um/sys-i386/
  /*
   * The prototype on i386 is:
   *
-diff -urNp linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h
---- linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.1.1/arch/um/sys-x86_64/shared/sysdep/system.h
+--- linux-3.1.1/arch/um/sys-x86_64/shared/sysdep/system.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/sys-x86_64/shared/sysdep/system.h	2011-11-16 18:39:07.000000000 -0500
 @@ -17,7 +17,7 @@
  # define AT_VECTOR_SIZE_ARCH 1
  #endif
@@ -5146,9 +5117,9 @@ diff -urNp linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.0.9/arc
  
  void default_idle(void);
  
-diff -urNp linux-3.0.9/arch/x86/boot/bitops.h linux-3.0.9/arch/x86/boot/bitops.h
---- linux-3.0.9/arch/x86/boot/bitops.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/bitops.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/boot/bitops.h linux-3.1.1/arch/x86/boot/bitops.h
+--- linux-3.1.1/arch/x86/boot/bitops.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/bitops.h	2011-11-16 18:39:07.000000000 -0500
 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int 
  	u8 v;
  	const u32 *p = (const u32 *)addr;
@@ -5167,9 +5138,9 @@ diff -urNp linux-3.0.9/arch/x86/boot/bitops.h linux-3.0.9/arch/x86/boot/bitops.h
  }
  
  #endif /* BOOT_BITOPS_H */
-diff -urNp linux-3.0.9/arch/x86/boot/boot.h linux-3.0.9/arch/x86/boot/boot.h
---- linux-3.0.9/arch/x86/boot/boot.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/boot.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/boot/boot.h linux-3.1.1/arch/x86/boot/boot.h
+--- linux-3.1.1/arch/x86/boot/boot.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/boot.h	2011-11-16 18:39:07.000000000 -0500
 @@ -85,7 +85,7 @@ static inline void io_delay(void)
  static inline u16 ds(void)
  {
@@ -5188,9 +5159,9 @@ diff -urNp linux-3.0.9/arch/x86/boot/boot.h linux-3.0.9/arch/x86/boot/boot.h
  	    : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
  	return diff;
  }
-diff -urNp linux-3.0.9/arch/x86/boot/compressed/head_32.S linux-3.0.9/arch/x86/boot/compressed/head_32.S
---- linux-3.0.9/arch/x86/boot/compressed/head_32.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/compressed/head_32.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/boot/compressed/head_32.S linux-3.1.1/arch/x86/boot/compressed/head_32.S
+--- linux-3.1.1/arch/x86/boot/compressed/head_32.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/compressed/head_32.S	2011-11-16 18:39:07.000000000 -0500
 @@ -76,7 +76,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl    %eax, %ebx
@@ -5219,9 +5190,9 @@ diff -urNp linux-3.0.9/arch/x86/boot/compressed/head_32.S linux-3.0.9/arch/x86/b
  	addl	%ebx, -__PAGE_OFFSET(%ebx, %ecx)
  	jmp	1b
  2:
-diff -urNp linux-3.0.9/arch/x86/boot/compressed/head_64.S linux-3.0.9/arch/x86/boot/compressed/head_64.S
---- linux-3.0.9/arch/x86/boot/compressed/head_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/compressed/head_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/boot/compressed/head_64.S linux-3.1.1/arch/x86/boot/compressed/head_64.S
+--- linux-3.1.1/arch/x86/boot/compressed/head_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/compressed/head_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -91,7 +91,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl	%eax, %ebx
@@ -5240,9 +5211,9 @@ diff -urNp linux-3.0.9/arch/x86/boot/compressed/head_64.S linux-3.0.9/arch/x86/b
  #endif
  
  	/* Target address to relocate to for decompression */
-diff -urNp linux-3.0.9/arch/x86/boot/compressed/Makefile linux-3.0.9/arch/x86/boot/compressed/Makefile
---- linux-3.0.9/arch/x86/boot/compressed/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/compressed/Makefile	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/boot/compressed/Makefile linux-3.1.1/arch/x86/boot/compressed/Makefile
+--- linux-3.1.1/arch/x86/boot/compressed/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/compressed/Makefile	2011-11-16 18:39:07.000000000 -0500
 @@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
  KBUILD_CFLAGS += $(cflags-y)
  KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
@@ -5253,9 +5224,9 @@ diff -urNp linux-3.0.9/arch/x86/boot/compressed/Makefile linux-3.0.9/arch/x86/bo
  
  KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
-diff -urNp linux-3.0.9/arch/x86/boot/compressed/misc.c linux-3.0.9/arch/x86/boot/compressed/misc.c
---- linux-3.0.9/arch/x86/boot/compressed/misc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/compressed/misc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/boot/compressed/misc.c linux-3.1.1/arch/x86/boot/compressed/misc.c
+--- linux-3.1.1/arch/x86/boot/compressed/misc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/compressed/misc.c	2011-11-16 18:39:07.000000000 -0500
 @@ -310,7 +310,7 @@ static void parse_elf(void *output)
  		case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
@@ -5274,9 +5245,9 @@ diff -urNp linux-3.0.9/arch/x86/boot/compressed/misc.c linux-3.0.9/arch/x86/boot
  		error("Wrong destination address");
  #endif
  
-diff -urNp linux-3.0.9/arch/x86/boot/compressed/relocs.c linux-3.0.9/arch/x86/boot/compressed/relocs.c
---- linux-3.0.9/arch/x86/boot/compressed/relocs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/compressed/relocs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/boot/compressed/relocs.c linux-3.1.1/arch/x86/boot/compressed/relocs.c
+--- linux-3.1.1/arch/x86/boot/compressed/relocs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/compressed/relocs.c	2011-11-16 18:39:07.000000000 -0500
 @@ -13,8 +13,11 @@
  
  static void die(char *fmt, ...);
@@ -5469,9 +5440,9 @@ diff -urNp linux-3.0.9/arch/x86/boot/compressed/relocs.c linux-3.0.9/arch/x86/bo
  	read_shdrs(fp);
  	read_strtabs(fp);
  	read_symtabs(fp);
-diff -urNp linux-3.0.9/arch/x86/boot/cpucheck.c linux-3.0.9/arch/x86/boot/cpucheck.c
---- linux-3.0.9/arch/x86/boot/cpucheck.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/cpucheck.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/boot/cpucheck.c linux-3.1.1/arch/x86/boot/cpucheck.c
+--- linux-3.1.1/arch/x86/boot/cpucheck.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/cpucheck.c	2011-11-16 18:39:07.000000000 -0500
 @@ -74,7 +74,7 @@ static int has_fpu(void)
  	u16 fcw = -1, fsw = -1;
  	u32 cr0;
@@ -5567,9 +5538,9 @@ diff -urNp linux-3.0.9/arch/x86/boot/cpucheck.c linux-3.0.9/arch/x86/boot/cpuche
  
  		err = check_flags();
  	}
-diff -urNp linux-3.0.9/arch/x86/boot/header.S linux-3.0.9/arch/x86/boot/header.S
---- linux-3.0.9/arch/x86/boot/header.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/header.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/boot/header.S linux-3.1.1/arch/x86/boot/header.S
+--- linux-3.1.1/arch/x86/boot/header.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/header.S	2011-11-16 18:39:07.000000000 -0500
 @@ -224,7 +224,7 @@ setup_data:		.quad 0			# 64-bit physical
  						# single linked list of
  						# struct setup_data
@@ -5579,10 +5550,10 @@ diff -urNp linux-3.0.9/arch/x86/boot/header.S linux-3.0.9/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.9/arch/x86/boot/Makefile linux-3.0.9/arch/x86/boot/Makefile
---- linux-3.0.9/arch/x86/boot/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/Makefile	2011-11-15 20:02:59.000000000 -0500
-@@ -69,6 +69,9 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os 
+diff -urNp linux-3.1.1/arch/x86/boot/Makefile linux-3.1.1/arch/x86/boot/Makefile
+--- linux-3.1.1/arch/x86/boot/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/Makefile	2011-11-16 18:39:07.000000000 -0500
+@@ -63,6 +63,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)
@@ -5592,9 +5563,9 @@ diff -urNp linux-3.0.9/arch/x86/boot/Makefile linux-3.0.9/arch/x86/boot/Makefile
  KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
  
-diff -urNp linux-3.0.9/arch/x86/boot/memory.c linux-3.0.9/arch/x86/boot/memory.c
---- linux-3.0.9/arch/x86/boot/memory.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/memory.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/boot/memory.c linux-3.1.1/arch/x86/boot/memory.c
+--- linux-3.1.1/arch/x86/boot/memory.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/memory.c	2011-11-16 18:39:07.000000000 -0500
 @@ -19,7 +19,7 @@
  
  static int detect_memory_e820(void)
@@ -5604,9 +5575,9 @@ diff -urNp linux-3.0.9/arch/x86/boot/memory.c linux-3.0.9/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.9/arch/x86/boot/video.c linux-3.0.9/arch/x86/boot/video.c
---- linux-3.0.9/arch/x86/boot/video.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/video.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/boot/video.c linux-3.1.1/arch/x86/boot/video.c
+--- linux-3.1.1/arch/x86/boot/video.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/video.c	2011-11-16 18:39:07.000000000 -0500
 @@ -96,7 +96,7 @@ static void store_mode_params(void)
  static unsigned int get_entry(void)
  {
@@ -5616,9 +5587,9 @@ diff -urNp linux-3.0.9/arch/x86/boot/video.c linux-3.0.9/arch/x86/boot/video.c
  	int key;
  	unsigned int v;
  
-diff -urNp linux-3.0.9/arch/x86/boot/video-vesa.c linux-3.0.9/arch/x86/boot/video-vesa.c
---- linux-3.0.9/arch/x86/boot/video-vesa.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/video-vesa.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/boot/video-vesa.c linux-3.1.1/arch/x86/boot/video-vesa.c
+--- linux-3.1.1/arch/x86/boot/video-vesa.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/video-vesa.c	2011-11-16 18:39:07.000000000 -0500
 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
  
  	boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5627,9 +5598,9 @@ diff -urNp linux-3.0.9/arch/x86/boot/video-vesa.c linux-3.0.9/arch/x86/boot/vide
  }
  
  /*
-diff -urNp linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S
---- linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.1.1/arch/x86/crypto/aes-x86_64-asm_64.S
+--- linux-3.1.1/arch/x86/crypto/aes-x86_64-asm_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/crypto/aes-x86_64-asm_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -8,6 +8,8 @@
   * including this sentence is retained in full.
   */
@@ -5648,9 +5619,9 @@ diff -urNp linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.9/arch/x86/
  #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
  	movq	r1,r2;			\
  	movq	r3,r4;			\
-diff -urNp linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S
---- linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.1.1/arch/x86/crypto/salsa20-x86_64-asm_64.S
+--- linux-3.1.1/arch/x86/crypto/salsa20-x86_64-asm_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/crypto/salsa20-x86_64-asm_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -1,3 +1,5 @@
 +#include <asm/alternative-asm.h>
 +
@@ -5679,9 +5650,9 @@ diff -urNp linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.9/arch/
  	mov	%rsi,%rdx
 +	pax_force_retaddr
  	ret
-diff -urNp linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S
---- linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.1.1/arch/x86/crypto/twofish-x86_64-asm_64.S
+--- linux-3.1.1/arch/x86/crypto/twofish-x86_64-asm_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/crypto/twofish-x86_64-asm_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -21,6 +21,7 @@
  .text
  
@@ -5704,9 +5675,9 @@ diff -urNp linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.9/arch/
  	movq	$1,%rax
 +	pax_force_retaddr
  	ret
-diff -urNp linux-3.0.9/arch/x86/ia32/ia32_aout.c linux-3.0.9/arch/x86/ia32/ia32_aout.c
---- linux-3.0.9/arch/x86/ia32/ia32_aout.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/ia32/ia32_aout.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/ia32/ia32_aout.c linux-3.1.1/arch/x86/ia32/ia32_aout.c
+--- linux-3.1.1/arch/x86/ia32/ia32_aout.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/ia32/ia32_aout.c	2011-11-16 18:40:08.000000000 -0500
 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
  	unsigned long dump_start, dump_size;
  	struct user32 dump;
@@ -5716,9 +5687,9 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32_aout.c linux-3.0.9/arch/x86/ia32/ia32_
  	fs = get_fs();
  	set_fs(KERNEL_DS);
  	has_dumped = 1;
-diff -urNp linux-3.0.9/arch/x86/ia32/ia32entry.S linux-3.0.9/arch/x86/ia32/ia32entry.S
---- linux-3.0.9/arch/x86/ia32/ia32entry.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/ia32/ia32entry.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/ia32/ia32entry.S linux-3.1.1/arch/x86/ia32/ia32entry.S
+--- linux-3.1.1/arch/x86/ia32/ia32entry.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/ia32/ia32entry.S	2011-11-16 18:40:08.000000000 -0500
 @@ -13,7 +13,9 @@
  #include <asm/thread_info.h>	
  #include <asm/segment.h>
@@ -5779,7 +5750,7 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32entry.S linux-3.0.9/arch/x86/ia32/ia32e
  	pushq_cfi $__USER32_CS
  	/*CFI_REL_OFFSET cs,0*/
 @@ -146,6 +172,12 @@ ENTRY(ia32_sysenter_target)
- 	SAVE_ARGS 0,0,1
+ 	SAVE_ARGS 0,1,0
   	/* no need to do an access_ok check here because rbp has been
   	   32bit zero extended */ 
 +
@@ -5842,8 +5813,8 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32entry.S linux-3.0.9/arch/x86/ia32/ia32e
  	 * disabled irqs and here we enable it straight after entry:
  	 */
  	ENABLE_INTERRUPTS(CLBR_NONE)
--	SAVE_ARGS 8,1,1
-+	SAVE_ARGS 8*6,1,1
+-	SAVE_ARGS 8,0,0
++	SAVE_ARGS 8*6,0,0
  	movl 	%eax,%eax	/* zero extension */
  	movq	%rax,ORIG_RAX-ARGOFFSET(%rsp)
  	movq	%rcx,RIP-ARGOFFSET(%rsp)
@@ -5867,7 +5838,7 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32entry.S linux-3.0.9/arch/x86/ia32/ia32e
 +	pax_exit_kernel_user
 +	pax_erase_kstack
  	andl $~TS_COMPAT,TI_status(%r10)
- 	RESTORE_ARGS 1,-ARG_SKIP,1,1,1
+ 	RESTORE_ARGS 0,-ARG_SKIP,0,0,0
  	movl RIP-ARGOFFSET(%rsp),%ecx
 @@ -364,6 +417,9 @@ cstar_tracesys:
  	movq $-ENOSYS,RAX(%rsp)	/* ptrace can change this for a bad syscall */
@@ -5905,10 +5876,10 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32entry.S linux-3.0.9/arch/x86/ia32/ia32e
  	ret
  	CFI_ENDPROC
  	
-diff -urNp linux-3.0.9/arch/x86/ia32/ia32_signal.c linux-3.0.9/arch/x86/ia32/ia32_signal.c
---- linux-3.0.9/arch/x86/ia32/ia32_signal.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/ia32/ia32_signal.c	2011-11-15 20:02:59.000000000 -0500
-@@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const 
+diff -urNp linux-3.1.1/arch/x86/ia32/ia32_signal.c linux-3.1.1/arch/x86/ia32/ia32_signal.c
+--- linux-3.1.1/arch/x86/ia32/ia32_signal.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/ia32/ia32_signal.c	2011-11-16 18:39:07.000000000 -0500
+@@ -169,7 +169,7 @@ asmlinkage long sys32_sigaltstack(const 
  	}
  	seg = get_fs();
  	set_fs(KERNEL_DS);
@@ -5917,7 +5888,7 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32_signal.c linux-3.0.9/arch/x86/ia32/ia3
  	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 
+@@ -370,7 +370,7 @@ static int ia32_setup_sigcontext(struct 
   */
  static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
  				 size_t frame_size,
@@ -5926,7 +5897,7 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32_signal.c linux-3.0.9/arch/x86/ia32/ia3
  {
  	unsigned long sp;
  
-@@ -395,7 +395,7 @@ static void __user *get_sigframe(struct 
+@@ -391,7 +391,7 @@ static void __user *get_sigframe(struct 
  
  	if (used_math()) {
  		sp = sp - sig_xstate_ia32_size;
@@ -5935,7 +5906,7 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32_signal.c linux-3.0.9/arch/x86/ia32/ia3
  		if (save_i387_xstate_ia32(*fpstate) < 0)
  			return (void __user *) -1L;
  	}
-@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 
+@@ -399,7 +399,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. */
@@ -5944,7 +5915,7 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32_signal.c linux-3.0.9/arch/x86/ia32/ia3
  	return (void __user *) sp;
  }
  
-@@ -461,7 +461,7 @@ int ia32_setup_frame(int sig, struct k_s
+@@ -457,7 +457,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.
  		 */
@@ -5953,7 +5924,7 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32_signal.c linux-3.0.9/arch/x86/ia32/ia3
  	} put_user_catch(err);
  
  	if (err)
-@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct 
+@@ -499,7 +499,7 @@ int ia32_setup_rt_frame(int sig, struct 
  		0xb8,
  		__NR_ia32_rt_sigreturn,
  		0x80cd,
@@ -5962,7 +5933,7 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32_signal.c linux-3.0.9/arch/x86/ia32/ia3
  	};
  
  	frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-@@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct 
+@@ -529,16 +529,18 @@ int ia32_setup_rt_frame(int sig, struct 
  
  		if (ka->sa.sa_flags & SA_RESTORER)
  			restorer = ka->sa.sa_restorer;
@@ -5984,9 +5955,9 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32_signal.c linux-3.0.9/arch/x86/ia32/ia3
  	} put_user_catch(err);
  
  	if (err)
-diff -urNp linux-3.0.9/arch/x86/ia32/sys_ia32.c linux-3.0.9/arch/x86/ia32/sys_ia32.c
---- linux-3.0.9/arch/x86/ia32/sys_ia32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/ia32/sys_ia32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/ia32/sys_ia32.c linux-3.1.1/arch/x86/ia32/sys_ia32.c
+--- linux-3.1.1/arch/x86/ia32/sys_ia32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/ia32/sys_ia32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsign
   */
  static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
@@ -6054,9 +6025,9 @@ diff -urNp linux-3.0.9/arch/x86/ia32/sys_ia32.c linux-3.0.9/arch/x86/ia32/sys_ia
  			   count);
  	set_fs(old_fs);
  
-diff -urNp linux-3.0.9/arch/x86/include/asm/alternative-asm.h linux-3.0.9/arch/x86/include/asm/alternative-asm.h
---- linux-3.0.9/arch/x86/include/asm/alternative-asm.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/alternative-asm.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/alternative-asm.h linux-3.1.1/arch/x86/include/asm/alternative-asm.h
+--- linux-3.1.1/arch/x86/include/asm/alternative-asm.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/alternative-asm.h	2011-11-16 18:39:07.000000000 -0500
 @@ -15,6 +15,20 @@
  	.endm
  #endif
@@ -6076,12 +6047,12 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/alternative-asm.h linux-3.0.9/arch/x
 +#endif
 +
  .macro altinstruction_entry orig alt feature orig_len alt_len
- 	.align 8
- 	.quad \orig
-diff -urNp linux-3.0.9/arch/x86/include/asm/alternative.h linux-3.0.9/arch/x86/include/asm/alternative.h
---- linux-3.0.9/arch/x86/include/asm/alternative.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/alternative.h	2011-11-15 20:02:59.000000000 -0500
-@@ -93,7 +93,7 @@ static inline int alternatives_text_rese
+ 	.long \orig - .
+ 	.long \alt - .
+diff -urNp linux-3.1.1/arch/x86/include/asm/alternative.h linux-3.1.1/arch/x86/include/asm/alternative.h
+--- linux-3.1.1/arch/x86/include/asm/alternative.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/alternative.h	2011-11-16 18:39:07.000000000 -0500
+@@ -89,7 +89,7 @@ static inline int alternatives_text_rese
        ".section .discard,\"aw\",@progbits\n"				\
        "	 .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */	\
        ".previous\n"							\
@@ -6090,9 +6061,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/alternative.h linux-3.0.9/arch/x86/i
        "663:\n\t" newinstr "\n664:\n"		/* replacement     */	\
        ".previous"
  
-diff -urNp linux-3.0.9/arch/x86/include/asm/apic.h linux-3.0.9/arch/x86/include/asm/apic.h
---- linux-3.0.9/arch/x86/include/asm/apic.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/apic.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/apic.h linux-3.1.1/arch/x86/include/asm/apic.h
+--- linux-3.1.1/arch/x86/include/asm/apic.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/apic.h	2011-11-16 18:39:07.000000000 -0500
 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(vo
  
  #ifdef CONFIG_X86_LOCAL_APIC
@@ -6102,9 +6073,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/apic.h linux-3.0.9/arch/x86/include/
  extern int local_apic_timer_c2_ok;
  
  extern int disable_apic;
-diff -urNp linux-3.0.9/arch/x86/include/asm/apm.h linux-3.0.9/arch/x86/include/asm/apm.h
---- linux-3.0.9/arch/x86/include/asm/apm.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/apm.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/apm.h linux-3.1.1/arch/x86/include/asm/apm.h
+--- linux-3.1.1/arch/x86/include/asm/apm.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/apm.h	2011-11-16 18:39:07.000000000 -0500
 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
  	__asm__ __volatile__(APM_DO_ZERO_SEGS
  		"pushl %%edi\n\t"
@@ -6123,9 +6094,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/apm.h linux-3.0.9/arch/x86/include/a
  		"setc %%bl\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-diff -urNp linux-3.0.9/arch/x86/include/asm/atomic64_32.h linux-3.0.9/arch/x86/include/asm/atomic64_32.h
---- linux-3.0.9/arch/x86/include/asm/atomic64_32.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/atomic64_32.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/atomic64_32.h linux-3.1.1/arch/x86/include/asm/atomic64_32.h
+--- linux-3.1.1/arch/x86/include/asm/atomic64_32.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/atomic64_32.h	2011-11-16 18:39:07.000000000 -0500
 @@ -12,6 +12,14 @@ typedef struct {
  	u64 __aligned(8) counter;
  } atomic64_t;
@@ -6275,9 +6246,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/atomic64_32.h linux-3.0.9/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.9/arch/x86/include/asm/atomic64_64.h linux-3.0.9/arch/x86/include/asm/atomic64_64.h
---- linux-3.0.9/arch/x86/include/asm/atomic64_64.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/atomic64_64.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/atomic64_64.h linux-3.1.1/arch/x86/include/asm/atomic64_64.h
+--- linux-3.1.1/arch/x86/include/asm/atomic64_64.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/atomic64_64.h	2011-11-16 18:39:07.000000000 -0500
 @@ -18,7 +18,19 @@
   */
  static inline long atomic64_read(const atomic64_t *v)
@@ -6599,9 +6570,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/atomic64_64.h linux-3.0.9/arch/x86/i
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-3.0.9/arch/x86/include/asm/atomic.h linux-3.0.9/arch/x86/include/asm/atomic.h
---- linux-3.0.9/arch/x86/include/asm/atomic.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/atomic.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/atomic.h linux-3.1.1/arch/x86/include/asm/atomic.h
+--- linux-3.1.1/arch/x86/include/asm/atomic.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/atomic.h	2011-11-16 18:39:07.000000000 -0500
 @@ -22,7 +22,18 @@
   */
  static inline int atomic_read(const atomic_t *v)
@@ -6930,11 +6901,11 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/atomic.h linux-3.0.9/arch/x86/includ
 +}
 +
  /**
-  * atomic_add_unless - add unless the number is already a given value
+  * __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 *
+@@ -231,12 +447,25 @@ static inline int atomic_xchg(atomic_t *
   */
- static inline int atomic_add_unless(atomic_t *v, int a, int u)
+ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
  {
 -	int c, old;
 +	int c, old, new;
@@ -6961,13 +6932,10 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/atomic.h linux-3.0.9/arch/x86/includ
  		if (likely(old == c))
  			break;
  		c = old;
- 	}
--	return c != (u);
-+	return c != u;
+@@ -244,6 +473,48 @@ static inline int __atomic_add_unless(at
+ 	return c;
  }
  
- #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
@@ -6987,7 +6955,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/atomic.h linux-3.0.9/arch/x86/includ
 +
 +	/* sanity test, should be removed by compiler if hint is a constant */
 +	if (!hint)
-+		return atomic_inc_not_zero(v);
++		return __atomic_add_unless(v, 1, 0);
 +
 +	do {
 +		asm volatile("incl %0\n"
@@ -7010,13 +6978,12 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/atomic.h linux-3.0.9/arch/x86/includ
 +
 +	return 0;
 +}
-+
+ 
  /*
   * atomic_dec_if_positive - decrement by 1 if old value positive
-  * @v: pointer of type atomic_t
-diff -urNp linux-3.0.9/arch/x86/include/asm/bitops.h linux-3.0.9/arch/x86/include/asm/bitops.h
---- linux-3.0.9/arch/x86/include/asm/bitops.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/bitops.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/bitops.h linux-3.1.1/arch/x86/include/asm/bitops.h
+--- linux-3.1.1/arch/x86/include/asm/bitops.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/bitops.h	2011-11-16 18:39:07.000000000 -0500
 @@ -38,7 +38,7 @@
   * a mask operation on a byte.
   */
@@ -7026,9 +6993,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/bitops.h linux-3.0.9/arch/x86/includ
  #define CONST_MASK(nr)			(1 << ((nr) & 7))
  
  /**
-diff -urNp linux-3.0.9/arch/x86/include/asm/boot.h linux-3.0.9/arch/x86/include/asm/boot.h
---- linux-3.0.9/arch/x86/include/asm/boot.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/boot.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/boot.h linux-3.1.1/arch/x86/include/asm/boot.h
+--- linux-3.1.1/arch/x86/include/asm/boot.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/boot.h	2011-11-16 18:39:07.000000000 -0500
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -7046,9 +7013,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/boot.h linux-3.0.9/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.9/arch/x86/include/asm/cacheflush.h linux-3.0.9/arch/x86/include/asm/cacheflush.h
---- linux-3.0.9/arch/x86/include/asm/cacheflush.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/cacheflush.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/cacheflush.h linux-3.1.1/arch/x86/include/asm/cacheflush.h
+--- linux-3.1.1/arch/x86/include/asm/cacheflush.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/cacheflush.h	2011-11-16 18:39:07.000000000 -0500
 @@ -26,7 +26,7 @@ static inline unsigned long get_page_mem
  	unsigned long pg_flags = pg->flags & _PGMT_MASK;
  
@@ -7058,9 +7025,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/cacheflush.h linux-3.0.9/arch/x86/in
  	else if (pg_flags == _PGMT_WC)
  		return _PAGE_CACHE_WC;
  	else if (pg_flags == _PGMT_UC_MINUS)
-diff -urNp linux-3.0.9/arch/x86/include/asm/cache.h linux-3.0.9/arch/x86/include/asm/cache.h
---- linux-3.0.9/arch/x86/include/asm/cache.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/cache.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/cache.h linux-3.1.1/arch/x86/include/asm/cache.h
+--- linux-3.1.1/arch/x86/include/asm/cache.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/cache.h	2011-11-16 18:39:07.000000000 -0500
 @@ -5,12 +5,13 @@
  
  /* L1 cache line size */
@@ -7077,9 +7044,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/cache.h linux-3.0.9/arch/x86/include
  
  #ifdef CONFIG_X86_VSMP
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.9/arch/x86/include/asm/checksum_32.h linux-3.0.9/arch/x86/include/asm/checksum_32.h
---- linux-3.0.9/arch/x86/include/asm/checksum_32.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/checksum_32.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/checksum_32.h linux-3.1.1/arch/x86/include/asm/checksum_32.h
+--- linux-3.1.1/arch/x86/include/asm/checksum_32.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/checksum_32.h	2011-11-16 18:39:07.000000000 -0500
 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
  					    int len, __wsum sum,
  					    int *src_err_ptr, int *dst_err_ptr);
@@ -7113,9 +7080,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/checksum_32.h linux-3.0.9/arch/x86/i
  						 len, sum, NULL, err_ptr);
  
  	if (len)
-diff -urNp linux-3.0.9/arch/x86/include/asm/cpufeature.h linux-3.0.9/arch/x86/include/asm/cpufeature.h
---- linux-3.0.9/arch/x86/include/asm/cpufeature.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/cpufeature.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/cpufeature.h linux-3.1.1/arch/x86/include/asm/cpufeature.h
+--- linux-3.1.1/arch/x86/include/asm/cpufeature.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/cpufeature.h	2011-11-16 18:39:07.000000000 -0500
 @@ -358,7 +358,7 @@ static __always_inline __pure bool __sta
  			     ".section .discard,\"aw\",@progbits\n"
  			     " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
@@ -7125,9 +7092,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/cpufeature.h linux-3.0.9/arch/x86/in
  			     "3: movb $1,%0\n"
  			     "4:\n"
  			     ".previous\n"
-diff -urNp linux-3.0.9/arch/x86/include/asm/desc_defs.h linux-3.0.9/arch/x86/include/asm/desc_defs.h
---- linux-3.0.9/arch/x86/include/asm/desc_defs.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/desc_defs.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/desc_defs.h linux-3.1.1/arch/x86/include/asm/desc_defs.h
+--- linux-3.1.1/arch/x86/include/asm/desc_defs.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/desc_defs.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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;
@@ -7141,9 +7108,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/desc_defs.h linux-3.0.9/arch/x86/inc
  	};
  } __attribute__((packed));
  
-diff -urNp linux-3.0.9/arch/x86/include/asm/desc.h linux-3.0.9/arch/x86/include/asm/desc.h
---- linux-3.0.9/arch/x86/include/asm/desc.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/desc.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/desc.h linux-3.1.1/arch/x86/include/asm/desc.h
+--- linux-3.1.1/arch/x86/include/asm/desc.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/desc.h	2011-11-16 18:39:07.000000000 -0500
 @@ -4,6 +4,7 @@
  #include <asm/desc_defs.h>
  #include <asm/ldt.h>
@@ -7322,9 +7289,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/desc.h linux-3.0.9/arch/x86/include/
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff -urNp linux-3.0.9/arch/x86/include/asm/e820.h linux-3.0.9/arch/x86/include/asm/e820.h
---- linux-3.0.9/arch/x86/include/asm/e820.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/e820.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/e820.h linux-3.1.1/arch/x86/include/asm/e820.h
+--- linux-3.1.1/arch/x86/include/asm/e820.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/e820.h	2011-11-16 18:39:07.000000000 -0500
 @@ -69,7 +69,7 @@ struct e820map {
  #define ISA_START_ADDRESS	0xa0000
  #define ISA_END_ADDRESS		0x100000
@@ -7334,9 +7301,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/e820.h linux-3.0.9/arch/x86/include/
  #define BIOS_END		0x00100000
  
  #define BIOS_ROM_BASE		0xffe00000
-diff -urNp linux-3.0.9/arch/x86/include/asm/elf.h linux-3.0.9/arch/x86/include/asm/elf.h
---- linux-3.0.9/arch/x86/include/asm/elf.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/elf.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/elf.h linux-3.1.1/arch/x86/include/asm/elf.h
+--- linux-3.1.1/arch/x86/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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.  */
@@ -7391,9 +7358,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/elf.h linux-3.0.9/arch/x86/include/a
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff -urNp linux-3.0.9/arch/x86/include/asm/emergency-restart.h linux-3.0.9/arch/x86/include/asm/emergency-restart.h
---- linux-3.0.9/arch/x86/include/asm/emergency-restart.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/emergency-restart.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/emergency-restart.h linux-3.1.1/arch/x86/include/asm/emergency-restart.h
+--- linux-3.1.1/arch/x86/include/asm/emergency-restart.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/emergency-restart.h	2011-11-16 18:39:07.000000000 -0500
 @@ -15,6 +15,6 @@ enum reboot_type {
  
  extern enum reboot_type reboot_type;
@@ -7402,9 +7369,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/emergency-restart.h linux-3.0.9/arch
 +extern void machine_emergency_restart(void) __noreturn;
  
  #endif /* _ASM_X86_EMERGENCY_RESTART_H */
-diff -urNp linux-3.0.9/arch/x86/include/asm/futex.h linux-3.0.9/arch/x86/include/asm/futex.h
---- linux-3.0.9/arch/x86/include/asm/futex.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/futex.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/futex.h linux-3.1.1/arch/x86/include/asm/futex.h
+--- linux-3.1.1/arch/x86/include/asm/futex.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/futex.h	2011-11-16 18:39:07.000000000 -0500
 @@ -12,16 +12,18 @@
  #include <asm/system.h>
  
@@ -7463,10 +7430,10 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/futex.h linux-3.0.9/arch/x86/include
  		     : "i" (-EFAULT), "r" (newval), "1" (oldval)
  		     : "memory"
  	);
-diff -urNp linux-3.0.9/arch/x86/include/asm/hw_irq.h linux-3.0.9/arch/x86/include/asm/hw_irq.h
---- linux-3.0.9/arch/x86/include/asm/hw_irq.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/hw_irq.h	2011-11-15 20:02:59.000000000 -0500
-@@ -137,8 +137,8 @@ extern void setup_ioapic_dest(void);
+diff -urNp linux-3.1.1/arch/x86/include/asm/hw_irq.h linux-3.1.1/arch/x86/include/asm/hw_irq.h
+--- linux-3.1.1/arch/x86/include/asm/hw_irq.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/hw_irq.h	2011-11-16 18:39:07.000000000 -0500
+@@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
  extern void enable_IO_APIC(void);
  
  /* Statistics */
@@ -7477,9 +7444,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/hw_irq.h linux-3.0.9/arch/x86/includ
  
  /* EISA */
  extern void eisa_set_level_irq(unsigned int irq);
-diff -urNp linux-3.0.9/arch/x86/include/asm/i387.h linux-3.0.9/arch/x86/include/asm/i387.h
---- linux-3.0.9/arch/x86/include/asm/i387.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/i387.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/i387.h linux-3.1.1/arch/x86/include/asm/i387.h
+--- linux-3.1.1/arch/x86/include/asm/i387.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/i387.h	2011-11-16 18:39:07.000000000 -0500
 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
  {
  	int err;
@@ -7529,10 +7496,10 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/i387.h linux-3.0.9/arch/x86/include/
  	else
  		clts();
  }
-diff -urNp linux-3.0.9/arch/x86/include/asm/io.h linux-3.0.9/arch/x86/include/asm/io.h
---- linux-3.0.9/arch/x86/include/asm/io.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/io.h	2011-11-15 20:02:59.000000000 -0500
-@@ -196,6 +196,17 @@ extern void set_iounmap_nonlazy(void);
+diff -urNp linux-3.1.1/arch/x86/include/asm/io.h linux-3.1.1/arch/x86/include/asm/io.h
+--- linux-3.1.1/arch/x86/include/asm/io.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/io.h	2011-11-16 18:39:07.000000000 -0500
+@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
  
  #include <linux/vmalloc.h>
  
@@ -7550,10 +7517,10 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/io.h linux-3.0.9/arch/x86/include/as
  /*
   * Convert a virtual cached pointer to an uncached pointer
   */
-diff -urNp linux-3.0.9/arch/x86/include/asm/irqflags.h linux-3.0.9/arch/x86/include/asm/irqflags.h
---- linux-3.0.9/arch/x86/include/asm/irqflags.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/irqflags.h	2011-11-15 20:02:59.000000000 -0500
-@@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
+diff -urNp linux-3.1.1/arch/x86/include/asm/irqflags.h linux-3.1.1/arch/x86/include/asm/irqflags.h
+--- linux-3.1.1/arch/x86/include/asm/irqflags.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/irqflags.h	2011-11-16 18:39:07.000000000 -0500
+@@ -141,6 +141,11 @@ static inline notrace unsigned long arch
  	sti;					\
  	sysexit
  
@@ -7565,9 +7532,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/irqflags.h linux-3.0.9/arch/x86/incl
  #else
  #define INTERRUPT_RETURN		iret
  #define ENABLE_INTERRUPTS_SYSEXIT	sti; sysexit
-diff -urNp linux-3.0.9/arch/x86/include/asm/kprobes.h linux-3.0.9/arch/x86/include/asm/kprobes.h
---- linux-3.0.9/arch/x86/include/asm/kprobes.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/kprobes.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/kprobes.h linux-3.1.1/arch/x86/include/asm/kprobes.h
+--- linux-3.1.1/arch/x86/include/asm/kprobes.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/kprobes.h	2011-11-16 18:39:07.000000000 -0500
 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
  #define RELATIVEJUMP_SIZE 5
  #define RELATIVECALL_OPCODE 0xe8
@@ -7584,19 +7551,19 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/kprobes.h linux-3.0.9/arch/x86/inclu
  
  #define flush_insn_slot(p)	do { } while (0)
  
-diff -urNp linux-3.0.9/arch/x86/include/asm/kvm_host.h linux-3.0.9/arch/x86/include/asm/kvm_host.h
---- linux-3.0.9/arch/x86/include/asm/kvm_host.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/kvm_host.h	2011-11-15 20:02:59.000000000 -0500
-@@ -441,7 +441,7 @@ struct kvm_arch {
- 	unsigned int n_used_mmu_pages;
+diff -urNp linux-3.1.1/arch/x86/include/asm/kvm_host.h linux-3.1.1/arch/x86/include/asm/kvm_host.h
+--- linux-3.1.1/arch/x86/include/asm/kvm_host.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/kvm_host.h	2011-11-16 18:39:07.000000000 -0500
+@@ -456,7 +456,7 @@ struct kvm_arch {
  	unsigned int n_requested_mmu_pages;
  	unsigned int n_max_mmu_pages;
+ 	unsigned int indirect_shadow_pages;
 -	atomic_t invlpg_counter;
 +	atomic_unchecked_t invlpg_counter;
  	struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
  	/*
  	 * Hash table of struct kvm_mmu_page.
-@@ -619,7 +619,7 @@ struct kvm_x86_ops {
+@@ -636,7 +636,7 @@ struct kvm_x86_ops {
  			       enum x86_intercept_stage stage);
  
  	const struct trace_print_flags *exit_reasons_str;
@@ -7605,9 +7572,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/kvm_host.h linux-3.0.9/arch/x86/incl
  
  struct kvm_arch_async_pf {
  	u32 token;
-diff -urNp linux-3.0.9/arch/x86/include/asm/local.h linux-3.0.9/arch/x86/include/asm/local.h
---- linux-3.0.9/arch/x86/include/asm/local.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/local.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/local.h linux-3.1.1/arch/x86/include/asm/local.h
+--- linux-3.1.1/arch/x86/include/asm/local.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/local.h	2011-11-16 18:39:07.000000000 -0500
 @@ -18,26 +18,58 @@ typedef struct {
  
  static inline void local_inc(local_t *l)
@@ -7760,9 +7727,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/local.h linux-3.0.9/arch/x86/include
  		     : "+r" (i), "+m" (l->a.counter)
  		     : : "memory");
  	return i + __i;
-diff -urNp linux-3.0.9/arch/x86/include/asm/mman.h linux-3.0.9/arch/x86/include/asm/mman.h
---- linux-3.0.9/arch/x86/include/asm/mman.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/mman.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/mman.h linux-3.1.1/arch/x86/include/asm/mman.h
+--- linux-3.1.1/arch/x86/include/asm/mman.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/mman.h	2011-11-16 18:39:07.000000000 -0500
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -7778,9 +7745,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/mman.h linux-3.0.9/arch/x86/include/
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-3.0.9/arch/x86/include/asm/mmu_context.h linux-3.0.9/arch/x86/include/asm/mmu_context.h
---- linux-3.0.9/arch/x86/include/asm/mmu_context.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/mmu_context.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/mmu_context.h linux-3.1.1/arch/x86/include/asm/mmu_context.h
+--- linux-3.1.1/arch/x86/include/asm/mmu_context.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/mmu_context.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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)
@@ -7901,9 +7868,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/mmu_context.h linux-3.0.9/arch/x86/i
  }
  
  #define activate_mm(prev, next)			\
-diff -urNp linux-3.0.9/arch/x86/include/asm/mmu.h linux-3.0.9/arch/x86/include/asm/mmu.h
---- linux-3.0.9/arch/x86/include/asm/mmu.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/mmu.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/mmu.h linux-3.1.1/arch/x86/include/asm/mmu.h
+--- linux-3.1.1/arch/x86/include/asm/mmu.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/mmu.h	2011-11-16 18:39:07.000000000 -0500
 @@ -9,7 +9,7 @@
   * we put the segment information here.
   */
@@ -7934,9 +7901,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/mmu.h linux-3.0.9/arch/x86/include/a
  } mm_context_t;
  
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.9/arch/x86/include/asm/module.h linux-3.0.9/arch/x86/include/asm/module.h
---- linux-3.0.9/arch/x86/include/asm/module.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/module.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/module.h linux-3.1.1/arch/x86/include/asm/module.h
+--- linux-3.1.1/arch/x86/include/asm/module.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/module.h	2011-11-16 18:39:07.000000000 -0500
 @@ -5,6 +5,7 @@
  
  #ifdef CONFIG_X86_64
@@ -7966,9 +7933,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/module.h linux-3.0.9/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.9/arch/x86/include/asm/page_64_types.h linux-3.0.9/arch/x86/include/asm/page_64_types.h
---- linux-3.0.9/arch/x86/include/asm/page_64_types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/page_64_types.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/page_64_types.h linux-3.1.1/arch/x86/include/asm/page_64_types.h
+--- linux-3.1.1/arch/x86/include/asm/page_64_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/page_64_types.h	2011-11-16 18:39:07.000000000 -0500
 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
  
  /* duplicated to the one in bootmem.h */
@@ -7978,10 +7945,10 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/page_64_types.h linux-3.0.9/arch/x86
  
  extern unsigned long __phys_addr(unsigned long);
  #define __phys_reloc_hide(x)	(x)
-diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt.h linux-3.0.9/arch/x86/include/asm/paravirt.h
---- linux-3.0.9/arch/x86/include/asm/paravirt.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/paravirt.h	2011-11-15 20:02:59.000000000 -0500
-@@ -658,6 +658,18 @@ static inline void set_pgd(pgd_t *pgdp, 
+diff -urNp linux-3.1.1/arch/x86/include/asm/paravirt.h linux-3.1.1/arch/x86/include/asm/paravirt.h
+--- linux-3.1.1/arch/x86/include/asm/paravirt.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/paravirt.h	2011-11-16 18:39:07.000000000 -0500
+@@ -667,6 +667,18 @@ static inline void set_pgd(pgd_t *pgdp, 
  			    val);
  }
  
@@ -8000,7 +7967,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt.h linux-3.0.9/arch/x86/incl
  static inline void pgd_clear(pgd_t *pgdp)
  {
  	set_pgd(pgdp, __pgd(0));
-@@ -739,6 +751,21 @@ static inline void __set_fixmap(unsigned
+@@ -748,6 +760,21 @@ static inline void __set_fixmap(unsigned
  	pv_mmu_ops.set_fixmap(idx, phys, flags);
  }
  
@@ -8022,7 +7989,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt.h linux-3.0.9/arch/x86/incl
  #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
  
  static inline int arch_spin_is_locked(struct arch_spinlock *lock)
-@@ -955,7 +982,7 @@ extern void default_banner(void);
+@@ -964,7 +991,7 @@ extern void default_banner(void);
  
  #define PARA_PATCH(struct, off)        ((PARAVIRT_PATCH_##struct + (off)) / 4)
  #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
@@ -8031,7 +7998,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt.h linux-3.0.9/arch/x86/incl
  #endif
  
  #define INTERRUPT_RETURN						\
-@@ -1032,6 +1059,21 @@ extern void default_banner(void);
+@@ -1041,6 +1068,21 @@ extern void default_banner(void);
  	PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit),	\
  		  CLBR_NONE,						\
  		  jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
@@ -8053,10 +8020,10 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt.h linux-3.0.9/arch/x86/incl
  #endif	/* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt_types.h linux-3.0.9/arch/x86/include/asm/paravirt_types.h
---- linux-3.0.9/arch/x86/include/asm/paravirt_types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/paravirt_types.h	2011-11-15 20:02:59.000000000 -0500
-@@ -78,19 +78,19 @@ struct pv_init_ops {
+diff -urNp linux-3.1.1/arch/x86/include/asm/paravirt_types.h linux-3.1.1/arch/x86/include/asm/paravirt_types.h
+--- linux-3.1.1/arch/x86/include/asm/paravirt_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/paravirt_types.h	2011-11-16 18:39:07.000000000 -0500
+@@ -84,20 +84,20 @@ struct pv_init_ops {
  	 */
  	unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
  			  unsigned long addr, unsigned len);
@@ -8073,13 +8040,14 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt_types.h linux-3.0.9/arch/x8
  
  struct pv_time_ops {
  	unsigned long long (*sched_clock)(void);
+ 	unsigned long long (*steal_clock)(int cpu);
  	unsigned long (*get_tsc_khz)(void);
 -};
 +} __no_const;
  
  struct pv_cpu_ops {
  	/* hooks for various privileged instructions */
-@@ -186,7 +186,7 @@ struct pv_cpu_ops {
+@@ -193,7 +193,7 @@ struct pv_cpu_ops {
  
  	void (*start_context_switch)(struct task_struct *prev);
  	void (*end_context_switch)(struct task_struct *next);
@@ -8088,7 +8056,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt_types.h linux-3.0.9/arch/x8
  
  struct pv_irq_ops {
  	/*
-@@ -217,7 +217,7 @@ struct pv_apic_ops {
+@@ -224,7 +224,7 @@ struct pv_apic_ops {
  				 unsigned long start_eip,
  				 unsigned long start_esp);
  #endif
@@ -8097,7 +8065,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt_types.h linux-3.0.9/arch/x8
  
  struct pv_mmu_ops {
  	unsigned long (*read_cr2)(void);
-@@ -306,6 +306,7 @@ struct pv_mmu_ops {
+@@ -313,6 +313,7 @@ struct pv_mmu_ops {
  	struct paravirt_callee_save make_pud;
  
  	void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
@@ -8105,7 +8073,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt_types.h linux-3.0.9/arch/x8
  #endif	/* PAGETABLE_LEVELS == 4 */
  #endif	/* PAGETABLE_LEVELS >= 3 */
  
-@@ -317,6 +318,12 @@ struct pv_mmu_ops {
+@@ -324,6 +325,12 @@ struct pv_mmu_ops {
  	   an mfn.  We can tell which is which from the index. */
  	void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
  			   phys_addr_t phys, pgprot_t flags);
@@ -8118,7 +8086,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt_types.h linux-3.0.9/arch/x8
  };
  
  struct arch_spinlock;
-@@ -327,7 +334,7 @@ struct pv_lock_ops {
+@@ -334,7 +341,7 @@ struct pv_lock_ops {
  	void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
  	int (*spin_trylock)(struct arch_spinlock *lock);
  	void (*spin_unlock)(struct arch_spinlock *lock);
@@ -8127,9 +8095,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt_types.h linux-3.0.9/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.9/arch/x86/include/asm/pgalloc.h linux-3.0.9/arch/x86/include/asm/pgalloc.h
---- linux-3.0.9/arch/x86/include/asm/pgalloc.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgalloc.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgalloc.h linux-3.1.1/arch/x86/include/asm/pgalloc.h
+--- linux-3.1.1/arch/x86/include/asm/pgalloc.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgalloc.h	2011-11-16 18:39:07.000000000 -0500
 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
  				       pmd_t *pmd, pte_t *pte)
  {
@@ -8144,9 +8112,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgalloc.h linux-3.0.9/arch/x86/inclu
  	set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable-2level.h linux-3.0.9/arch/x86/include/asm/pgtable-2level.h
---- linux-3.0.9/arch/x86/include/asm/pgtable-2level.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable-2level.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable-2level.h linux-3.1.1/arch/x86/include/asm/pgtable-2level.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable-2level.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable-2level.h	2011-11-16 18:39:07.000000000 -0500
 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8157,9 +8125,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable-2level.h linux-3.0.9/arch/x8
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_32.h linux-3.0.9/arch/x86/include/asm/pgtable_32.h
---- linux-3.0.9/arch/x86/include/asm/pgtable_32.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable_32.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_32.h linux-3.1.1/arch/x86/include/asm/pgtable_32.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable_32.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable_32.h	2011-11-16 18:39:07.000000000 -0500
 @@ -25,9 +25,6 @@
  struct mm_struct;
  struct vm_area_struct;
@@ -8203,9 +8171,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_32.h linux-3.0.9/arch/x86/in
  /*
   * kern_addr_valid() is (1) for FLATMEM and (0) for
   * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h
---- linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_32_types.h linux-3.1.1/arch/x86/include/asm/pgtable_32_types.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable_32_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable_32_types.h	2011-11-16 18:39:07.000000000 -0500
 @@ -8,7 +8,7 @@
   */
  #ifdef CONFIG_X86_PAE
@@ -8235,9 +8203,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h linux-3.0.9/arch/
  #define MODULES_VADDR	VMALLOC_START
  #define MODULES_END	VMALLOC_END
  #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
-diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable-3level.h linux-3.0.9/arch/x86/include/asm/pgtable-3level.h
---- linux-3.0.9/arch/x86/include/asm/pgtable-3level.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable-3level.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable-3level.h linux-3.1.1/arch/x86/include/asm/pgtable-3level.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable-3level.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable-3level.h	2011-11-16 18:39:07.000000000 -0500
 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8255,9 +8223,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable-3level.h linux-3.0.9/arch/x8
  }
  
  /*
-diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_64.h linux-3.0.9/arch/x86/include/asm/pgtable_64.h
---- linux-3.0.9/arch/x86/include/asm/pgtable_64.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable_64.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_64.h linux-3.1.1/arch/x86/include/asm/pgtable_64.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable_64.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable_64.h	2011-11-16 18:39:07.000000000 -0500
 @@ -16,10 +16,13 @@
  
  extern pud_t level3_kernel_pgt[512];
@@ -8298,9 +8266,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_64.h linux-3.0.9/arch/x86/in
  	*pgdp = pgd;
  }
  
-diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h
---- linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_64_types.h linux-3.1.1/arch/x86/include/asm/pgtable_64_types.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable_64_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable_64_types.h	2011-11-16 18:39:07.000000000 -0500
 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
  #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
  #define MODULES_END      _AC(0xffffffffff000000, UL)
@@ -8312,9 +8280,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h linux-3.0.9/arch/
 +#define ktva_ktla(addr)		(addr)
  
  #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable.h linux-3.0.9/arch/x86/include/asm/pgtable.h
---- linux-3.0.9/arch/x86/include/asm/pgtable.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable.h linux-3.1.1/arch/x86/include/asm/pgtable.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable.h	2011-11-16 18:39:07.000000000 -0500
 @@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm
  
  #ifndef __PAGETABLE_PUD_FOLDED
@@ -8492,9 +8460,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable.h linux-3.0.9/arch/x86/inclu
  
  #include <asm-generic/pgtable.h>
  #endif	/* __ASSEMBLY__ */
-diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_types.h linux-3.0.9/arch/x86/include/asm/pgtable_types.h
---- linux-3.0.9/arch/x86/include/asm/pgtable_types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable_types.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_types.h linux-3.1.1/arch/x86/include/asm/pgtable_types.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable_types.h	2011-11-16 18:39:07.000000000 -0500
 @@ -16,13 +16,12 @@
  #define _PAGE_BIT_PSE		7	/* 4 MB (or 2MB) page */
  #define _PAGE_BIT_PAT		7	/* on 4KB pages */
@@ -8542,18 +8510,16 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_types.h linux-3.0.9/arch/x86
  #define __PAGE_KERNEL_EXEC						\
  	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
  #define __PAGE_KERNEL		(__PAGE_KERNEL_EXEC | _PAGE_NX)
-@@ -106,8 +109,8 @@
+@@ -106,7 +109,7 @@
  #define __PAGE_KERNEL_WC		(__PAGE_KERNEL | _PAGE_CACHE_WC)
  #define __PAGE_KERNEL_NOCACHE		(__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
  #define __PAGE_KERNEL_UC_MINUS		(__PAGE_KERNEL | _PAGE_PCD)
 -#define __PAGE_KERNEL_VSYSCALL		(__PAGE_KERNEL_RX | _PAGE_USER)
--#define __PAGE_KERNEL_VSYSCALL_NOCACHE	(__PAGE_KERNEL_VSYSCALL | _PAGE_PCD | _PAGE_PWT)
 +#define __PAGE_KERNEL_VSYSCALL		(__PAGE_KERNEL_RO | _PAGE_USER)
-+#define __PAGE_KERNEL_VSYSCALL_NOCACHE	(__PAGE_KERNEL_RO | _PAGE_PCD | _PAGE_PWT | _PAGE_USER)
+ #define __PAGE_KERNEL_VVAR		(__PAGE_KERNEL_RO | _PAGE_USER)
+ #define __PAGE_KERNEL_VVAR_NOCACHE	(__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
  #define __PAGE_KERNEL_LARGE		(__PAGE_KERNEL | _PAGE_PSE)
- #define __PAGE_KERNEL_LARGE_NOCACHE	(__PAGE_KERNEL | _PAGE_CACHE_UC | _PAGE_PSE)
- #define __PAGE_KERNEL_LARGE_EXEC	(__PAGE_KERNEL_EXEC | _PAGE_PSE)
-@@ -166,8 +169,8 @@
+@@ -168,8 +171,8 @@
   * bits are combined, this will alow user to access the high address mapped
   * VDSO in the presence of CONFIG_COMPAT_VDSO
   */
@@ -8564,7 +8530,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_types.h linux-3.0.9/arch/x86
  #define PGD_IDENT_ATTR	 0x001		/* PRESENT (no other attributes) */
  #endif
  
-@@ -205,7 +208,17 @@ static inline pgdval_t pgd_flags(pgd_t p
+@@ -207,7 +210,17 @@ static inline pgdval_t pgd_flags(pgd_t p
  {
  	return native_pgd_val(pgd) & PTE_FLAGS_MASK;
  }
@@ -8582,7 +8548,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_types.h linux-3.0.9/arch/x86
  #if PAGETABLE_LEVELS > 3
  typedef struct { pudval_t pud; } pud_t;
  
-@@ -219,8 +232,6 @@ static inline pudval_t native_pud_val(pu
+@@ -221,8 +234,6 @@ static inline pudval_t native_pud_val(pu
  	return pud.pud;
  }
  #else
@@ -8591,7 +8557,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_types.h linux-3.0.9/arch/x86
  static inline pudval_t native_pud_val(pud_t pud)
  {
  	return native_pgd_val(pud.pgd);
-@@ -240,8 +251,6 @@ static inline pmdval_t native_pmd_val(pm
+@@ -242,8 +253,6 @@ static inline pmdval_t native_pmd_val(pm
  	return pmd.pmd;
  }
  #else
@@ -8600,7 +8566,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_types.h linux-3.0.9/arch/x86
  static inline pmdval_t native_pmd_val(pmd_t pmd)
  {
  	return native_pgd_val(pmd.pud.pgd);
-@@ -281,7 +290,6 @@ typedef struct page *pgtable_t;
+@@ -283,7 +292,6 @@ typedef struct page *pgtable_t;
  
  extern pteval_t __supported_pte_mask;
  extern void set_nx(void);
@@ -8608,9 +8574,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_types.h linux-3.0.9/arch/x86
  
  #define pgprot_writecombine	pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-3.0.9/arch/x86/include/asm/processor.h linux-3.0.9/arch/x86/include/asm/processor.h
---- linux-3.0.9/arch/x86/include/asm/processor.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/processor.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/processor.h linux-3.1.1/arch/x86/include/asm/processor.h
+--- linux-3.1.1/arch/x86/include/asm/processor.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/processor.h	2011-11-16 18:39:07.000000000 -0500
 @@ -266,7 +266,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
@@ -8620,7 +8586,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/processor.h linux-3.0.9/arch/x86/inc
  
  /*
   * Save the original ist values for checking stack pointers during debugging
-@@ -860,11 +860,18 @@ static inline void spin_lock_prefetch(co
+@@ -858,11 +858,18 @@ static inline void spin_lock_prefetch(co
   */
  #define TASK_SIZE		PAGE_OFFSET
  #define TASK_SIZE_MAX		TASK_SIZE
@@ -8641,7 +8607,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/processor.h linux-3.0.9/arch/x86/inc
  	.vm86_info		= NULL,					  \
  	.sysenter_cs		= __KERNEL_CS,				  \
  	.io_bitmap_ptr		= NULL,					  \
-@@ -878,7 +885,7 @@ static inline void spin_lock_prefetch(co
+@@ -876,7 +883,7 @@ static inline void spin_lock_prefetch(co
   */
  #define INIT_TSS  {							  \
  	.x86_tss = {							  \
@@ -8650,7 +8616,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/processor.h linux-3.0.9/arch/x86/inc
  		.ss0		= __KERNEL_DS,				  \
  		.ss1		= __KERNEL_CS,				  \
  		.io_bitmap_base	= INVALID_IO_BITMAP_OFFSET,		  \
-@@ -889,11 +896,7 @@ static inline void spin_lock_prefetch(co
+@@ -887,11 +894,7 @@ static inline void spin_lock_prefetch(co
  extern unsigned long thread_saved_pc(struct task_struct *tsk);
  
  #define THREAD_SIZE_LONGS      (THREAD_SIZE/sizeof(unsigned long))
@@ -8663,7 +8629,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/processor.h linux-3.0.9/arch/x86/inc
  
  /*
   * The below -8 is to reserve 8 bytes on top of the ring0 stack.
-@@ -908,7 +911,7 @@ extern unsigned long thread_saved_pc(str
+@@ -906,7 +909,7 @@ extern unsigned long thread_saved_pc(str
  #define task_pt_regs(task)                                             \
  ({                                                                     \
         struct pt_regs *__regs__;                                       \
@@ -8672,7 +8638,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/processor.h linux-3.0.9/arch/x86/inc
         __regs__ - 1;                                                   \
  })
  
-@@ -918,13 +921,13 @@ extern unsigned long thread_saved_pc(str
+@@ -916,13 +919,13 @@ extern unsigned long thread_saved_pc(str
  /*
   * User space process size. 47bits minus one guard page.
   */
@@ -8688,7 +8654,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/processor.h linux-3.0.9/arch/x86/inc
  
  #define TASK_SIZE		(test_thread_flag(TIF_IA32) ? \
  					IA32_PAGE_OFFSET : TASK_SIZE_MAX)
-@@ -935,11 +938,11 @@ extern unsigned long thread_saved_pc(str
+@@ -933,11 +936,11 @@ extern unsigned long thread_saved_pc(str
  #define STACK_TOP_MAX		TASK_SIZE_MAX
  
  #define INIT_THREAD  { \
@@ -8702,7 +8668,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/processor.h linux-3.0.9/arch/x86/inc
  }
  
  /*
-@@ -961,6 +964,10 @@ extern void start_thread(struct pt_regs 
+@@ -959,6 +962,10 @@ extern void start_thread(struct pt_regs 
   */
  #define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
  
@@ -8713,10 +8679,10 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/processor.h linux-3.0.9/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.9/arch/x86/include/asm/ptrace.h linux-3.0.9/arch/x86/include/asm/ptrace.h
---- linux-3.0.9/arch/x86/include/asm/ptrace.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/ptrace.h	2011-11-15 20:02:59.000000000 -0500
-@@ -153,28 +153,29 @@ static inline unsigned long regs_return_
+diff -urNp linux-3.1.1/arch/x86/include/asm/ptrace.h linux-3.1.1/arch/x86/include/asm/ptrace.h
+--- linux-3.1.1/arch/x86/include/asm/ptrace.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/ptrace.h	2011-11-16 18:39:07.000000000 -0500
+@@ -156,28 +156,29 @@ static inline unsigned long regs_return_
  }
  
  /*
@@ -8752,9 +8718,28 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/ptrace.h linux-3.0.9/arch/x86/includ
  #endif
  }
  
-diff -urNp linux-3.0.9/arch/x86/include/asm/reboot.h linux-3.0.9/arch/x86/include/asm/reboot.h
---- linux-3.0.9/arch/x86/include/asm/reboot.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/reboot.h	2011-11-15 20:02:59.000000000 -0500
+@@ -193,15 +194,16 @@ static inline int v8086_mode(struct pt_r
+ #ifdef CONFIG_X86_64
+ static inline bool user_64bit_mode(struct pt_regs *regs)
+ {
++	unsigned long cs = regs->cs & 0xffff;
+ #ifndef CONFIG_PARAVIRT
+ 	/*
+ 	 * On non-paravirt systems, this is the only long mode CPL 3
+ 	 * selector.  We do not allow long mode selectors in the LDT.
+ 	 */
+-	return regs->cs == __USER_CS;
++	return cs == __USER_CS;
+ #else
+ 	/* Headers are too twisted for this to go in paravirt.h. */
+-	return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
++	return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
+ #endif
+ }
+ #endif
+diff -urNp linux-3.1.1/arch/x86/include/asm/reboot.h linux-3.1.1/arch/x86/include/asm/reboot.h
+--- linux-3.1.1/arch/x86/include/asm/reboot.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/reboot.h	2011-11-16 18:39:07.000000000 -0500
 @@ -6,19 +6,19 @@
  struct pt_regs;
  
@@ -8781,9 +8766,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/reboot.h linux-3.0.9/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.9/arch/x86/include/asm/rwsem.h linux-3.0.9/arch/x86/include/asm/rwsem.h
---- linux-3.0.9/arch/x86/include/asm/rwsem.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/rwsem.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/rwsem.h linux-3.1.1/arch/x86/include/asm/rwsem.h
+--- linux-3.1.1/arch/x86/include/asm/rwsem.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/rwsem.h	2011-11-16 18:39:07.000000000 -0500
 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw
  {
  	asm volatile("# beginning down_read\n\t"
@@ -8908,9 +8893,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/rwsem.h linux-3.0.9/arch/x86/include
  		     : "+r" (tmp), "+m" (sem->count)
  		     : : "memory");
  
-diff -urNp linux-3.0.9/arch/x86/include/asm/segment.h linux-3.0.9/arch/x86/include/asm/segment.h
---- linux-3.0.9/arch/x86/include/asm/segment.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/segment.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/segment.h linux-3.1.1/arch/x86/include/asm/segment.h
+--- linux-3.1.1/arch/x86/include/asm/segment.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/segment.h	2011-11-16 18:39:07.000000000 -0500
 @@ -64,10 +64,15 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu			[ offset to per-cpu data area ]
@@ -8961,7 +8946,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/segment.h linux-3.0.9/arch/x86/inclu
  
  #else
 @@ -165,6 +178,8 @@
- #define __USER32_CS   (GDT_ENTRY_DEFAULT_USER32_CS * 8 + 3)
+ #define __USER32_CS   (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
  #define __USER32_DS	__USER_DS
  
 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
@@ -8977,9 +8962,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/segment.h linux-3.0.9/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.9/arch/x86/include/asm/smp.h linux-3.0.9/arch/x86/include/asm/smp.h
---- linux-3.0.9/arch/x86/include/asm/smp.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/smp.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/smp.h linux-3.1.1/arch/x86/include/asm/smp.h
+--- linux-3.1.1/arch/x86/include/asm/smp.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/smp.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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);
@@ -9015,17 +9000,17 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/smp.h linux-3.0.9/arch/x86/include/a
  #define safe_smp_processor_id()		smp_processor_id()
  
  #endif
-diff -urNp linux-3.0.9/arch/x86/include/asm/spinlock.h linux-3.0.9/arch/x86/include/asm/spinlock.h
---- linux-3.0.9/arch/x86/include/asm/spinlock.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/spinlock.h	2011-11-15 20:02:59.000000000 -0500
-@@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
+diff -urNp linux-3.1.1/arch/x86/include/asm/spinlock.h linux-3.1.1/arch/x86/include/asm/spinlock.h
+--- linux-3.1.1/arch/x86/include/asm/spinlock.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/spinlock.h	2011-11-16 18:39:07.000000000 -0500
+@@ -248,6 +248,14 @@ static inline int arch_write_can_lock(ar
  static inline void arch_read_lock(arch_rwlock_t *rw)
  {
- 	asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t"
+ 	asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
-+		     LOCK_PREFIX " addl $1,(%0)\n"
++		     LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
 +		     "int $4\n0:\n"
 +		     _ASM_EXTABLE(0b, 0b)
 +#endif
@@ -9033,14 +9018,14 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/spinlock.h linux-3.0.9/arch/x86/incl
  		     "jns 1f\n"
  		     "call __read_lock_failed\n\t"
  		     "1:\n"
-@@ -258,6 +266,14 @@ static inline void arch_read_lock(arch_r
+@@ -257,6 +265,14 @@ static inline void arch_read_lock(arch_r
  static inline void arch_write_lock(arch_rwlock_t *rw)
  {
- 	asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t"
+ 	asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
-+		     LOCK_PREFIX " addl %1,(%0)\n"
++		     LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
 +		     "int $4\n0:\n"
 +		     _ASM_EXTABLE(0b, 0b)
 +#endif
@@ -9048,41 +9033,41 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/spinlock.h linux-3.0.9/arch/x86/incl
  		     "jz 1f\n"
  		     "call __write_lock_failed\n\t"
  		     "1:\n"
-@@ -286,12 +302,29 @@ static inline int arch_write_trylock(arc
+@@ -286,13 +302,29 @@ static inline int arch_write_trylock(arc
  
  static inline void arch_read_unlock(arch_rwlock_t *rw)
  {
--	asm volatile(LOCK_PREFIX "incl %0" :"+m" (rw->lock) : : "memory");
-+	asm volatile(LOCK_PREFIX "incl %0\n"
+-	asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
++	asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
-+		     LOCK_PREFIX "decl %0\n"
++		     LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
 +		     "int $4\n0:\n"
 +		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
-+		     :"+m" (rw->lock) : : "memory");
+ 		     :"+m" (rw->lock) : : "memory");
  }
  
  static inline void arch_write_unlock(arch_rwlock_t *rw)
  {
--	asm volatile(LOCK_PREFIX "addl %1, %0"
-+	asm volatile(LOCK_PREFIX "addl %1, %0\n"
+-	asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
++	asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
-+		     LOCK_PREFIX "subl %1, %0\n"
++		     LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
 +		     "int $4\n0:\n"
 +		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
- 		     : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
+ 		     : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff -urNp linux-3.0.9/arch/x86/include/asm/stackprotector.h linux-3.0.9/arch/x86/include/asm/stackprotector.h
---- linux-3.0.9/arch/x86/include/asm/stackprotector.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/stackprotector.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/stackprotector.h linux-3.1.1/arch/x86/include/asm/stackprotector.h
+--- linux-3.1.1/arch/x86/include/asm/stackprotector.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/stackprotector.h	2011-11-16 18:39:07.000000000 -0500
 @@ -48,7 +48,7 @@
   * head_32 for boot CPU and setup_per_cpu_areas() for others.
   */
@@ -9101,9 +9086,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/stackprotector.h linux-3.0.9/arch/x8
  	asm volatile ("mov %0, %%gs" : : "r" (0));
  #endif
  }
-diff -urNp linux-3.0.9/arch/x86/include/asm/stacktrace.h linux-3.0.9/arch/x86/include/asm/stacktrace.h
---- linux-3.0.9/arch/x86/include/asm/stacktrace.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/stacktrace.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/stacktrace.h linux-3.1.1/arch/x86/include/asm/stacktrace.h
+--- linux-3.1.1/arch/x86/include/asm/stacktrace.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/stacktrace.h	2011-11-16 18:39:07.000000000 -0500
 @@ -11,28 +11,20 @@
  
  extern int kstack_depth_to_print;
@@ -9154,9 +9139,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/stacktrace.h linux-3.0.9/arch/x86/in
  };
  
  void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
-diff -urNp linux-3.0.9/arch/x86/include/asm/sys_ia32.h linux-3.0.9/arch/x86/include/asm/sys_ia32.h
---- linux-3.0.9/arch/x86/include/asm/sys_ia32.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/sys_ia32.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/sys_ia32.h linux-3.1.1/arch/x86/include/asm/sys_ia32.h
+--- linux-3.1.1/arch/x86/include/asm/sys_ia32.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/sys_ia32.h	2011-11-16 18:39:07.000000000 -0500
 @@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int
  				     compat_sigset_t __user *, unsigned int);
  asmlinkage long sys32_alarm(unsigned int);
@@ -9166,9 +9151,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/sys_ia32.h linux-3.0.9/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.9/arch/x86/include/asm/system.h linux-3.0.9/arch/x86/include/asm/system.h
---- linux-3.0.9/arch/x86/include/asm/system.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/system.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/system.h linux-3.1.1/arch/x86/include/asm/system.h
+--- linux-3.1.1/arch/x86/include/asm/system.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/system.h	2011-11-16 18:39:07.000000000 -0500
 @@ -129,7 +129,7 @@ do {									\
  	     "call __switch_to\n\t"					  \
  	     "movq "__percpu_arg([current_task])",%%rsi\n\t"		  \
@@ -9211,9 +9196,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/system.h linux-3.0.9/arch/x86/includ
  
  /*
   * Force strict CPU ordering.
-diff -urNp linux-3.0.9/arch/x86/include/asm/thread_info.h linux-3.0.9/arch/x86/include/asm/thread_info.h
---- linux-3.0.9/arch/x86/include/asm/thread_info.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/thread_info.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/thread_info.h linux-3.1.1/arch/x86/include/asm/thread_info.h
+--- linux-3.1.1/arch/x86/include/asm/thread_info.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/thread_info.h	2011-11-16 18:39:07.000000000 -0500
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <asm/page.h>
@@ -9223,7 +9208,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/thread_info.h linux-3.0.9/arch/x86/i
  /*
   * low level task data that entry.S needs immediate access to
 @@ -24,7 +25,6 @@ struct exec_domain;
- #include <asm/atomic.h>
+ #include <linux/atomic.h>
  
  struct thread_info {
 -	struct task_struct	*task;		/* main task structure */
@@ -9361,9 +9346,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/thread_info.h linux-3.0.9/arch/x86/i
 +
  #endif
  #endif /* _ASM_X86_THREAD_INFO_H */
-diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess_32.h linux-3.0.9/arch/x86/include/asm/uaccess_32.h
---- linux-3.0.9/arch/x86/include/asm/uaccess_32.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/uaccess_32.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/uaccess_32.h linux-3.1.1/arch/x86/include/asm/uaccess_32.h
+--- linux-3.1.1/arch/x86/include/asm/uaccess_32.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/uaccess_32.h	2011-11-16 18:40:08.000000000 -0500
 @@ -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)
@@ -9531,9 +9516,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess_32.h linux-3.0.9/arch/x86/in
  	return n;
  }
  
-diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess_64.h linux-3.0.9/arch/x86/include/asm/uaccess_64.h
---- linux-3.0.9/arch/x86/include/asm/uaccess_64.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/uaccess_64.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/uaccess_64.h linux-3.1.1/arch/x86/include/asm/uaccess_64.h
+--- linux-3.1.1/arch/x86/include/asm/uaccess_64.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/uaccess_64.h	2011-11-16 18:40:08.000000000 -0500
 @@ -10,6 +10,9 @@
  #include <asm/alternative.h>
  #include <asm/cpufeature.h>
@@ -9945,9 +9930,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess_64.h linux-3.0.9/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.9/arch/x86/include/asm/uaccess.h linux-3.0.9/arch/x86/include/asm/uaccess.h
---- linux-3.0.9/arch/x86/include/asm/uaccess.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/uaccess.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/uaccess.h linux-3.1.1/arch/x86/include/asm/uaccess.h
+--- linux-3.1.1/arch/x86/include/asm/uaccess.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/uaccess.h	2011-11-16 18:39:07.000000000 -0500
 @@ -7,12 +7,15 @@
  #include <linux/compiler.h>
  #include <linux/thread_info.h>
@@ -10167,9 +10152,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess.h linux-3.0.9/arch/x86/inclu
  } while (0)
  
  #ifdef CONFIG_X86_WP_WORKS_OK
-diff -urNp linux-3.0.9/arch/x86/include/asm/vdso.h linux-3.0.9/arch/x86/include/asm/vdso.h
---- linux-3.0.9/arch/x86/include/asm/vdso.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/vdso.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/vdso.h linux-3.1.1/arch/x86/include/asm/vdso.h
+--- linux-3.1.1/arch/x86/include/asm/vdso.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/vdso.h	2011-11-16 18:39:07.000000000 -0500
 @@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
  #define VDSO32_SYMBOL(base, name)					\
  ({									\
@@ -10179,9 +10164,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/vdso.h linux-3.0.9/arch/x86/include/
  })
  #endif
  
-diff -urNp linux-3.0.9/arch/x86/include/asm/x86_init.h linux-3.0.9/arch/x86/include/asm/x86_init.h
---- linux-3.0.9/arch/x86/include/asm/x86_init.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/x86_init.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/x86_init.h linux-3.1.1/arch/x86/include/asm/x86_init.h
+--- linux-3.1.1/arch/x86/include/asm/x86_init.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/x86_init.h	2011-11-16 18:39:07.000000000 -0500
 @@ -28,7 +28,7 @@ struct x86_init_mpparse {
  	void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
  	void (*find_smp_config)(void);
@@ -10299,9 +10284,9 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/x86_init.h linux-3.0.9/arch/x86/incl
  
  extern struct x86_init_ops x86_init;
  extern struct x86_cpuinit_ops x86_cpuinit;
-diff -urNp linux-3.0.9/arch/x86/include/asm/xsave.h linux-3.0.9/arch/x86/include/asm/xsave.h
---- linux-3.0.9/arch/x86/include/asm/xsave.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/xsave.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/include/asm/xsave.h linux-3.1.1/arch/x86/include/asm/xsave.h
+--- linux-3.1.1/arch/x86/include/asm/xsave.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/xsave.h	2011-11-16 18:39:07.000000000 -0500
 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
  {
  	int err;
@@ -10331,10 +10316,10 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/xsave.h linux-3.0.9/arch/x86/include
  	__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
  			     "2:\n"
  			     ".section .fixup,\"ax\"\n"
-diff -urNp linux-3.0.9/arch/x86/Kconfig linux-3.0.9/arch/x86/Kconfig
---- linux-3.0.9/arch/x86/Kconfig	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/Kconfig	2011-11-15 20:02:59.000000000 -0500
-@@ -229,7 +229,7 @@ config X86_HT
+diff -urNp linux-3.1.1/arch/x86/Kconfig linux-3.1.1/arch/x86/Kconfig
+--- linux-3.1.1/arch/x86/Kconfig	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/Kconfig	2011-11-16 18:40:08.000000000 -0500
+@@ -236,7 +236,7 @@ config X86_HT
  
  config X86_32_LAZY_GS
  	def_bool y
@@ -10343,7 +10328,7 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig linux-3.0.9/arch/x86/Kconfig
  
  config ARCH_HWEIGHT_CFLAGS
  	string
-@@ -1018,7 +1018,7 @@ choice
+@@ -1019,7 +1019,7 @@ choice
  
  config NOHIGHMEM
  	bool "off"
@@ -10352,7 +10337,7 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig linux-3.0.9/arch/x86/Kconfig
  	---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
+@@ -1056,7 +1056,7 @@ config NOHIGHMEM
  
  config HIGHMEM4G
  	bool "4GB"
@@ -10361,7 +10346,7 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig linux-3.0.9/arch/x86/Kconfig
  	---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
+@@ -1110,7 +1110,7 @@ config PAGE_OFFSET
  	hex
  	default 0xB0000000 if VMSPLIT_3G_OPT
  	default 0x80000000 if VMSPLIT_2G
@@ -10370,7 +10355,7 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig linux-3.0.9/arch/x86/Kconfig
  	default 0x40000000 if VMSPLIT_1G
  	default 0xC0000000
  	depends on X86_32
-@@ -1483,6 +1483,7 @@ config SECCOMP
+@@ -1484,6 +1484,7 @@ config SECCOMP
  
  config CC_STACKPROTECTOR
  	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
@@ -10378,7 +10363,7 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig linux-3.0.9/arch/x86/Kconfig
  	---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
+@@ -1541,6 +1542,7 @@ config KEXEC_JUMP
  config PHYSICAL_START
  	hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
  	default "0x1000000"
@@ -10386,7 +10371,7 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig linux-3.0.9/arch/x86/Kconfig
  	---help---
  	  This gives the physical address where the kernel is loaded.
  
-@@ -1603,6 +1605,7 @@ config X86_NEED_RELOCS
+@@ -1604,6 +1606,7 @@ config X86_NEED_RELOCS
  config PHYSICAL_ALIGN
  	hex "Alignment value to which kernel should be aligned" if X86_32
  	default "0x1000000"
@@ -10394,7 +10379,7 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig linux-3.0.9/arch/x86/Kconfig
  	range 0x2000 0x1000000
  	---help---
  	  This value puts the alignment restrictions on physical address
-@@ -1634,9 +1637,10 @@ config HOTPLUG_CPU
+@@ -1635,9 +1638,10 @@ config HOTPLUG_CPU
  	  Say N if you want to disable CPU hotplug.
  
  config COMPAT_VDSO
@@ -10406,10 +10391,10 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig linux-3.0.9/arch/x86/Kconfig
  	---help---
  	  Map the 32-bit VDSO to the predictable old-style address too.
  
-diff -urNp linux-3.0.9/arch/x86/Kconfig.cpu linux-3.0.9/arch/x86/Kconfig.cpu
---- linux-3.0.9/arch/x86/Kconfig.cpu	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/Kconfig.cpu	2011-11-15 20:02:59.000000000 -0500
-@@ -338,7 +338,7 @@ config X86_PPRO_FENCE
+diff -urNp linux-3.1.1/arch/x86/Kconfig.cpu linux-3.1.1/arch/x86/Kconfig.cpu
+--- linux-3.1.1/arch/x86/Kconfig.cpu	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/Kconfig.cpu	2011-11-16 18:39:07.000000000 -0500
+@@ -341,7 +341,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
  	def_bool y
@@ -10418,7 +10403,7 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig.cpu linux-3.0.9/arch/x86/Kconfig.cpu
  
  config X86_INVD_BUG
  	def_bool y
-@@ -362,7 +362,7 @@ config X86_POPAD_OK
+@@ -365,7 +365,7 @@ config X86_POPAD_OK
  
  config X86_ALIGNMENT_16
  	def_bool y
@@ -10427,7 +10412,7 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig.cpu linux-3.0.9/arch/x86/Kconfig.cpu
  
  config X86_INTEL_USERCOPY
  	def_bool y
-@@ -408,7 +408,7 @@ config X86_CMPXCHG64
+@@ -411,7 +411,7 @@ config X86_CMPXCHG64
  # generates cmov.
  config X86_CMOV
  	def_bool y
@@ -10436,9 +10421,9 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig.cpu linux-3.0.9/arch/x86/Kconfig.cpu
  
  config X86_MINIMUM_CPU_FAMILY
  	int
-diff -urNp linux-3.0.9/arch/x86/Kconfig.debug linux-3.0.9/arch/x86/Kconfig.debug
---- linux-3.0.9/arch/x86/Kconfig.debug	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/Kconfig.debug	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/Kconfig.debug linux-3.1.1/arch/x86/Kconfig.debug
+--- linux-3.1.1/arch/x86/Kconfig.debug	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/Kconfig.debug	2011-11-16 18:39:07.000000000 -0500
 @@ -81,7 +81,7 @@ config X86_PTDUMP
  config DEBUG_RODATA
  	bool "Write protect kernel read-only data structures"
@@ -10457,9 +10442,9 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig.debug linux-3.0.9/arch/x86/Kconfig.debug
  	---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.9/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile
---- linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/acpi/realmode/Makefile linux-3.1.1/arch/x86/kernel/acpi/realmode/Makefile
+--- linux-3.1.1/arch/x86/kernel/acpi/realmode/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/acpi/realmode/Makefile	2011-11-16 18:39:07.000000000 -0500
 @@ -41,6 +41,9 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os 
  		   $(call cc-option, -fno-stack-protector) \
  		   $(call cc-option, -mpreferred-stack-boundary=2)
@@ -10470,9 +10455,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.9/arch/x
  KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
  
-diff -urNp linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.1.1/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-3.1.1/arch/x86/kernel/acpi/realmode/wakeup.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/acpi/realmode/wakeup.S	2011-11-16 18:40:08.000000000 -0500
 @@ -108,6 +108,9 @@ wakeup_code:
  	/* Do any other stuff... */
  
@@ -10491,9 +10476,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.9/arch/x
  #else
  	pushw	$0
  	pushw	trampoline_segment
-diff -urNp linux-3.0.9/arch/x86/kernel/acpi/sleep.c linux-3.0.9/arch/x86/kernel/acpi/sleep.c
---- linux-3.0.9/arch/x86/kernel/acpi/sleep.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/acpi/sleep.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/acpi/sleep.c linux-3.1.1/arch/x86/kernel/acpi/sleep.c
+--- linux-3.1.1/arch/x86/kernel/acpi/sleep.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/acpi/sleep.c	2011-11-16 18:39:07.000000000 -0500
 @@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
  	header->trampoline_segment = trampoline_address() >> 4;
  #ifdef CONFIG_SMP
@@ -10507,9 +10492,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/acpi/sleep.c linux-3.0.9/arch/x86/kernel/
  	initial_gs = per_cpu_offset(smp_processor_id());
  #endif
  	initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S
---- linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/acpi/wakeup_32.S linux-3.1.1/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-3.1.1/arch/x86/kernel/acpi/wakeup_32.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/acpi/wakeup_32.S	2011-11-16 18:39:07.000000000 -0500
 @@ -30,13 +30,11 @@ wakeup_pmode_return:
  	# and restore the stack ... but you need gdt for this to work
  	movl	saved_context_esp, %esp
@@ -10526,10 +10511,33 @@ diff -urNp linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.9/arch/x86/ker
  
  bogus_magic:
  	jmp	bogus_magic
-diff -urNp linux-3.0.9/arch/x86/kernel/alternative.c linux-3.0.9/arch/x86/kernel/alternative.c
---- linux-3.0.9/arch/x86/kernel/alternative.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/alternative.c	2011-11-15 20:02:59.000000000 -0500
-@@ -313,7 +313,7 @@ static void alternatives_smp_lock(const 
+diff -urNp linux-3.1.1/arch/x86/kernel/alternative.c linux-3.1.1/arch/x86/kernel/alternative.c
+--- linux-3.1.1/arch/x86/kernel/alternative.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/alternative.c	2011-11-16 18:39:07.000000000 -0500
+@@ -276,6 +276,13 @@ void __init_or_module apply_alternatives
+ 	 */
+ 	for (a = start; a < end; a++) {
+ 		instr = (u8 *)&a->instr_offset + a->instr_offset;
++
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++		instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
++		if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
++			instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
++#endif
++
+ 		replacement = (u8 *)&a->repl_offset + a->repl_offset;
+ 		BUG_ON(a->replacementlen > a->instrlen);
+ 		BUG_ON(a->instrlen > sizeof(insnbuf));
+@@ -307,10 +314,16 @@ static void alternatives_smp_lock(const 
+ 	for (poff = start; poff < end; poff++) {
+ 		u8 *ptr = (u8 *)poff + *poff;
+ 
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++		ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
++		if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
++			ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
++#endif
++
  		if (!*poff || ptr < text || ptr >= text_end)
  			continue;
  		/* turn DS segment override prefix into lock prefix */
@@ -10538,7 +10546,16 @@ diff -urNp linux-3.0.9/arch/x86/kernel/alternative.c linux-3.0.9/arch/x86/kernel
  			text_poke(ptr, ((unsigned char []){0xf0}), 1);
  	};
  	mutex_unlock(&text_mutex);
-@@ -334,7 +334,7 @@ static void alternatives_smp_unlock(cons
+@@ -328,10 +341,16 @@ static void alternatives_smp_unlock(cons
+ 	for (poff = start; poff < end; poff++) {
+ 		u8 *ptr = (u8 *)poff + *poff;
+ 
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++		ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
++		if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
++			ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
++#endif
++
  		if (!*poff || ptr < text || ptr >= text_end)
  			continue;
  		/* turn lock prefix into DS segment override prefix */
@@ -10547,7 +10564,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/alternative.c linux-3.0.9/arch/x86/kernel
  			text_poke(ptr, ((unsigned char []){0x3E}), 1);
  	};
  	mutex_unlock(&text_mutex);
-@@ -503,7 +503,7 @@ void __init_or_module apply_paravirt(str
+@@ -500,7 +519,7 @@ void __init_or_module apply_paravirt(str
  
  		BUG_ON(p->len > MAX_PATCH_LEN);
  		/* prep the buffer with the original instructions */
@@ -10556,7 +10573,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/alternative.c linux-3.0.9/arch/x86/kernel
  		used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
  					 (unsigned long)p->instr, p->len);
  
-@@ -571,7 +571,7 @@ void __init alternative_instructions(voi
+@@ -568,7 +587,7 @@ void __init alternative_instructions(voi
  	if (smp_alt_once)
  		free_init_pages("SMP alternatives",
  				(unsigned long)__smp_locks,
@@ -10565,7 +10582,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/alternative.c linux-3.0.9/arch/x86/kernel
  
  	restart_nmi();
  }
-@@ -588,13 +588,17 @@ void __init alternative_instructions(voi
+@@ -585,13 +604,17 @@ void __init alternative_instructions(voi
   * instructions. And on the local CPU you need to be protected again NMI or MCE
   * handlers seeing an inconsistent instruction while you patch.
   */
@@ -10585,7 +10602,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/alternative.c linux-3.0.9/arch/x86/kernel
  	local_irq_restore(flags);
  	/* Could also do a CLFLUSH here to speed up CPU recovery; but
  	   that causes hangs on some VIA CPUs. */
-@@ -616,36 +620,22 @@ void *__init_or_module text_poke_early(v
+@@ -613,36 +636,22 @@ void *__init_or_module text_poke_early(v
   */
  void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
  {
@@ -10630,10 +10647,10 @@ diff -urNp linux-3.0.9/arch/x86/kernel/alternative.c linux-3.0.9/arch/x86/kernel
  	return addr;
  }
  
-diff -urNp linux-3.0.9/arch/x86/kernel/apic/apic.c linux-3.0.9/arch/x86/kernel/apic/apic.c
---- linux-3.0.9/arch/x86/kernel/apic/apic.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/apic/apic.c	2011-11-15 20:02:59.000000000 -0500
-@@ -173,7 +173,7 @@ int first_system_vector = 0xfe;
+diff -urNp linux-3.1.1/arch/x86/kernel/apic/apic.c linux-3.1.1/arch/x86/kernel/apic/apic.c
+--- linux-3.1.1/arch/x86/kernel/apic/apic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/apic/apic.c	2011-11-16 18:40:08.000000000 -0500
+@@ -174,7 +174,7 @@ int first_system_vector = 0xfe;
  /*
   * Debug level, exported for io_apic.c
   */
@@ -10642,7 +10659,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/apic/apic.c linux-3.0.9/arch/x86/kernel/a
  
  int pic_mode;
  
-@@ -1834,7 +1834,7 @@ void smp_error_interrupt(struct pt_regs 
+@@ -1835,7 +1835,7 @@ void smp_error_interrupt(struct pt_regs 
  	apic_write(APIC_ESR, 0);
  	v1 = apic_read(APIC_ESR);
  	ack_APIC_irq();
@@ -10651,7 +10668,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/apic/apic.c linux-3.0.9/arch/x86/kernel/a
  
  	apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
  		    smp_processor_id(), v0 , v1);
-@@ -2190,6 +2190,8 @@ static int __cpuinit apic_cluster_num(vo
+@@ -2209,6 +2209,8 @@ static int __cpuinit apic_cluster_num(vo
  	u16 *bios_cpu_apicid;
  	DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS);
  
@@ -10660,9 +10677,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/apic/apic.c linux-3.0.9/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.9/arch/x86/kernel/apic/io_apic.c linux-3.0.9/arch/x86/kernel/apic/io_apic.c
---- linux-3.0.9/arch/x86/kernel/apic/io_apic.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/apic/io_apic.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/apic/io_apic.c linux-3.1.1/arch/x86/kernel/apic/io_apic.c
+--- linux-3.1.1/arch/x86/kernel/apic/io_apic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/apic/io_apic.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1028,7 +1028,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, 
  }
  EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
@@ -10681,7 +10698,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/apic/io_apic.c linux-3.0.9/arch/x86/kerne
  {
  	raw_spin_unlock(&vector_lock);
  }
-@@ -2364,7 +2364,7 @@ static void ack_apic_edge(struct irq_dat
+@@ -2405,7 +2405,7 @@ static void ack_apic_edge(struct irq_dat
  	ack_APIC_irq();
  }
  
@@ -10690,7 +10707,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/apic/io_apic.c linux-3.0.9/arch/x86/kerne
  
  /*
   * IO-APIC versions below 0x20 don't support EOI register.
-@@ -2472,7 +2472,7 @@ static void ack_apic_level(struct irq_da
+@@ -2513,7 +2513,7 @@ static void ack_apic_level(struct irq_da
  	 * at the cpu.
  	 */
  	if (!(v & (1 << (i & 0x1f)))) {
@@ -10699,9 +10716,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/apic/io_apic.c linux-3.0.9/arch/x86/kerne
  
  		eoi_ioapic_irq(irq, cfg);
  	}
-diff -urNp linux-3.0.9/arch/x86/kernel/apm_32.c linux-3.0.9/arch/x86/kernel/apm_32.c
---- linux-3.0.9/arch/x86/kernel/apm_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/apm_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/apm_32.c linux-3.1.1/arch/x86/kernel/apm_32.c
+--- linux-3.1.1/arch/x86/kernel/apm_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/apm_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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.
@@ -10773,9 +10790,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/apm_32.c linux-3.0.9/arch/x86/kernel/apm_
  
  	proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff -urNp linux-3.0.9/arch/x86/kernel/asm-offsets_64.c linux-3.0.9/arch/x86/kernel/asm-offsets_64.c
---- linux-3.0.9/arch/x86/kernel/asm-offsets_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/asm-offsets_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/asm-offsets_64.c linux-3.1.1/arch/x86/kernel/asm-offsets_64.c
+--- linux-3.1.1/arch/x86/kernel/asm-offsets_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/asm-offsets_64.c	2011-11-16 18:39:07.000000000 -0500
 @@ -69,6 +69,7 @@ int main(void)
  	BLANK();
  #undef ENTRY
@@ -10784,9 +10801,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/asm-offsets_64.c linux-3.0.9/arch/x86/ker
  	OFFSET(TSS_ist, tss_struct, x86_tss.ist);
  	BLANK();
  
-diff -urNp linux-3.0.9/arch/x86/kernel/asm-offsets.c linux-3.0.9/arch/x86/kernel/asm-offsets.c
---- linux-3.0.9/arch/x86/kernel/asm-offsets.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/asm-offsets.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/asm-offsets.c linux-3.1.1/arch/x86/kernel/asm-offsets.c
+--- linux-3.1.1/arch/x86/kernel/asm-offsets.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/asm-offsets.c	2011-11-16 18:39:07.000000000 -0500
 @@ -33,6 +33,8 @@ void common(void) {
  	OFFSET(TI_status, thread_info, status);
  	OFFSET(TI_addr_limit, thread_info, addr_limit);
@@ -10823,9 +10840,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/asm-offsets.c linux-3.0.9/arch/x86/kernel
  #ifdef CONFIG_XEN
  	BLANK();
  	OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
-diff -urNp linux-3.0.9/arch/x86/kernel/cpu/amd.c linux-3.0.9/arch/x86/kernel/cpu/amd.c
---- linux-3.0.9/arch/x86/kernel/cpu/amd.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/amd.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/amd.c linux-3.1.1/arch/x86/kernel/cpu/amd.c
+--- linux-3.1.1/arch/x86/kernel/cpu/amd.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/amd.c	2011-11-16 18:39:07.000000000 -0500
 @@ -647,7 +647,7 @@ static unsigned int __cpuinit amd_size_c
  							unsigned int size)
  {
@@ -10835,9 +10852,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/amd.c linux-3.0.9/arch/x86/kernel/cpu
  		/* Duron Rev A0 */
  		if (c->x86_model == 3 && c->x86_mask == 0)
  			size = 64;
-diff -urNp linux-3.0.9/arch/x86/kernel/cpu/common.c linux-3.0.9/arch/x86/kernel/cpu/common.c
---- linux-3.0.9/arch/x86/kernel/cpu/common.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/common.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/common.c linux-3.1.1/arch/x86/kernel/cpu/common.c
+--- linux-3.1.1/arch/x86/kernel/cpu/common.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/common.c	2011-11-16 18:39:07.000000000 -0500
 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
  
  static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10982,9 +10999,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/common.c linux-3.0.9/arch/x86/kernel/
  	struct thread_struct *thread = &curr->thread;
  
  	if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-3.0.9/arch/x86/kernel/cpu/intel.c linux-3.0.9/arch/x86/kernel/cpu/intel.c
---- linux-3.0.9/arch/x86/kernel/cpu/intel.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/intel.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/intel.c linux-3.1.1/arch/x86/kernel/cpu/intel.c
+--- linux-3.1.1/arch/x86/kernel/cpu/intel.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/intel.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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.
@@ -10994,9 +11011,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/intel.c linux-3.0.9/arch/x86/kernel/c
  	load_idt(&idt_descr);
  }
  #endif
-diff -urNp linux-3.0.9/arch/x86/kernel/cpu/Makefile linux-3.0.9/arch/x86/kernel/cpu/Makefile
---- linux-3.0.9/arch/x86/kernel/cpu/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/Makefile	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/Makefile linux-3.1.1/arch/x86/kernel/cpu/Makefile
+--- linux-3.1.1/arch/x86/kernel/cpu/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/Makefile	2011-11-16 18:39:07.000000000 -0500
 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
  CFLAGS_REMOVE_perf_event.o = -pg
  endif
@@ -11008,18 +11025,18 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/Makefile linux-3.0.9/arch/x86/kernel/
  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.9/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c	2011-11-15 20:02:59.000000000 -0500
-@@ -46,6 +46,7 @@
- #include <asm/ipi.h>
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce.c linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce.c	2011-11-16 18:39:07.000000000 -0500
+@@ -42,6 +42,7 @@
+ #include <asm/processor.h>
  #include <asm/mce.h>
  #include <asm/msr.h>
 +#include <asm/local.h>
  
  #include "mce-internal.h"
  
-@@ -208,7 +209,7 @@ static void print_mce(struct mce *m)
+@@ -205,7 +206,7 @@ static void print_mce(struct mce *m)
  			!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
  				m->cs, m->ip);
  
@@ -11028,7 +11045,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.9/arch/x86/ker
  			print_symbol("{%s}", m->ip);
  		pr_cont("\n");
  	}
-@@ -236,10 +237,10 @@ static void print_mce(struct mce *m)
+@@ -233,10 +234,10 @@ static void print_mce(struct mce *m)
  
  #define PANIC_TIMEOUT 5 /* 5 seconds */
  
@@ -11041,7 +11058,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.9/arch/x86/ker
  
  /* Panic in progress. Enable interrupts and wait for final IPI */
  static void wait_for_panic(void)
-@@ -263,7 +264,7 @@ static void mce_panic(char *msg, struct 
+@@ -260,7 +261,7 @@ static void mce_panic(char *msg, struct 
  		/*
  		 * Make sure only one CPU runs in machine check panic
  		 */
@@ -11050,7 +11067,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.9/arch/x86/ker
  			wait_for_panic();
  		barrier();
  
-@@ -271,7 +272,7 @@ static void mce_panic(char *msg, struct 
+@@ -268,7 +269,7 @@ static void mce_panic(char *msg, struct 
  		console_verbose();
  	} else {
  		/* Don't log too much for fake panic */
@@ -11059,7 +11076,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.9/arch/x86/ker
  			return;
  	}
  	/* First print corrected ones that are still unlogged */
-@@ -638,7 +639,7 @@ static int mce_timed_out(u64 *t)
+@@ -610,7 +611,7 @@ static int mce_timed_out(u64 *t)
  	 * might have been modified by someone else.
  	 */
  	rmb();
@@ -11068,42 +11085,43 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.9/arch/x86/ker
  		wait_for_panic();
  	if (!monarch_timeout)
  		goto out;
-@@ -1452,14 +1453,14 @@ void __cpuinit mcheck_cpu_init(struct cp
+@@ -1429,7 +1430,7 @@ void __cpuinit mcheck_cpu_init(struct cp
   */
  
- static DEFINE_SPINLOCK(mce_state_lock);
--static int		open_count;		/* #times opened */
-+static local_t		open_count;		/* #times opened */
- static int		open_exclu;		/* already open exclusive? */
+ static DEFINE_SPINLOCK(mce_chrdev_state_lock);
+-static int mce_chrdev_open_count;	/* #times opened */
++static local_t mce_chrdev_open_count;	/* #times opened */
+ static int mce_chrdev_open_exclu;	/* already open exclusive? */
  
- static int mce_open(struct inode *inode, struct file *file)
- {
- 	spin_lock(&mce_state_lock);
+ static int mce_chrdev_open(struct inode *inode, struct file *file)
+@@ -1437,7 +1438,7 @@ static int mce_chrdev_open(struct inode 
+ 	spin_lock(&mce_chrdev_state_lock);
  
--	if (open_exclu || (open_count && (file->f_flags & O_EXCL))) {
-+	if (open_exclu || (local_read(&open_count) && (file->f_flags & O_EXCL))) {
- 		spin_unlock(&mce_state_lock);
+ 	if (mce_chrdev_open_exclu ||
+-	    (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
++	    (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
+ 		spin_unlock(&mce_chrdev_state_lock);
  
  		return -EBUSY;
-@@ -1467,7 +1468,7 @@ static int mce_open(struct inode *inode,
+@@ -1445,7 +1446,7 @@ static int mce_chrdev_open(struct inode 
  
  	if (file->f_flags & O_EXCL)
- 		open_exclu = 1;
--	open_count++;
-+	local_inc(&open_count);
+ 		mce_chrdev_open_exclu = 1;
+-	mce_chrdev_open_count++;
++	local_inc(&mce_chrdev_open_count);
  
- 	spin_unlock(&mce_state_lock);
+ 	spin_unlock(&mce_chrdev_state_lock);
  
-@@ -1478,7 +1479,7 @@ static int mce_release(struct inode *ino
+@@ -1456,7 +1457,7 @@ static int mce_chrdev_release(struct ino
  {
- 	spin_lock(&mce_state_lock);
+ 	spin_lock(&mce_chrdev_state_lock);
  
--	open_count--;
-+	local_dec(&open_count);
- 	open_exclu = 0;
+-	mce_chrdev_open_count--;
++	local_dec(&mce_chrdev_open_count);
+ 	mce_chrdev_open_exclu = 0;
  
- 	spin_unlock(&mce_state_lock);
-@@ -2163,7 +2164,7 @@ struct dentry *mce_get_debugfs_dir(void)
+ 	spin_unlock(&mce_chrdev_state_lock);
+@@ -2147,7 +2148,7 @@ struct dentry *mce_get_debugfs_dir(void)
  static void mce_reset(void)
  {
  	cpu_missing = 0;
@@ -11112,9 +11130,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.9/arch/x86/ker
  	atomic_set(&mce_executing, 0);
  	atomic_set(&mce_callin, 0);
  	atomic_set(&global_nwo, 0);
-diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c
---- linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce-inject.c
+--- linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-11-16 18:39:07.000000000 -0500
 @@ -215,7 +215,9 @@ static int inject_init(void)
  	if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL))
  		return -ENOMEM;
@@ -11126,9 +11144,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.9/arch/
  	register_die_notifier(&mce_raise_nb);
  	return 0;
  }
-diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c
---- linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/mtrr/main.c linux-3.1.1/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-3.1.1/arch/x86/kernel/cpu/mtrr/main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/mtrr/main.c	2011-11-16 18:39:07.000000000 -0500
 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
@@ -11138,9 +11156,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.9/arch/x86/kern
  
  const struct mtrr_ops *mtrr_if;
  
-diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.1.1/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-3.1.1/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-11-16 18:39:07.000000000 -0500
 @@ -25,7 +25,7 @@ struct mtrr_ops {
  	int	(*validate_add_page)(unsigned long base, unsigned long size,
  				     unsigned int type);
@@ -11150,10 +11168,10 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.9/arch/x86/kern
  
  extern int generic_get_free_region(unsigned long base, unsigned long size,
  				   int replace_reg);
-diff -urNp linux-3.0.9/arch/x86/kernel/cpu/perf_event.c linux-3.0.9/arch/x86/kernel/cpu/perf_event.c
---- linux-3.0.9/arch/x86/kernel/cpu/perf_event.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/perf_event.c	2011-11-15 20:02:59.000000000 -0500
-@@ -781,6 +781,8 @@ static int x86_schedule_events(struct cp
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/perf_event.c linux-3.1.1/arch/x86/kernel/cpu/perf_event.c
+--- linux-3.1.1/arch/x86/kernel/cpu/perf_event.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/perf_event.c	2011-11-16 18:40:08.000000000 -0500
+@@ -795,6 +795,8 @@ static int x86_schedule_events(struct cp
  	int i, j, w, wmax, num = 0;
  	struct hw_perf_event *hwc;
  
@@ -11162,7 +11180,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/perf_event.c linux-3.0.9/arch/x86/ker
  	bitmap_zero(used_mask, X86_PMC_IDX_MAX);
  
  	for (i = 0; i < n; i++) {
-@@ -1875,7 +1877,7 @@ perf_callchain_user(struct perf_callchai
+@@ -1919,7 +1921,7 @@ perf_callchain_user(struct perf_callchai
  			break;
  
  		perf_callchain_store(entry, frame.return_address);
@@ -11171,9 +11189,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/perf_event.c linux-3.0.9/arch/x86/ker
  	}
  }
  
-diff -urNp linux-3.0.9/arch/x86/kernel/crash.c linux-3.0.9/arch/x86/kernel/crash.c
---- linux-3.0.9/arch/x86/kernel/crash.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/crash.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/crash.c linux-3.1.1/arch/x86/kernel/crash.c
+--- linux-3.1.1/arch/x86/kernel/crash.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/crash.c	2011-11-16 18:39:07.000000000 -0500
 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 
  	regs = args->regs;
  
@@ -11183,9 +11201,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/crash.c linux-3.0.9/arch/x86/kernel/crash
  		crash_fixup_ss_esp(&fixed_regs, regs);
  		regs = &fixed_regs;
  	}
-diff -urNp linux-3.0.9/arch/x86/kernel/doublefault_32.c linux-3.0.9/arch/x86/kernel/doublefault_32.c
---- linux-3.0.9/arch/x86/kernel/doublefault_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/doublefault_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/doublefault_32.c linux-3.1.1/arch/x86/kernel/doublefault_32.c
+--- linux-3.1.1/arch/x86/kernel/doublefault_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/doublefault_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -11217,9 +11235,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/doublefault_32.c linux-3.0.9/arch/x86/ker
  		.fs		= __KERNEL_PERCPU,
  
  		.__cr3		= __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_32.c linux-3.0.9/arch/x86/kernel/dumpstack_32.c
---- linux-3.0.9/arch/x86/kernel/dumpstack_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/dumpstack_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/dumpstack_32.c linux-3.1.1/arch/x86/kernel/dumpstack_32.c
+--- linux-3.1.1/arch/x86/kernel/dumpstack_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/dumpstack_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task
  		bp = stack_frame(task, regs);
  
@@ -11283,10 +11301,26 @@ diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_32.c linux-3.0.9/arch/x86/kerne
  	if (ip < PAGE_OFFSET)
  		return 0;
  	if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_64.c linux-3.0.9/arch/x86/kernel/dumpstack_64.c
---- linux-3.0.9/arch/x86/kernel/dumpstack_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/dumpstack_64.c	2011-11-15 20:02:59.000000000 -0500
-@@ -147,9 +147,9 @@ void dump_trace(struct task_struct *task
+@@ -139,3 +139,15 @@ int is_valid_bugaddr(unsigned long ip)
+ 
+ 	return ud2 == 0x0b0f;
+ }
++
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++void pax_check_alloca(unsigned long size)
++{
++	unsigned long sp = (unsigned long)&sp, stack_left;
++
++	/* all kernel stacks are of the same size */
++	stack_left = sp & (THREAD_SIZE - 1);
++	BUG_ON(stack_left < 256 || size >= stack_left - 256);
++}
++EXPORT_SYMBOL(pax_check_alloca);
++#endif
+diff -urNp linux-3.1.1/arch/x86/kernel/dumpstack_64.c linux-3.1.1/arch/x86/kernel/dumpstack_64.c
+--- linux-3.1.1/arch/x86/kernel/dumpstack_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/dumpstack_64.c	2011-11-16 18:39:07.000000000 -0500
+@@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task
  	unsigned long *irq_stack_end =
  		(unsigned long *)per_cpu(irq_stack_ptr, cpu);
  	unsigned used = 0;
@@ -11297,7 +11331,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_64.c linux-3.0.9/arch/x86/kerne
  
  	if (!task)
  		task = current;
-@@ -167,10 +167,10 @@ void dump_trace(struct task_struct *task
+@@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task
  	 * current stack address. If the stacks consist of nested
  	 * exceptions
  	 */
@@ -11309,7 +11343,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_64.c linux-3.0.9/arch/x86/kerne
  		estack_end = in_exception_stack(cpu, (unsigned long)stack,
  						&used, &id);
  
-@@ -178,7 +178,7 @@ void dump_trace(struct task_struct *task
+@@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task
  			if (ops->stack(data, id) < 0)
  				break;
  
@@ -11318,7 +11352,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_64.c linux-3.0.9/arch/x86/kerne
  					     data, estack_end, &graph);
  			ops->stack(data, "<EOE>");
  			/*
-@@ -197,7 +197,7 @@ void dump_trace(struct task_struct *task
+@@ -172,7 +172,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;
@@ -11327,7 +11361,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_64.c linux-3.0.9/arch/x86/kerne
  					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
+@@ -191,7 +191,8 @@ void dump_trace(struct task_struct *task
  	/*
  	 * This handles the process stack:
  	 */
@@ -11337,9 +11371,60 @@ diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_64.c linux-3.0.9/arch/x86/kerne
  	put_cpu();
  }
  EXPORT_SYMBOL(dump_trace);
-diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack.c linux-3.0.9/arch/x86/kernel/dumpstack.c
---- linux-3.0.9/arch/x86/kernel/dumpstack.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/dumpstack.c	2011-11-15 20:02:59.000000000 -0500
+@@ -305,3 +306,50 @@ int is_valid_bugaddr(unsigned long ip)
+ 
+ 	return ud2 == 0x0b0f;
+ }
++
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++void pax_check_alloca(unsigned long size)
++{
++	unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
++	unsigned cpu, used;
++	char *id;
++
++	/* check the process stack first */
++	stack_start = (unsigned long)task_stack_page(current);
++	stack_end = stack_start + THREAD_SIZE;
++	if (likely(stack_start <= sp && sp < stack_end)) {
++		unsigned long stack_left = sp & (THREAD_SIZE - 1);
++		BUG_ON(stack_left < 256 || size >= stack_left - 256);
++		return;
++	}
++
++	cpu = get_cpu();
++
++	/* check the irq stacks */
++	stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
++	stack_start = stack_end - IRQ_STACK_SIZE;
++	if (stack_start <= sp && sp < stack_end) {
++		unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
++		put_cpu();
++		BUG_ON(stack_left < 256 || size >= stack_left - 256);
++		return;
++	}
++
++	/* check the exception stacks */
++	used = 0;
++	stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
++	stack_start = stack_end - EXCEPTION_STKSZ;
++	if (stack_end && stack_start <= sp && sp < stack_end) {
++		unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
++		put_cpu();
++		BUG_ON(stack_left < 256 || size >= stack_left - 256);
++		return;
++	}
++
++	put_cpu();
++
++	/* unknown stack */
++	BUG();
++}
++EXPORT_SYMBOL(pax_check_alloca);
++#endif
+diff -urNp linux-3.1.1/arch/x86/kernel/dumpstack.c linux-3.1.1/arch/x86/kernel/dumpstack.c
+--- linux-3.1.1/arch/x86/kernel/dumpstack.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/dumpstack.c	2011-11-16 18:40:08.000000000 -0500
 @@ -2,6 +2,9 @@
   *  Copyright (C) 1991, 1992  Linus Torvalds
   *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -11483,9 +11568,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack.c linux-3.0.9/arch/x86/kernel/d
  		report_bug(regs->ip, regs);
  
  	if (__die(str, regs, err))
-diff -urNp linux-3.0.9/arch/x86/kernel/early_printk.c linux-3.0.9/arch/x86/kernel/early_printk.c
---- linux-3.0.9/arch/x86/kernel/early_printk.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/early_printk.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/early_printk.c linux-3.1.1/arch/x86/kernel/early_printk.c
+--- linux-3.1.1/arch/x86/kernel/early_printk.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/early_printk.c	2011-11-16 18:40:08.000000000 -0500
 @@ -7,6 +7,7 @@
  #include <linux/pci_regs.h>
  #include <linux/pci_ids.h>
@@ -11503,10 +11588,10 @@ diff -urNp linux-3.0.9/arch/x86/kernel/early_printk.c linux-3.0.9/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.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/entry_32.S
---- linux-3.0.9/arch/x86/kernel/entry_32.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/entry_32.S	2011-11-15 20:02:59.000000000 -0500
-@@ -185,13 +185,146 @@
+diff -urNp linux-3.1.1/arch/x86/kernel/entry_32.S linux-3.1.1/arch/x86/kernel/entry_32.S
+--- linux-3.1.1/arch/x86/kernel/entry_32.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/entry_32.S	2011-11-16 18:40:08.000000000 -0500
+@@ -186,13 +186,146 @@
  	/*CFI_REL_OFFSET gs, PT_GS*/
  .endm
  .macro SET_KERNEL_GS reg
@@ -11654,7 +11739,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  	cld
  	PUSH_GS
  	pushl_cfi %fs
-@@ -214,7 +347,7 @@
+@@ -215,7 +348,7 @@
  	CFI_REL_OFFSET ecx, 0
  	pushl_cfi %ebx
  	CFI_REL_OFFSET ebx, 0
@@ -11663,7 +11748,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  	movl %edx, %ds
  	movl %edx, %es
  	movl $(__KERNEL_PERCPU), %edx
-@@ -222,6 +355,15 @@
+@@ -223,6 +356,15 @@
  	SET_KERNEL_GS %edx
  .endm
  
@@ -11679,7 +11764,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  .macro RESTORE_INT_REGS
  	popl_cfi %ebx
  	CFI_RESTORE ebx
-@@ -307,7 +449,7 @@ ENTRY(ret_from_fork)
+@@ -308,7 +450,7 @@ ENTRY(ret_from_fork)
  	popfl_cfi
  	jmp syscall_exit
  	CFI_ENDPROC
@@ -11688,7 +11773,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  /*
   * Interrupt exit functions should be protected against kprobes
-@@ -332,7 +474,15 @@ check_userspace:
+@@ -333,7 +475,15 @@ check_userspace:
  	movb PT_CS(%esp), %al
  	andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
  	cmpl $USER_RPL, %eax
@@ -11704,7 +11789,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  ENTRY(resume_userspace)
  	LOCKDEP_SYS_EXIT
-@@ -344,8 +494,8 @@ ENTRY(resume_userspace)
+@@ -345,8 +495,8 @@ ENTRY(resume_userspace)
  	andl $_TIF_WORK_MASK, %ecx	# is there any work to be done on
  					# int/exception return?
  	jne work_pending
@@ -11715,7 +11800,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  #ifdef CONFIG_PREEMPT
  ENTRY(resume_kernel)
-@@ -360,7 +510,7 @@ need_resched:
+@@ -361,7 +511,7 @@ need_resched:
  	jz restore_all
  	call preempt_schedule_irq
  	jmp need_resched
@@ -11724,7 +11809,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  #endif
  	CFI_ENDPROC
  /*
-@@ -394,23 +544,34 @@ sysenter_past_esp:
+@@ -395,23 +545,34 @@ sysenter_past_esp:
  	/*CFI_REL_OFFSET cs, 0*/
  	/*
  	 * Push current_thread_info()->sysenter_return to the stack.
@@ -11762,7 +11847,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  	movl %ebp,PT_EBP(%esp)
  .section __ex_table,"a"
  	.align 4
-@@ -433,12 +594,24 @@ sysenter_do_call:
+@@ -434,12 +595,24 @@ sysenter_do_call:
  	testl $_TIF_ALLWORK_MASK, %ecx
  	jne sysexit_audit
  sysenter_exit:
@@ -11787,7 +11872,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  	PTGS_TO_GS
  	ENABLE_INTERRUPTS_SYSEXIT
  
-@@ -455,6 +628,9 @@ sysenter_audit:
+@@ -456,6 +629,9 @@ sysenter_audit:
  	movl %eax,%edx			/* 2nd arg: syscall number */
  	movl $AUDIT_ARCH_I386,%eax	/* 1st arg: audit arch */
  	call audit_syscall_entry
@@ -11797,7 +11882,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  	pushl_cfi %ebx
  	movl PT_EAX(%esp),%eax		/* reload syscall number */
  	jmp sysenter_do_call
-@@ -481,11 +657,17 @@ sysexit_audit:
+@@ -482,11 +658,17 @@ sysexit_audit:
  
  	CFI_ENDPROC
  .pushsection .fixup,"ax"
@@ -11817,7 +11902,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  .popsection
  	PTGS_TO_GS_EX
  ENDPROC(ia32_sysenter_target)
-@@ -518,6 +700,15 @@ syscall_exit:
+@@ -519,6 +701,15 @@ syscall_exit:
  	testl $_TIF_ALLWORK_MASK, %ecx	# current->work
  	jne syscall_exit_work
  
@@ -11833,7 +11918,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  restore_all:
  	TRACE_IRQS_IRET
  restore_all_notrace:
-@@ -577,14 +768,34 @@ ldt_ss:
+@@ -578,14 +769,34 @@ ldt_ss:
   * compensating for the offset by changing to the ESPFIX segment with
   * a base address that matches for the difference.
   */
@@ -11871,7 +11956,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  	pushl_cfi $__ESPFIX_SS
  	pushl_cfi %eax			/* new kernel esp */
  	/* Disable interrupts, but do not irqtrace this section: we
-@@ -613,34 +824,28 @@ work_resched:
+@@ -614,34 +825,28 @@ work_resched:
  	movl TI_flags(%ebp), %ecx
  	andl $_TIF_WORK_MASK, %ecx	# is there any work to be done other
  					# than syscall tracing?
@@ -11911,7 +11996,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  	# perform syscall exit tracing
  	ALIGN
-@@ -648,11 +853,14 @@ syscall_trace_entry:
+@@ -649,11 +854,14 @@ syscall_trace_entry:
  	movl $-ENOSYS,PT_EAX(%esp)
  	movl %esp, %eax
  	call syscall_trace_enter
@@ -11927,7 +12012,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  	# perform syscall exit tracing
  	ALIGN
-@@ -665,20 +873,24 @@ syscall_exit_work:
+@@ -666,20 +874,24 @@ syscall_exit_work:
  	movl %esp, %eax
  	call syscall_trace_leave
  	jmp resume_userspace
@@ -11955,7 +12040,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  	CFI_ENDPROC
  /*
   * End of kprobes section
-@@ -752,6 +964,36 @@ ptregs_clone:
+@@ -753,6 +965,36 @@ ptregs_clone:
  	CFI_ENDPROC
  ENDPROC(ptregs_clone)
  
@@ -11992,7 +12077,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  .macro FIXUP_ESPFIX_STACK
  /*
   * Switch back for ESPFIX stack to the normal zerobased stack
-@@ -761,8 +1003,15 @@ ENDPROC(ptregs_clone)
+@@ -762,8 +1004,15 @@ ENDPROC(ptregs_clone)
   * normal stack and adjusts ESP with the matching offset.
   */
  	/* fixup the stack */
@@ -12010,7 +12095,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  	shl $16, %eax
  	addl %esp, %eax			/* the adjusted stack pointer */
  	pushl_cfi $__KERNEL_DS
-@@ -815,7 +1064,7 @@ vector=vector+1
+@@ -816,7 +1065,7 @@ vector=vector+1
    .endr
  2:	jmp common_interrupt
  .endr
@@ -12019,7 +12104,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  .previous
  END(interrupt)
-@@ -863,7 +1112,7 @@ ENTRY(coprocessor_error)
+@@ -864,7 +1113,7 @@ ENTRY(coprocessor_error)
  	pushl_cfi $do_coprocessor_error
  	jmp error_code
  	CFI_ENDPROC
@@ -12028,7 +12113,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  ENTRY(simd_coprocessor_error)
  	RING0_INT_FRAME
-@@ -889,7 +1138,7 @@ ENTRY(simd_coprocessor_error)
+@@ -885,7 +1134,7 @@ ENTRY(simd_coprocessor_error)
  #endif
  	jmp error_code
  	CFI_ENDPROC
@@ -12037,7 +12122,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  ENTRY(device_not_available)
  	RING0_INT_FRAME
-@@ -897,7 +1146,7 @@ ENTRY(device_not_available)
+@@ -893,7 +1142,7 @@ ENTRY(device_not_available)
  	pushl_cfi $do_device_not_available
  	jmp error_code
  	CFI_ENDPROC
@@ -12046,7 +12131,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  #ifdef CONFIG_PARAVIRT
  ENTRY(native_iret)
-@@ -906,12 +1155,12 @@ ENTRY(native_iret)
+@@ -902,12 +1151,12 @@ ENTRY(native_iret)
  	.align 4
  	.long native_iret, iret_exc
  .previous
@@ -12061,7 +12146,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  #endif
  
  ENTRY(overflow)
-@@ -920,7 +1169,7 @@ ENTRY(overflow)
+@@ -916,7 +1165,7 @@ ENTRY(overflow)
  	pushl_cfi $do_overflow
  	jmp error_code
  	CFI_ENDPROC
@@ -12070,7 +12155,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  ENTRY(bounds)
  	RING0_INT_FRAME
-@@ -928,7 +1177,7 @@ ENTRY(bounds)
+@@ -924,7 +1173,7 @@ ENTRY(bounds)
  	pushl_cfi $do_bounds
  	jmp error_code
  	CFI_ENDPROC
@@ -12079,7 +12164,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  ENTRY(invalid_op)
  	RING0_INT_FRAME
-@@ -936,7 +1185,7 @@ ENTRY(invalid_op)
+@@ -932,7 +1181,7 @@ ENTRY(invalid_op)
  	pushl_cfi $do_invalid_op
  	jmp error_code
  	CFI_ENDPROC
@@ -12088,7 +12173,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  ENTRY(coprocessor_segment_overrun)
  	RING0_INT_FRAME
-@@ -944,35 +1193,35 @@ ENTRY(coprocessor_segment_overrun)
+@@ -940,35 +1189,35 @@ ENTRY(coprocessor_segment_overrun)
  	pushl_cfi $do_coprocessor_segment_overrun
  	jmp error_code
  	CFI_ENDPROC
@@ -12129,7 +12214,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  ENTRY(divide_error)
  	RING0_INT_FRAME
-@@ -980,7 +1229,7 @@ ENTRY(divide_error)
+@@ -976,7 +1225,7 @@ ENTRY(divide_error)
  	pushl_cfi $do_divide_error
  	jmp error_code
  	CFI_ENDPROC
@@ -12138,7 +12223,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  #ifdef CONFIG_X86_MCE
  ENTRY(machine_check)
-@@ -989,7 +1238,7 @@ ENTRY(machine_check)
+@@ -985,7 +1234,7 @@ ENTRY(machine_check)
  	pushl_cfi machine_check_vector
  	jmp error_code
  	CFI_ENDPROC
@@ -12147,7 +12232,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  #endif
  
  ENTRY(spurious_interrupt_bug)
-@@ -998,7 +1247,7 @@ ENTRY(spurious_interrupt_bug)
+@@ -994,7 +1243,7 @@ ENTRY(spurious_interrupt_bug)
  	pushl_cfi $do_spurious_interrupt_bug
  	jmp error_code
  	CFI_ENDPROC
@@ -12156,7 +12241,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  /*
   * End of kprobes section
   */
-@@ -1113,7 +1362,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector
+@@ -1109,7 +1358,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector
  
  ENTRY(mcount)
  	ret
@@ -12165,7 +12250,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  ENTRY(ftrace_caller)
  	cmpl $0, function_trace_stop
-@@ -1142,7 +1391,7 @@ ftrace_graph_call:
+@@ -1138,7 +1387,7 @@ ftrace_graph_call:
  .globl ftrace_stub
  ftrace_stub:
  	ret
@@ -12174,7 +12259,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  #else /* ! CONFIG_DYNAMIC_FTRACE */
  
-@@ -1178,7 +1427,7 @@ trace:
+@@ -1174,7 +1423,7 @@ trace:
  	popl %ecx
  	popl %eax
  	jmp ftrace_stub
@@ -12183,7 +12268,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  #endif /* CONFIG_DYNAMIC_FTRACE */
  #endif /* CONFIG_FUNCTION_TRACER */
  
-@@ -1199,7 +1448,7 @@ ENTRY(ftrace_graph_caller)
+@@ -1195,7 +1444,7 @@ ENTRY(ftrace_graph_caller)
  	popl %ecx
  	popl %eax
  	ret
@@ -12192,7 +12277,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  .globl return_to_handler
  return_to_handler:
-@@ -1213,7 +1462,6 @@ return_to_handler:
+@@ -1209,7 +1458,6 @@ return_to_handler:
  	jmp *%ecx
  #endif
  
@@ -12200,7 +12285,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  #include "syscall_table_32.S"
  
  syscall_table_size=(.-sys_call_table)
-@@ -1259,15 +1507,18 @@ error_code:
+@@ -1255,15 +1503,18 @@ error_code:
  	movl $-1, PT_ORIG_EAX(%esp)	# no syscall to restart
  	REG_TO_PTGS %ecx
  	SET_KERNEL_GS %ecx
@@ -12221,7 +12306,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  /*
   * Debug traps and NMI can happen at the one SYSENTER instruction
-@@ -1309,7 +1560,7 @@ debug_stack_correct:
+@@ -1305,7 +1556,7 @@ debug_stack_correct:
  	call do_debug
  	jmp ret_from_exception
  	CFI_ENDPROC
@@ -12230,7 +12315,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  /*
   * NMI is doubly nasty. It can happen _while_ we're handling
-@@ -1346,6 +1597,9 @@ nmi_stack_correct:
+@@ -1342,6 +1593,9 @@ nmi_stack_correct:
  	xorl %edx,%edx		# zero error code
  	movl %esp,%eax		# pt_regs pointer
  	call do_nmi
@@ -12240,7 +12325,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  	jmp restore_all_notrace
  	CFI_ENDPROC
  
-@@ -1382,12 +1636,15 @@ nmi_espfix_stack:
+@@ -1378,12 +1632,15 @@ nmi_espfix_stack:
  	FIXUP_ESPFIX_STACK		# %eax == %esp
  	xorl %edx,%edx			# zero error code
  	call do_nmi
@@ -12257,7 +12342,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  ENTRY(int3)
  	RING0_INT_FRAME
-@@ -1399,14 +1656,14 @@ ENTRY(int3)
+@@ -1395,14 +1652,14 @@ ENTRY(int3)
  	call do_int3
  	jmp ret_from_exception
  	CFI_ENDPROC
@@ -12274,7 +12359,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  
  #ifdef CONFIG_KVM_GUEST
  ENTRY(async_page_fault)
-@@ -1414,7 +1671,7 @@ ENTRY(async_page_fault)
+@@ -1410,7 +1667,7 @@ ENTRY(async_page_fault)
  	pushl_cfi $do_async_page_fault
  	jmp error_code
  	CFI_ENDPROC
@@ -12283,10 +12368,10 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
  #endif
  
  /*
-diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/entry_64.S
---- linux-3.0.9/arch/x86/kernel/entry_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/entry_64.S	2011-11-15 20:02:59.000000000 -0500
-@@ -53,6 +53,8 @@
+diff -urNp linux-3.1.1/arch/x86/kernel/entry_64.S linux-3.1.1/arch/x86/kernel/entry_64.S
+--- linux-3.1.1/arch/x86/kernel/entry_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/entry_64.S	2011-11-16 18:40:08.000000000 -0500
+@@ -55,6 +55,8 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
  #include <asm/percpu.h>
@@ -12295,7 +12380,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
  #include <linux/elf-em.h>
-@@ -66,8 +68,9 @@
+@@ -68,8 +70,9 @@
  #ifdef CONFIG_FUNCTION_TRACER
  #ifdef CONFIG_DYNAMIC_FTRACE
  ENTRY(mcount)
@@ -12306,7 +12391,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  ENTRY(ftrace_caller)
  	cmpl $0, function_trace_stop
-@@ -90,8 +93,9 @@ GLOBAL(ftrace_graph_call)
+@@ -92,8 +95,9 @@ GLOBAL(ftrace_graph_call)
  #endif
  
  GLOBAL(ftrace_stub)
@@ -12317,7 +12402,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  #else /* ! CONFIG_DYNAMIC_FTRACE */
  ENTRY(mcount)
-@@ -110,6 +114,7 @@ ENTRY(mcount)
+@@ -112,6 +116,7 @@ ENTRY(mcount)
  #endif
  
  GLOBAL(ftrace_stub)
@@ -12325,7 +12410,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	retq
  
  trace:
-@@ -119,12 +124,13 @@ trace:
+@@ -121,12 +126,13 @@ trace:
  	movq 8(%rbp), %rsi
  	subq $MCOUNT_INSN_SIZE, %rdi
  
@@ -12340,7 +12425,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  #endif /* CONFIG_DYNAMIC_FTRACE */
  #endif /* CONFIG_FUNCTION_TRACER */
  
-@@ -144,8 +150,9 @@ ENTRY(ftrace_graph_caller)
+@@ -146,8 +152,9 @@ ENTRY(ftrace_graph_caller)
  
  	MCOUNT_RESTORE_FRAME
  
@@ -12351,7 +12436,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  GLOBAL(return_to_handler)
  	subq  $24, %rsp
-@@ -161,6 +168,7 @@ GLOBAL(return_to_handler)
+@@ -163,6 +170,7 @@ GLOBAL(return_to_handler)
  	movq 8(%rsp), %rdx
  	movq (%rsp), %rax
  	addq $24, %rsp
@@ -12359,7 +12444,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	jmp *%rdi
  #endif
  
-@@ -176,6 +184,269 @@ ENTRY(native_usergs_sysret64)
+@@ -178,6 +186,269 @@ ENTRY(native_usergs_sysret64)
  ENDPROC(native_usergs_sysret64)
  #endif /* CONFIG_PARAVIRT */
  
@@ -12629,28 +12714,16 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
  #ifdef CONFIG_TRACE_IRQFLAGS
-@@ -318,7 +589,7 @@ ENTRY(save_args)
- 	leaq -RBP+8(%rsp),%rdi	/* arg1 for handler */
- 	movq_cfi rbp, 8		/* push %rbp */
- 	leaq 8(%rsp), %rbp		/* mov %rsp, %ebp */
+@@ -319,7 +590,7 @@ ENDPROC(native_usergs_sysret64)
+ 	movq %rsp, %rsi
+ 
+ 	leaq -RBP(%rsp),%rdi	/* arg1 for handler */
 -	testl $3, CS(%rdi)
 +	testb $3, CS(%rdi)
  	je 1f
  	SWAPGS
  	/*
-@@ -338,9 +609,10 @@ ENTRY(save_args)
- 	 * We entered an interrupt context - irqs are off:
- 	 */
- 2:	TRACE_IRQS_OFF
-+	pax_force_retaddr
- 	ret
- 	CFI_ENDPROC
--END(save_args)
-+ENDPROC(save_args)
- 	.popsection
- 
- ENTRY(save_rest)
-@@ -354,9 +626,10 @@ ENTRY(save_rest)
+@@ -350,9 +621,10 @@ ENTRY(save_rest)
  	movq_cfi r15, R15+16
  	movq %r11, 8(%rsp)	/* return address */
  	FIXUP_TOP_OF_STACK %r11, 16
@@ -12662,7 +12735,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  /* save complete stack frame */
  	.pushsection .kprobes.text, "ax"
-@@ -385,9 +658,10 @@ ENTRY(save_paranoid)
+@@ -381,9 +653,10 @@ ENTRY(save_paranoid)
  	js 1f	/* negative -> in kernel */
  	SWAPGS
  	xorl %ebx,%ebx
@@ -12675,7 +12748,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	.popsection
  
  /*
-@@ -409,7 +683,7 @@ ENTRY(ret_from_fork)
+@@ -405,7 +678,7 @@ ENTRY(ret_from_fork)
  
  	RESTORE_REST
  
@@ -12684,7 +12757,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	je   int_ret_from_sys_call
  
  	testl $_TIF_IA32, TI_flags(%rcx)	# 32-bit compat task needs IRET
-@@ -419,7 +693,7 @@ ENTRY(ret_from_fork)
+@@ -415,7 +688,7 @@ ENTRY(ret_from_fork)
  	jmp ret_from_sys_call			# go to the SYSRET fastpath
  
  	CFI_ENDPROC
@@ -12693,7 +12766,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  /*
   * System call entry. Up to 6 arguments in registers are supported.
-@@ -455,7 +729,7 @@ END(ret_from_fork)
+@@ -451,7 +724,7 @@ END(ret_from_fork)
  ENTRY(system_call)
  	CFI_STARTPROC	simple
  	CFI_SIGNAL_FRAME
@@ -12702,7 +12775,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	CFI_REGISTER	rip,rcx
  	/*CFI_REGISTER	rflags,r11*/
  	SWAPGS_UNSAFE_STACK
-@@ -468,12 +742,13 @@ ENTRY(system_call_after_swapgs)
+@@ -464,12 +737,13 @@ ENTRY(system_call_after_swapgs)
  
  	movq	%rsp,PER_CPU_VAR(old_rsp)
  	movq	PER_CPU_VAR(kernel_stack),%rsp
@@ -12712,12 +12785,12 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	 * and short:
  	 */
  	ENABLE_INTERRUPTS(CLBR_NONE)
--	SAVE_ARGS 8,1
-+	SAVE_ARGS 8*6,1
+-	SAVE_ARGS 8,0
++	SAVE_ARGS 8*6,0
  	movq  %rax,ORIG_RAX-ARGOFFSET(%rsp)
  	movq  %rcx,RIP-ARGOFFSET(%rsp)
  	CFI_REL_OFFSET rip,RIP-ARGOFFSET
-@@ -502,6 +777,8 @@ sysret_check:
+@@ -498,6 +772,8 @@ sysret_check:
  	andl %edi,%edx
  	jnz  sysret_careful
  	CFI_REMEMBER_STATE
@@ -12726,7 +12799,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	/*
  	 * sysretq will re-enable interrupts:
  	 */
-@@ -560,6 +837,9 @@ auditsys:
+@@ -556,6 +832,9 @@ auditsys:
  	movq %rax,%rsi			/* 2nd arg: syscall number */
  	movl $AUDIT_ARCH_X86_64,%edi	/* 1st arg: audit arch */
  	call audit_syscall_entry
@@ -12736,7 +12809,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	LOAD_ARGS 0		/* reload call-clobbered registers */
  	jmp system_call_fastpath
  
-@@ -590,6 +870,9 @@ tracesys:
+@@ -586,6 +865,9 @@ tracesys:
  	FIXUP_TOP_OF_STACK %rdi
  	movq %rsp,%rdi
  	call syscall_trace_enter
@@ -12746,7 +12819,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	/*
  	 * Reload arg registers from stack in case ptrace changed them.
  	 * We don't reload %rax because syscall_trace_enter() returned
-@@ -611,7 +894,7 @@ tracesys:
+@@ -607,7 +889,7 @@ tracesys:
  GLOBAL(int_ret_from_sys_call)
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	TRACE_IRQS_OFF
@@ -12755,7 +12828,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	je retint_restore_args
  	movl $_TIF_ALLWORK_MASK,%edi
  	/* edi:	mask to check */
-@@ -668,7 +951,7 @@ int_restore_rest:
+@@ -664,7 +946,7 @@ int_restore_rest:
  	TRACE_IRQS_OFF
  	jmp int_with_check
  	CFI_ENDPROC
@@ -12764,7 +12837,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  /*
   * Certain special system calls that need to save a complete full stack frame.
-@@ -684,7 +967,7 @@ ENTRY(\label)
+@@ -680,7 +962,7 @@ ENTRY(\label)
  	call \func
  	jmp ptregscall_common
  	CFI_ENDPROC
@@ -12773,7 +12846,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	.endm
  
  	PTREGSCALL stub_clone, sys_clone, %r8
-@@ -702,9 +985,10 @@ ENTRY(ptregscall_common)
+@@ -698,9 +980,10 @@ ENTRY(ptregscall_common)
  	movq_cfi_restore R12+8, r12
  	movq_cfi_restore RBP+8, rbp
  	movq_cfi_restore RBX+8, rbx
@@ -12785,7 +12858,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  ENTRY(stub_execve)
  	CFI_STARTPROC
-@@ -719,7 +1003,7 @@ ENTRY(stub_execve)
+@@ -715,7 +998,7 @@ ENTRY(stub_execve)
  	RESTORE_REST
  	jmp int_ret_from_sys_call
  	CFI_ENDPROC
@@ -12794,7 +12867,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  /*
   * sigreturn is special because it needs to restore all registers on return.
-@@ -737,7 +1021,7 @@ ENTRY(stub_rt_sigreturn)
+@@ -733,7 +1016,7 @@ ENTRY(stub_rt_sigreturn)
  	RESTORE_REST
  	jmp int_ret_from_sys_call
  	CFI_ENDPROC
@@ -12803,7 +12876,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  /*
   * Build the entry stubs and pointer table with some assembler magic.
-@@ -772,7 +1056,7 @@ vector=vector+1
+@@ -768,7 +1051,7 @@ vector=vector+1
  2:	jmp common_interrupt
  .endr
  	CFI_ENDPROC
@@ -12812,9 +12885,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  .previous
  END(interrupt)
-@@ -793,6 +1077,16 @@ END(interrupt)
+@@ -789,6 +1072,16 @@ END(interrupt)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
- 	call save_args
+ 	SAVE_ARGS_IRQ
  	PARTIAL_FRAME 0
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	testb $3, CS(%rdi)
@@ -12829,8 +12902,8 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	call \func
  	.endm
  
-@@ -825,7 +1119,7 @@ ret_from_intr:
- 	CFI_ADJUST_CFA_OFFSET	-8
+@@ -820,7 +1113,7 @@ ret_from_intr:
+ 
  exit_intr:
  	GET_THREAD_INFO(%rcx)
 -	testl $3,CS-ARGOFFSET(%rsp)
@@ -12838,7 +12911,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	je retint_kernel
  
  	/* Interrupt came from user space */
-@@ -847,12 +1141,16 @@ retint_swapgs:		/* return to user-space 
+@@ -842,12 +1135,16 @@ retint_swapgs:		/* return to user-space 
  	 * The iretq could re-enable interrupts:
  	 */
  	DISABLE_INTERRUPTS(CLBR_ANY)
@@ -12855,7 +12928,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	/*
  	 * The iretq could re-enable interrupts:
  	 */
-@@ -941,7 +1239,7 @@ ENTRY(retint_kernel)
+@@ -936,7 +1233,7 @@ ENTRY(retint_kernel)
  #endif
  
  	CFI_ENDPROC
@@ -12864,7 +12937,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  /*
   * End of kprobes section
   */
-@@ -957,7 +1255,7 @@ ENTRY(\sym)
+@@ -952,7 +1249,7 @@ ENTRY(\sym)
  	interrupt \do_sym
  	jmp ret_from_intr
  	CFI_ENDPROC
@@ -12873,7 +12946,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  .endm
  
  #ifdef CONFIG_SMP
-@@ -1027,12 +1325,22 @@ ENTRY(\sym)
+@@ -1017,12 +1314,22 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call error_entry
  	DEFAULT_FRAME 0
@@ -12897,7 +12970,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  .endm
  
  .macro paranoidzeroentry sym do_sym
-@@ -1044,15 +1352,25 @@ ENTRY(\sym)
+@@ -1034,15 +1341,25 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call save_paranoid
  	TRACE_IRQS_OFF
@@ -12925,7 +12998,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  .macro paranoidzeroentry_ist sym do_sym ist
  ENTRY(\sym)
  	INTR_FRAME
-@@ -1062,14 +1380,30 @@ ENTRY(\sym)
+@@ -1052,14 +1369,30 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call save_paranoid
  	TRACE_IRQS_OFF
@@ -12957,7 +13030,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  .endm
  
  .macro errorentry sym do_sym
-@@ -1080,13 +1414,23 @@ ENTRY(\sym)
+@@ -1070,13 +1403,23 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call error_entry
  	DEFAULT_FRAME 0
@@ -12982,7 +13055,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  .endm
  
  	/* error code is on the stack already */
-@@ -1099,13 +1443,23 @@ ENTRY(\sym)
+@@ -1089,13 +1432,23 @@ ENTRY(\sym)
  	call save_paranoid
  	DEFAULT_FRAME 0
  	TRACE_IRQS_OFF
@@ -13007,7 +13080,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  .endm
  
  zeroentry divide_error do_divide_error
-@@ -1134,9 +1488,10 @@ gs_change:
+@@ -1125,9 +1478,10 @@ gs_change:
  2:	mfence		/* workaround */
  	SWAPGS
  	popfq_cfi
@@ -13019,7 +13092,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  	.section __ex_table,"a"
  	.align 8
-@@ -1158,13 +1513,14 @@ ENTRY(kernel_thread_helper)
+@@ -1149,13 +1503,14 @@ ENTRY(kernel_thread_helper)
  	 * Here we are in the child and the registers are set as they were
  	 * at kernel_thread() invocation in the parent.
  	 */
@@ -13035,7 +13108,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  /*
   * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
-@@ -1193,9 +1549,10 @@ ENTRY(kernel_execve)
+@@ -1184,9 +1539,10 @@ ENTRY(kernel_execve)
  	je int_ret_from_sys_call
  	RESTORE_ARGS
  	UNFAKE_STACK_FRAME
@@ -13047,7 +13120,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  /* Call softirq on interrupt stack. Interrupts are off. */
  ENTRY(call_softirq)
-@@ -1213,9 +1570,10 @@ ENTRY(call_softirq)
+@@ -1204,9 +1560,10 @@ ENTRY(call_softirq)
  	CFI_DEF_CFA_REGISTER	rsp
  	CFI_ADJUST_CFA_OFFSET   -8
  	decl PER_CPU_VAR(irq_count)
@@ -13059,7 +13132,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  #ifdef CONFIG_XEN
  zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
-@@ -1253,7 +1611,7 @@ ENTRY(xen_do_hypervisor_callback)   # do
+@@ -1244,7 +1601,7 @@ ENTRY(xen_do_hypervisor_callback)   # do
  	decl PER_CPU_VAR(irq_count)
  	jmp  error_exit
  	CFI_ENDPROC
@@ -13068,7 +13141,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  /*
   * Hypervisor uses this for application faults while it executes.
-@@ -1312,7 +1670,7 @@ ENTRY(xen_failsafe_callback)
+@@ -1303,7 +1660,7 @@ ENTRY(xen_failsafe_callback)
  	SAVE_ALL
  	jmp error_exit
  	CFI_ENDPROC
@@ -13077,7 +13150,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
  	xen_hvm_callback_vector xen_evtchn_do_upcall
-@@ -1361,16 +1719,31 @@ ENTRY(paranoid_exit)
+@@ -1352,16 +1709,31 @@ ENTRY(paranoid_exit)
  	TRACE_IRQS_OFF
  	testl %ebx,%ebx				/* swapgs needed? */
  	jnz paranoid_restore
@@ -13110,7 +13183,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	jmp irq_return
  paranoid_userspace:
  	GET_THREAD_INFO(%rcx)
-@@ -1399,7 +1772,7 @@ paranoid_schedule:
+@@ -1390,7 +1762,7 @@ paranoid_schedule:
  	TRACE_IRQS_OFF
  	jmp paranoid_userspace
  	CFI_ENDPROC
@@ -13119,7 +13192,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  /*
   * Exception entry point. This expects an error code/orig_rax on the stack.
-@@ -1426,12 +1799,13 @@ ENTRY(error_entry)
+@@ -1417,12 +1789,13 @@ ENTRY(error_entry)
  	movq_cfi r14, R14+8
  	movq_cfi r15, R15+8
  	xorl %ebx,%ebx
@@ -13134,7 +13207,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	ret
  
  /*
-@@ -1458,7 +1832,7 @@ bstep_iret:
+@@ -1449,7 +1822,7 @@ bstep_iret:
  	movq %rcx,RIP+8(%rsp)
  	jmp error_swapgs
  	CFI_ENDPROC
@@ -13143,7 +13216,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  
  /* ebx:	no swapgs flag (1: don't need swapgs, 0: need it) */
-@@ -1478,7 +1852,7 @@ ENTRY(error_exit)
+@@ -1469,7 +1842,7 @@ ENTRY(error_exit)
  	jnz retint_careful
  	jmp retint_swapgs
  	CFI_ENDPROC
@@ -13152,7 +13225,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  
  	/* runs on exception stack */
-@@ -1490,6 +1864,16 @@ ENTRY(nmi)
+@@ -1481,6 +1854,16 @@ ENTRY(nmi)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call save_paranoid
  	DEFAULT_FRAME 0
@@ -13169,7 +13242,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
  	movq %rsp,%rdi
  	movq $-1,%rsi
-@@ -1500,12 +1884,28 @@ ENTRY(nmi)
+@@ -1491,12 +1874,28 @@ ENTRY(nmi)
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	testl %ebx,%ebx				/* swapgs needed? */
  	jnz nmi_restore
@@ -13199,7 +13272,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  	jmp irq_return
  nmi_userspace:
  	GET_THREAD_INFO(%rcx)
-@@ -1534,14 +1934,14 @@ nmi_schedule:
+@@ -1525,14 +1924,14 @@ nmi_schedule:
  	jmp paranoid_exit
  	CFI_ENDPROC
  #endif
@@ -13216,9 +13289,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
  
  /*
   * End of kprobes section
-diff -urNp linux-3.0.9/arch/x86/kernel/ftrace.c linux-3.0.9/arch/x86/kernel/ftrace.c
---- linux-3.0.9/arch/x86/kernel/ftrace.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/ftrace.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/ftrace.c linux-3.1.1/arch/x86/kernel/ftrace.c
+--- linux-3.1.1/arch/x86/kernel/ftrace.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/ftrace.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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 */
  
@@ -13276,9 +13349,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/ftrace.c linux-3.0.9/arch/x86/kernel/ftra
  	if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
  		return -EFAULT;
  
-diff -urNp linux-3.0.9/arch/x86/kernel/head32.c linux-3.0.9/arch/x86/kernel/head32.c
---- linux-3.0.9/arch/x86/kernel/head32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/head32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/head32.c linux-3.1.1/arch/x86/kernel/head32.c
+--- linux-3.1.1/arch/x86/kernel/head32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/head32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -19,6 +19,7 @@
  #include <asm/io_apic.h>
  #include <asm/bios_ebda.h>
@@ -13296,9 +13369,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/head32.c linux-3.0.9/arch/x86/kernel/head
  
  #ifdef CONFIG_BLK_DEV_INITRD
  	/* Reserve INITRD */
-diff -urNp linux-3.0.9/arch/x86/kernel/head_32.S linux-3.0.9/arch/x86/kernel/head_32.S
---- linux-3.0.9/arch/x86/kernel/head_32.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/head_32.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/head_32.S linux-3.1.1/arch/x86/kernel/head_32.S
+--- linux-3.1.1/arch/x86/kernel/head_32.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/head_32.S	2011-11-16 18:39:07.000000000 -0500
 @@ -25,6 +25,12 @@
  /* Physical address */
  #define pa(X) ((X) - __PAGE_OFFSET)
@@ -13733,9 +13806,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/head_32.S linux-3.0.9/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.9/arch/x86/kernel/head_64.S linux-3.0.9/arch/x86/kernel/head_64.S
---- linux-3.0.9/arch/x86/kernel/head_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/head_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/head_64.S linux-3.1.1/arch/x86/kernel/head_64.S
+--- linux-3.1.1/arch/x86/kernel/head_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/head_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -19,6 +19,7 @@
  #include <asm/cache.h>
  #include <asm/processor-flags.h>
@@ -14005,9 +14078,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/head_64.S linux-3.0.9/arch/x86/kernel/hea
  
  	__PAGE_ALIGNED_BSS
  	.align PAGE_SIZE
-diff -urNp linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c
---- linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/i386_ksyms_32.c linux-3.1.1/arch/x86/kernel/i386_ksyms_32.c
+--- linux-3.1.1/arch/x86/kernel/i386_ksyms_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/i386_ksyms_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
  EXPORT_SYMBOL(cmpxchg8b_emu);
  #endif
@@ -14029,9 +14102,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c linux-3.0.9/arch/x86/kern
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff -urNp linux-3.0.9/arch/x86/kernel/i8259.c linux-3.0.9/arch/x86/kernel/i8259.c
---- linux-3.0.9/arch/x86/kernel/i8259.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/i8259.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/i8259.c linux-3.1.1/arch/x86/kernel/i8259.c
+--- linux-3.1.1/arch/x86/kernel/i8259.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/i8259.c	2011-11-16 18:39:07.000000000 -0500
 @@ -210,7 +210,7 @@ spurious_8259A_irq:
  			       "spurious 8259A interrupt: IRQ%d.\n", irq);
  			spurious_irq_mask |= irqmask;
@@ -14041,9 +14114,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/i8259.c linux-3.0.9/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.9/arch/x86/kernel/init_task.c linux-3.0.9/arch/x86/kernel/init_task.c
---- linux-3.0.9/arch/x86/kernel/init_task.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/init_task.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/init_task.c linux-3.1.1/arch/x86/kernel/init_task.c
+--- linux-3.1.1/arch/x86/kernel/init_task.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/init_task.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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..
@@ -14062,9 +14135,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/init_task.c linux-3.0.9/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.9/arch/x86/kernel/ioport.c linux-3.0.9/arch/x86/kernel/ioport.c
---- linux-3.0.9/arch/x86/kernel/ioport.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/ioport.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/ioport.c linux-3.1.1/arch/x86/kernel/ioport.c
+--- linux-3.1.1/arch/x86/kernel/ioport.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/ioport.c	2011-11-16 18:40:08.000000000 -0500
 @@ -6,6 +6,7 @@
  #include <linux/sched.h>
  #include <linux/kernel.h>
@@ -14108,9 +14181,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/ioport.c linux-3.0.9/arch/x86/kernel/iopo
  		if (!capable(CAP_SYS_RAWIO))
  			return -EPERM;
  	}
-diff -urNp linux-3.0.9/arch/x86/kernel/irq_32.c linux-3.0.9/arch/x86/kernel/irq_32.c
---- linux-3.0.9/arch/x86/kernel/irq_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/irq_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/irq_32.c linux-3.1.1/arch/x86/kernel/irq_32.c
+--- linux-3.1.1/arch/x86/kernel/irq_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/irq_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -36,7 +36,7 @@ static int check_stack_overflow(void)
  	__asm__ __volatile__("andl %%esp,%0" :
  			     "=r" (sp) : "0" (THREAD_SIZE - 1));
@@ -14250,9 +14323,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/irq_32.c linux-3.0.9/arch/x86/kernel/irq_
  		/*
  		 * Shouldn't happen, we returned above if in_interrupt():
  		 */
-diff -urNp linux-3.0.9/arch/x86/kernel/irq.c linux-3.0.9/arch/x86/kernel/irq.c
---- linux-3.0.9/arch/x86/kernel/irq.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/irq.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/irq.c linux-3.1.1/arch/x86/kernel/irq.c
+--- linux-3.1.1/arch/x86/kernel/irq.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/irq.c	2011-11-16 18:39:07.000000000 -0500
 @@ -17,7 +17,7 @@
  #include <asm/mce.h>
  #include <asm/hw_irq.h>
@@ -14287,9 +14360,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/irq.c linux-3.0.9/arch/x86/kernel/irq.c
  #endif
  	return sum;
  }
-diff -urNp linux-3.0.9/arch/x86/kernel/kgdb.c linux-3.0.9/arch/x86/kernel/kgdb.c
---- linux-3.0.9/arch/x86/kernel/kgdb.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/kgdb.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/kgdb.c linux-3.1.1/arch/x86/kernel/kgdb.c
+--- linux-3.1.1/arch/x86/kernel/kgdb.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/kgdb.c	2011-11-16 18:39:07.000000000 -0500
 @@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, 
  #ifdef CONFIG_X86_32
  	switch (regno) {
@@ -14328,9 +14401,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/kgdb.c linux-3.0.9/arch/x86/kernel/kgdb.c
  			if (user_mode(regs))
  				return single_step_cont(regs, args);
  			break;
-diff -urNp linux-3.0.9/arch/x86/kernel/kprobes.c linux-3.0.9/arch/x86/kernel/kprobes.c
---- linux-3.0.9/arch/x86/kernel/kprobes.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/kprobes.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/kprobes.c linux-3.1.1/arch/x86/kernel/kprobes.c
+--- linux-3.1.1/arch/x86/kernel/kprobes.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/kprobes.c	2011-11-16 18:39:07.000000000 -0500
 @@ -117,8 +117,11 @@ static void __kprobes __synthesize_relat
  	} __attribute__((packed)) *insn;
  
@@ -14474,10 +14547,10 @@ diff -urNp linux-3.0.9/arch/x86/kernel/kprobes.c linux-3.0.9/arch/x86/kernel/kpr
  	       RELATIVE_ADDR_SIZE);
  
  	insn_buf[0] = RELATIVEJUMP_OPCODE;
-diff -urNp linux-3.0.9/arch/x86/kernel/kvm.c linux-3.0.9/arch/x86/kernel/kvm.c
---- linux-3.0.9/arch/x86/kernel/kvm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/kvm.c	2011-11-15 20:02:59.000000000 -0500
-@@ -426,6 +426,7 @@ static void __init paravirt_ops_setup(vo
+diff -urNp linux-3.1.1/arch/x86/kernel/kvm.c linux-3.1.1/arch/x86/kernel/kvm.c
+--- linux-3.1.1/arch/x86/kernel/kvm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/kvm.c	2011-11-16 18:39:07.000000000 -0500
+@@ -437,6 +437,7 @@ static void __init paravirt_ops_setup(vo
  		pv_mmu_ops.set_pud = kvm_set_pud;
  #if PAGETABLE_LEVELS == 4
  		pv_mmu_ops.set_pgd = kvm_set_pgd;
@@ -14485,9 +14558,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/kvm.c linux-3.0.9/arch/x86/kernel/kvm.c
  #endif
  #endif
  		pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
-diff -urNp linux-3.0.9/arch/x86/kernel/ldt.c linux-3.0.9/arch/x86/kernel/ldt.c
---- linux-3.0.9/arch/x86/kernel/ldt.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/ldt.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/ldt.c linux-3.1.1/arch/x86/kernel/ldt.c
+--- linux-3.1.1/arch/x86/kernel/ldt.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/ldt.c	2011-11-16 18:39:07.000000000 -0500
 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
  	if (reload) {
  #ifdef CONFIG_SMP
@@ -14552,9 +14625,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/ldt.c linux-3.0.9/arch/x86/kernel/ldt.c
  	fill_ldt(&ldt, &ldt_info);
  	if (oldmode)
  		ldt.avl = 0;
-diff -urNp linux-3.0.9/arch/x86/kernel/machine_kexec_32.c linux-3.0.9/arch/x86/kernel/machine_kexec_32.c
---- linux-3.0.9/arch/x86/kernel/machine_kexec_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/machine_kexec_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/machine_kexec_32.c linux-3.1.1/arch/x86/kernel/machine_kexec_32.c
+--- linux-3.1.1/arch/x86/kernel/machine_kexec_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/machine_kexec_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -27,7 +27,7 @@
  #include <asm/cacheflush.h>
  #include <asm/debugreg.h>
@@ -14582,9 +14655,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/machine_kexec_32.c linux-3.0.9/arch/x86/k
  
  	relocate_kernel_ptr = control_page;
  	page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-3.0.9/arch/x86/kernel/microcode_intel.c linux-3.0.9/arch/x86/kernel/microcode_intel.c
---- linux-3.0.9/arch/x86/kernel/microcode_intel.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/microcode_intel.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/microcode_intel.c linux-3.1.1/arch/x86/kernel/microcode_intel.c
+--- linux-3.1.1/arch/x86/kernel/microcode_intel.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/microcode_intel.c	2011-11-16 18:39:07.000000000 -0500
 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod
  
  static int get_ucode_user(void *to, const void *from, size_t n)
@@ -14601,10 +14674,10 @@ diff -urNp linux-3.0.9/arch/x86/kernel/microcode_intel.c linux-3.0.9/arch/x86/ke
  }
  
  static void microcode_fini_cpu(int cpu)
-diff -urNp linux-3.0.9/arch/x86/kernel/module.c linux-3.0.9/arch/x86/kernel/module.c
---- linux-3.0.9/arch/x86/kernel/module.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/module.c	2011-11-15 20:02:59.000000000 -0500
-@@ -36,21 +36,66 @@
+diff -urNp linux-3.1.1/arch/x86/kernel/module.c linux-3.1.1/arch/x86/kernel/module.c
+--- linux-3.1.1/arch/x86/kernel/module.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/module.c	2011-11-16 18:39:07.000000000 -0500
+@@ -36,15 +36,60 @@
  #define DEBUGP(fmt...)
  #endif
  
@@ -14630,12 +14703,6 @@ diff -urNp linux-3.0.9/arch/x86/kernel/module.c linux-3.0.9/arch/x86/kernel/modu
 +
 +}
 +
- /* Free memory returned from module_alloc */
- void module_free(struct module *mod, void *module_region)
- {
- 	vfree(module_region);
- }
- 
 +#ifdef CONFIG_PAX_KERNEXEC
 +#ifdef CONFIG_X86_32
 +void *module_alloc_exec(unsigned long size)
@@ -14670,10 +14737,10 @@ diff -urNp linux-3.0.9/arch/x86/kernel/module.c linux-3.0.9/arch/x86/kernel/modu
 +#endif
 +#endif
 +
- /* We don't need anything special. */
- int module_frob_arch_sections(Elf_Ehdr *hdr,
- 			      Elf_Shdr *sechdrs,
-@@ -70,14 +115,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+ #ifdef CONFIG_X86_32
+ int apply_relocate(Elf32_Shdr *sechdrs,
+ 		   const char *strtab,
+@@ -55,14 +100,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
  	unsigned int i;
  	Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
  	Elf32_Sym *sym;
@@ -14693,7 +14760,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/module.c linux-3.0.9/arch/x86/kernel/modu
  		/* This is the symbol it is referring to.  Note that all
  		   undefined symbols have been resolved.  */
  		sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
-@@ -86,11 +133,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -71,11 +118,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
  		switch (ELF32_R_TYPE(rel[i].r_info)) {
  		case R_386_32:
  			/* We add the value into the location given */
@@ -14711,7 +14778,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/module.c linux-3.0.9/arch/x86/kernel/modu
  			break;
  		default:
  			printk(KERN_ERR "module %s: Unknown relocation: %u\n",
-@@ -146,21 +197,30 @@ int apply_relocate_add(Elf64_Shdr *sechd
+@@ -120,21 +171,30 @@ int apply_relocate_add(Elf64_Shdr *sechd
  		case R_X86_64_NONE:
  			break;
  		case R_X86_64_64:
@@ -14742,9 +14809,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/module.c linux-3.0.9/arch/x86/kernel/modu
  #if 0
  			if ((s64)val != *(s32 *)loc)
  				goto overflow;
-diff -urNp linux-3.0.9/arch/x86/kernel/paravirt.c linux-3.0.9/arch/x86/kernel/paravirt.c
---- linux-3.0.9/arch/x86/kernel/paravirt.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/paravirt.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/paravirt.c linux-3.1.1/arch/x86/kernel/paravirt.c
+--- linux-3.1.1/arch/x86/kernel/paravirt.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/paravirt.c	2011-11-16 18:40:08.000000000 -0500
 @@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
  {
  	return x;
@@ -14806,7 +14873,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/paravirt.c linux-3.0.9/arch/x86/kernel/pa
  
  	return insn_len;
  }
-@@ -294,22 +304,22 @@ void arch_flush_lazy_mmu_mode(void)
+@@ -302,7 +312,7 @@ void arch_flush_lazy_mmu_mode(void)
  	preempt_enable();
  }
  
@@ -14815,7 +14882,8 @@ diff -urNp linux-3.0.9/arch/x86/kernel/paravirt.c linux-3.0.9/arch/x86/kernel/pa
  	.name = "bare hardware",
  	.paravirt_enabled = 0,
  	.kernel_rpl = 0,
- 	.shared_kernel_pmd = 1,	/* Only used when CONFIG_X86_PAE is set */
+@@ -313,16 +323,16 @@ struct pv_info pv_info = {
+ #endif
  };
  
 -struct pv_init_ops pv_init_ops = {
@@ -14826,6 +14894,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/paravirt.c linux-3.0.9/arch/x86/kernel/pa
 -struct pv_time_ops pv_time_ops = {
 +struct pv_time_ops pv_time_ops __read_only = {
  	.sched_clock = native_sched_clock,
+ 	.steal_clock = native_steal_clock,
  };
  
 -struct pv_irq_ops pv_irq_ops = {
@@ -14833,7 +14902,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/paravirt.c linux-3.0.9/arch/x86/kernel/pa
  	.save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
  	.restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
  	.irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
-@@ -321,7 +331,7 @@ struct pv_irq_ops pv_irq_ops = {
+@@ -334,7 +344,7 @@ struct pv_irq_ops pv_irq_ops = {
  #endif
  };
  
@@ -14842,7 +14911,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/paravirt.c linux-3.0.9/arch/x86/kernel/pa
  	.cpuid = native_cpuid,
  	.get_debugreg = native_get_debugreg,
  	.set_debugreg = native_set_debugreg,
-@@ -382,21 +392,26 @@ struct pv_cpu_ops pv_cpu_ops = {
+@@ -395,21 +405,26 @@ struct pv_cpu_ops pv_cpu_ops = {
  	.end_context_switch = paravirt_nop,
  };
  
@@ -14872,7 +14941,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/paravirt.c linux-3.0.9/arch/x86/kernel/pa
  
  	.read_cr2 = native_read_cr2,
  	.write_cr2 = native_write_cr2,
-@@ -446,6 +461,7 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -459,6 +474,7 @@ struct pv_mmu_ops pv_mmu_ops = {
  	.make_pud = PTE_IDENT,
  
  	.set_pgd = native_set_pgd,
@@ -14880,7 +14949,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/paravirt.c linux-3.0.9/arch/x86/kernel/pa
  #endif
  #endif /* PAGETABLE_LEVELS >= 3 */
  
-@@ -465,6 +481,12 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -478,6 +494,12 @@ struct pv_mmu_ops pv_mmu_ops = {
  	},
  
  	.set_fixmap = native_set_fixmap,
@@ -14893,9 +14962,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/paravirt.c linux-3.0.9/arch/x86/kernel/pa
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c
---- linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/paravirt-spinlocks.c linux-3.1.1/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-3.1.1/arch/x86/kernel/paravirt-spinlocks.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/paravirt-spinlocks.c	2011-11-16 18:39:07.000000000 -0500
 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t 
  	arch_spin_lock(lock);
  }
@@ -14905,9 +14974,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.9/arch/x86
  #ifdef CONFIG_SMP
  	.spin_is_locked = __ticket_spin_is_locked,
  	.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-3.0.9/arch/x86/kernel/pci-iommu_table.c linux-3.0.9/arch/x86/kernel/pci-iommu_table.c
---- linux-3.0.9/arch/x86/kernel/pci-iommu_table.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/pci-iommu_table.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/pci-iommu_table.c linux-3.1.1/arch/x86/kernel/pci-iommu_table.c
+--- linux-3.1.1/arch/x86/kernel/pci-iommu_table.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/pci-iommu_table.c	2011-11-16 18:40:08.000000000 -0500
 @@ -2,7 +2,7 @@
  #include <asm/iommu_table.h>
  #include <linux/string.h>
@@ -14926,10 +14995,10 @@ diff -urNp linux-3.0.9/arch/x86/kernel/pci-iommu_table.c linux-3.0.9/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.9/arch/x86/kernel/process_32.c linux-3.0.9/arch/x86/kernel/process_32.c
---- linux-3.0.9/arch/x86/kernel/process_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/process_32.c	2011-11-15 20:02:59.000000000 -0500
-@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as
+diff -urNp linux-3.1.1/arch/x86/kernel/process_32.c linux-3.1.1/arch/x86/kernel/process_32.c
+--- linux-3.1.1/arch/x86/kernel/process_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/process_32.c	2011-11-16 18:39:07.000000000 -0500
+@@ -66,6 +66,7 @@ asmlinkage void ret_from_fork(void) __as
  unsigned long thread_saved_pc(struct task_struct *tsk)
  {
  	return ((unsigned long *)tsk->thread.sp)[3];
@@ -14937,7 +15006,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_32.c linux-3.0.9/arch/x86/kernel/
  }
  
  #ifndef CONFIG_SMP
-@@ -126,15 +127,14 @@ void __show_regs(struct pt_regs *regs, i
+@@ -128,15 +129,14 @@ void __show_regs(struct pt_regs *regs, i
  	unsigned long sp;
  	unsigned short ss, gs;
  
@@ -14955,7 +15024,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_32.c linux-3.0.9/arch/x86/kernel/
  
  	show_regs_common();
  
-@@ -196,13 +196,14 @@ int copy_thread(unsigned long clone_flag
+@@ -198,13 +198,14 @@ int copy_thread(unsigned long clone_flag
  	struct task_struct *tsk;
  	int err;
  
@@ -14971,7 +15040,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_32.c linux-3.0.9/arch/x86/kernel/
  
  	p->thread.ip = (unsigned long) ret_from_fork;
  
-@@ -292,7 +293,7 @@ __switch_to(struct task_struct *prev_p, 
+@@ -294,7 +295,7 @@ __switch_to(struct task_struct *prev_p, 
  	struct thread_struct *prev = &prev_p->thread,
  				 *next = &next_p->thread;
  	int cpu = smp_processor_id();
@@ -14980,7 +15049,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_32.c linux-3.0.9/arch/x86/kernel/
  	bool preload_fpu;
  
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
-@@ -327,6 +328,10 @@ __switch_to(struct task_struct *prev_p, 
+@@ -329,6 +330,10 @@ __switch_to(struct task_struct *prev_p, 
  	 */
  	lazy_save_gs(prev->gs);
  
@@ -14991,7 +15060,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_32.c linux-3.0.9/arch/x86/kernel/
  	/*
  	 * Load the per-thread Thread-Local Storage descriptor.
  	 */
-@@ -362,6 +367,9 @@ __switch_to(struct task_struct *prev_p, 
+@@ -364,6 +369,9 @@ __switch_to(struct task_struct *prev_p, 
  	 */
  	arch_end_context_switch(next_p);
  
@@ -15001,7 +15070,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_32.c linux-3.0.9/arch/x86/kernel/
  	if (preload_fpu)
  		__math_state_restore();
  
-@@ -371,8 +379,6 @@ __switch_to(struct task_struct *prev_p, 
+@@ -373,8 +381,6 @@ __switch_to(struct task_struct *prev_p, 
  	if (prev->gs | next->gs)
  		lazy_load_gs(next->gs);
  
@@ -15010,15 +15079,15 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_32.c linux-3.0.9/arch/x86/kernel/
  	return prev_p;
  }
  
-@@ -402,4 +408,3 @@ unsigned long get_wchan(struct task_stru
+@@ -404,4 +410,3 @@ unsigned long get_wchan(struct task_stru
  	} while (count++ < 16);
  	return 0;
  }
 -
-diff -urNp linux-3.0.9/arch/x86/kernel/process_64.c linux-3.0.9/arch/x86/kernel/process_64.c
---- linux-3.0.9/arch/x86/kernel/process_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/process_64.c	2011-11-15 20:02:59.000000000 -0500
-@@ -87,7 +87,7 @@ static void __exit_idle(void)
+diff -urNp linux-3.1.1/arch/x86/kernel/process_64.c linux-3.1.1/arch/x86/kernel/process_64.c
+--- linux-3.1.1/arch/x86/kernel/process_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/process_64.c	2011-11-16 18:39:07.000000000 -0500
+@@ -88,7 +88,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
  	/* idle loop has pid 0 */
@@ -15027,7 +15096,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_64.c linux-3.0.9/arch/x86/kernel/
  		return;
  	__exit_idle();
  }
-@@ -260,8 +260,7 @@ int copy_thread(unsigned long clone_flag
+@@ -262,8 +262,7 @@ int copy_thread(unsigned long clone_flag
  	struct pt_regs *childregs;
  	struct task_struct *me = current;
  
@@ -15037,7 +15106,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_64.c linux-3.0.9/arch/x86/kernel/
  	*childregs = *regs;
  
  	childregs->ax = 0;
-@@ -273,6 +272,7 @@ int copy_thread(unsigned long clone_flag
+@@ -275,6 +274,7 @@ int copy_thread(unsigned long clone_flag
  	p->thread.sp = (unsigned long) childregs;
  	p->thread.sp0 = (unsigned long) (childregs+1);
  	p->thread.usersp = me->thread.usersp;
@@ -15045,7 +15114,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_64.c linux-3.0.9/arch/x86/kernel/
  
  	set_tsk_thread_flag(p, TIF_FORK);
  
-@@ -375,7 +375,7 @@ __switch_to(struct task_struct *prev_p, 
+@@ -377,7 +377,7 @@ __switch_to(struct task_struct *prev_p, 
  	struct thread_struct *prev = &prev_p->thread;
  	struct thread_struct *next = &next_p->thread;
  	int cpu = smp_processor_id();
@@ -15054,7 +15123,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_64.c linux-3.0.9/arch/x86/kernel/
  	unsigned fsindex, gsindex;
  	bool preload_fpu;
  
-@@ -471,10 +471,9 @@ __switch_to(struct task_struct *prev_p, 
+@@ -473,10 +473,9 @@ __switch_to(struct task_struct *prev_p, 
  	prev->usersp = percpu_read(old_rsp);
  	percpu_write(old_rsp, next->usersp);
  	percpu_write(current_task, next_p);
@@ -15067,7 +15136,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_64.c linux-3.0.9/arch/x86/kernel/
  
  	/*
  	 * Now maybe reload the debug registers and handle I/O bitmaps
-@@ -536,12 +535,11 @@ unsigned long get_wchan(struct task_stru
+@@ -538,12 +537,11 @@ unsigned long get_wchan(struct task_stru
  	if (!p || p == current || p->state == TASK_RUNNING)
  		return 0;
  	stack = (unsigned long)task_stack_page(p);
@@ -15082,9 +15151,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_64.c linux-3.0.9/arch/x86/kernel/
  			return 0;
  		ip = *(u64 *)(fp+8);
  		if (!in_sched_functions(ip))
-diff -urNp linux-3.0.9/arch/x86/kernel/process.c linux-3.0.9/arch/x86/kernel/process.c
---- linux-3.0.9/arch/x86/kernel/process.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/process.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/process.c linux-3.1.1/arch/x86/kernel/process.c
+--- linux-3.1.1/arch/x86/kernel/process.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/process.c	2011-11-16 18:39:07.000000000 -0500
 @@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru
  
  void free_thread_info(struct thread_info *ti)
@@ -15174,7 +15243,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process.c linux-3.0.9/arch/x86/kernel/pro
  {
  	local_irq_disable();
  	/*
-@@ -668,16 +688,37 @@ static int __init idle_setup(char *str)
+@@ -645,16 +665,37 @@ static int __init idle_setup(char *str)
  }
  early_param("idle", idle_setup);
  
@@ -15222,10 +15291,10 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process.c linux-3.0.9/arch/x86/kernel/pro
 +#endif
 +}
 +#endif
-diff -urNp linux-3.0.9/arch/x86/kernel/ptrace.c linux-3.0.9/arch/x86/kernel/ptrace.c
---- linux-3.0.9/arch/x86/kernel/ptrace.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/ptrace.c	2011-11-15 20:02:59.000000000 -0500
-@@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi
+diff -urNp linux-3.1.1/arch/x86/kernel/ptrace.c linux-3.1.1/arch/x86/kernel/ptrace.c
+--- linux-3.1.1/arch/x86/kernel/ptrace.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/ptrace.c	2011-11-16 18:39:07.000000000 -0500
+@@ -822,7 +822,7 @@ long arch_ptrace(struct task_struct *chi
  		 unsigned long addr, unsigned long data)
  {
  	int ret;
@@ -15234,7 +15303,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/ptrace.c linux-3.0.9/arch/x86/kernel/ptra
  
  	switch (request) {
  	/* read the word at location addr in the USER area. */
-@@ -906,14 +906,14 @@ long arch_ptrace(struct task_struct *chi
+@@ -907,14 +907,14 @@ long arch_ptrace(struct task_struct *chi
  		if ((int) addr < 0)
  			return -EIO;
  		ret = do_get_thread_area(child, addr,
@@ -15251,7 +15320,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/ptrace.c linux-3.0.9/arch/x86/kernel/ptra
  		break;
  #endif
  
-@@ -1330,7 +1330,7 @@ static void fill_sigtrap_info(struct tas
+@@ -1331,7 +1331,7 @@ static void fill_sigtrap_info(struct tas
  	memset(info, 0, sizeof(*info));
  	info->si_signo = SIGTRAP;
  	info->si_code = si_code;
@@ -15260,9 +15329,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/ptrace.c linux-3.0.9/arch/x86/kernel/ptra
  }
  
  void user_single_step_siginfo(struct task_struct *tsk,
-diff -urNp linux-3.0.9/arch/x86/kernel/pvclock.c linux-3.0.9/arch/x86/kernel/pvclock.c
---- linux-3.0.9/arch/x86/kernel/pvclock.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/pvclock.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/pvclock.c linux-3.1.1/arch/x86/kernel/pvclock.c
+--- linux-3.1.1/arch/x86/kernel/pvclock.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/pvclock.c	2011-11-16 18:39:07.000000000 -0500
 @@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc
  	return pv_tsc_khz;
  }
@@ -15291,9 +15360,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/pvclock.c linux-3.0.9/arch/x86/kernel/pvc
  	} while (unlikely(last != ret));
  
  	return ret;
-diff -urNp linux-3.0.9/arch/x86/kernel/reboot.c linux-3.0.9/arch/x86/kernel/reboot.c
---- linux-3.0.9/arch/x86/kernel/reboot.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/reboot.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/reboot.c linux-3.1.1/arch/x86/kernel/reboot.c
+--- linux-3.1.1/arch/x86/kernel/reboot.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/reboot.c	2011-11-16 18:39:07.000000000 -0500
 @@ -35,7 +35,7 @@ void (*pm_power_off)(void);
  EXPORT_SYMBOL(pm_power_off);
  
@@ -15425,9 +15494,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/reboot.c linux-3.0.9/arch/x86/kernel/rebo
  }
  
  struct machine_ops machine_ops = {
-diff -urNp linux-3.0.9/arch/x86/kernel/setup.c linux-3.0.9/arch/x86/kernel/setup.c
---- linux-3.0.9/arch/x86/kernel/setup.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/setup.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/setup.c linux-3.1.1/arch/x86/kernel/setup.c
+--- linux-3.1.1/arch/x86/kernel/setup.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/setup.c	2011-11-16 18:39:07.000000000 -0500
 @@ -447,7 +447,7 @@ static void __init parse_setup_data(void
  
  		switch (data->type) {
@@ -15466,9 +15535,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/setup.c linux-3.0.9/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.9/arch/x86/kernel/setup_percpu.c linux-3.0.9/arch/x86/kernel/setup_percpu.c
---- linux-3.0.9/arch/x86/kernel/setup_percpu.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/setup_percpu.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/setup_percpu.c linux-3.1.1/arch/x86/kernel/setup_percpu.c
+--- linux-3.1.1/arch/x86/kernel/setup_percpu.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/setup_percpu.c	2011-11-16 18:39:07.000000000 -0500
 @@ -21,19 +21,17 @@
  #include <asm/cpu.h>
  #include <asm/stackprotector.h>
@@ -15532,9 +15601,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/setup_percpu.c linux-3.0.9/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.9/arch/x86/kernel/signal.c linux-3.0.9/arch/x86/kernel/signal.c
---- linux-3.0.9/arch/x86/kernel/signal.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/signal.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/signal.c linux-3.1.1/arch/x86/kernel/signal.c
+--- linux-3.1.1/arch/x86/kernel/signal.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/signal.c	2011-11-16 19:39:49.000000000 -0500
 @@ -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.
@@ -15600,16 +15669,16 @@ diff -urNp linux-3.0.9/arch/x86/kernel/signal.c linux-3.0.9/arch/x86/kernel/sign
  	} put_user_catch(err);
  
  	if (err)
-@@ -769,6 +772,8 @@ static void do_signal(struct pt_regs *re
+@@ -762,6 +765,8 @@ static void do_signal(struct pt_regs *re
+ 	siginfo_t info;
  	int signr;
- 	sigset_t *oldset;
  
 +	pax_track_stack();
 +
  	/*
  	 * We want the common case to go fast, which is why we may in certain
  	 * cases get here from kernel mode. Just return without doing anything
-@@ -776,7 +781,7 @@ static void do_signal(struct pt_regs *re
+@@ -769,7 +774,7 @@ static void do_signal(struct pt_regs *re
  	 * X86_32: vm86 regs switched out by assembly code before reaching
  	 * here, so testing against kernel CS suffices.
  	 */
@@ -15617,10 +15686,10 @@ diff -urNp linux-3.0.9/arch/x86/kernel/signal.c linux-3.0.9/arch/x86/kernel/sign
 +	if (!user_mode_novm(regs))
  		return;
  
- 	if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-3.0.9/arch/x86/kernel/smpboot.c linux-3.0.9/arch/x86/kernel/smpboot.c
---- linux-3.0.9/arch/x86/kernel/smpboot.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/smpboot.c	2011-11-15 20:02:59.000000000 -0500
+ 	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+diff -urNp linux-3.1.1/arch/x86/kernel/smpboot.c linux-3.1.1/arch/x86/kernel/smpboot.c
+--- linux-3.1.1/arch/x86/kernel/smpboot.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/smpboot.c	2011-11-16 18:39:07.000000000 -0500
 @@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int api
  	set_idle_for_cpu(cpu, c_idle.idle);
  do_rest:
@@ -15658,9 +15727,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/smpboot.c linux-3.0.9/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.9/arch/x86/kernel/step.c linux-3.0.9/arch/x86/kernel/step.c
---- linux-3.0.9/arch/x86/kernel/step.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/step.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/step.c linux-3.1.1/arch/x86/kernel/step.c
+--- linux-3.1.1/arch/x86/kernel/step.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/step.c	2011-11-16 18:39:07.000000000 -0500
 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
  		struct desc_struct *desc;
  		unsigned long base;
@@ -15694,26 +15763,17 @@ diff -urNp linux-3.0.9/arch/x86/kernel/step.c linux-3.0.9/arch/x86/kernel/step.c
  	copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
  	for (i = 0; i < copied; i++) {
  		switch (opcode[i]) {
-@@ -74,7 +78,7 @@ static int is_setting_trap_flag(struct t
- 
- #ifdef CONFIG_X86_64
- 		case 0x40 ... 0x4f:
--			if (regs->cs != __USER_CS)
-+			if ((regs->cs & 0xffff) != __USER_CS)
- 				/* 32-bit mode: register increment */
- 				return 0;
- 			/* 64-bit mode: REX prefix */
-diff -urNp linux-3.0.9/arch/x86/kernel/syscall_table_32.S linux-3.0.9/arch/x86/kernel/syscall_table_32.S
---- linux-3.0.9/arch/x86/kernel/syscall_table_32.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/syscall_table_32.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/syscall_table_32.S linux-3.1.1/arch/x86/kernel/syscall_table_32.S
+--- linux-3.1.1/arch/x86/kernel/syscall_table_32.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/syscall_table_32.S	2011-11-16 18:39:07.000000000 -0500
 @@ -1,3 +1,4 @@
 +.section .rodata,"a",@progbits
  ENTRY(sys_call_table)
  	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
  	.long sys_exit
-diff -urNp linux-3.0.9/arch/x86/kernel/sys_i386_32.c linux-3.0.9/arch/x86/kernel/sys_i386_32.c
---- linux-3.0.9/arch/x86/kernel/sys_i386_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/sys_i386_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/sys_i386_32.c linux-3.1.1/arch/x86/kernel/sys_i386_32.c
+--- linux-3.1.1/arch/x86/kernel/sys_i386_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/sys_i386_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -24,17 +24,224 @@
  
  #include <asm/syscalls.h>
@@ -15951,9 +16011,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/sys_i386_32.c linux-3.0.9/arch/x86/kernel
 +
 +	return addr;
  }
-diff -urNp linux-3.0.9/arch/x86/kernel/sys_x86_64.c linux-3.0.9/arch/x86/kernel/sys_x86_64.c
---- linux-3.0.9/arch/x86/kernel/sys_x86_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/sys_x86_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/sys_x86_64.c linux-3.1.1/arch/x86/kernel/sys_x86_64.c
+--- linux-3.1.1/arch/x86/kernel/sys_x86_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/sys_x86_64.c	2011-11-16 18:39:07.000000000 -0500
 @@ -32,8 +32,8 @@ out:
  	return error;
  }
@@ -16091,10 +16151,10 @@ diff -urNp linux-3.0.9/arch/x86/kernel/sys_x86_64.c linux-3.0.9/arch/x86/kernel/
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
-diff -urNp linux-3.0.9/arch/x86/kernel/tboot.c linux-3.0.9/arch/x86/kernel/tboot.c
---- linux-3.0.9/arch/x86/kernel/tboot.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/tboot.c	2011-11-15 20:02:59.000000000 -0500
-@@ -217,7 +217,7 @@ static int tboot_setup_sleep(void)
+diff -urNp linux-3.1.1/arch/x86/kernel/tboot.c linux-3.1.1/arch/x86/kernel/tboot.c
+--- linux-3.1.1/arch/x86/kernel/tboot.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/tboot.c	2011-11-16 18:39:07.000000000 -0500
+@@ -218,7 +218,7 @@ static int tboot_setup_sleep(void)
  
  void tboot_shutdown(u32 shutdown_type)
  {
@@ -16103,7 +16163,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/tboot.c linux-3.0.9/arch/x86/kernel/tboot
  
  	if (!tboot_enabled())
  		return;
-@@ -239,7 +239,7 @@ void tboot_shutdown(u32 shutdown_type)
+@@ -240,7 +240,7 @@ void tboot_shutdown(u32 shutdown_type)
  
  	switch_to_tboot_pt();
  
@@ -16112,7 +16172,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/tboot.c linux-3.0.9/arch/x86/kernel/tboot
  	shutdown();
  
  	/* should not reach here */
-@@ -296,7 +296,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1
+@@ -297,7 +297,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1
  	tboot_shutdown(acpi_shutdown_map[sleep_state]);
  }
  
@@ -16121,7 +16181,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/tboot.c linux-3.0.9/arch/x86/kernel/tboot
  
  static int tboot_wait_for_aps(int num_aps)
  {
-@@ -320,9 +320,9 @@ static int __cpuinit tboot_cpu_callback(
+@@ -321,9 +321,9 @@ static int __cpuinit tboot_cpu_callback(
  {
  	switch (action) {
  	case CPU_DYING:
@@ -16133,7 +16193,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/tboot.c linux-3.0.9/arch/x86/kernel/tboot
  				return NOTIFY_BAD;
  		break;
  	}
-@@ -341,7 +341,7 @@ static __init int tboot_late_init(void)
+@@ -342,7 +342,7 @@ static __init int tboot_late_init(void)
  
  	tboot_create_trampoline();
  
@@ -16142,9 +16202,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/tboot.c linux-3.0.9/arch/x86/kernel/tboot
  	register_hotcpu_notifier(&tboot_cpu_notifier);
  	return 0;
  }
-diff -urNp linux-3.0.9/arch/x86/kernel/time.c linux-3.0.9/arch/x86/kernel/time.c
---- linux-3.0.9/arch/x86/kernel/time.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/time.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/time.c linux-3.1.1/arch/x86/kernel/time.c
+--- linux-3.1.1/arch/x86/kernel/time.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/time.c	2011-11-16 18:39:07.000000000 -0500
 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs 
  {
  	unsigned long pc = instruction_pointer(regs);
@@ -16175,9 +16235,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/time.c linux-3.0.9/arch/x86/kernel/time.c
  	}
  	return pc;
  }
-diff -urNp linux-3.0.9/arch/x86/kernel/tls.c linux-3.0.9/arch/x86/kernel/tls.c
---- linux-3.0.9/arch/x86/kernel/tls.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/tls.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/tls.c linux-3.1.1/arch/x86/kernel/tls.c
+--- linux-3.1.1/arch/x86/kernel/tls.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/tls.c	2011-11-16 18:39:07.000000000 -0500
 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
  	if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
  		return -EINVAL;
@@ -16190,9 +16250,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/tls.c linux-3.0.9/arch/x86/kernel/tls.c
  	set_tls_desc(p, idx, &info, 1);
  
  	return 0;
-diff -urNp linux-3.0.9/arch/x86/kernel/trampoline_32.S linux-3.0.9/arch/x86/kernel/trampoline_32.S
---- linux-3.0.9/arch/x86/kernel/trampoline_32.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/trampoline_32.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/trampoline_32.S linux-3.1.1/arch/x86/kernel/trampoline_32.S
+--- linux-3.1.1/arch/x86/kernel/trampoline_32.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/trampoline_32.S	2011-11-16 18:39:07.000000000 -0500
 @@ -32,6 +32,12 @@
  #include <asm/segment.h>
  #include <asm/page_types.h>
@@ -16215,9 +16275,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/trampoline_32.S linux-3.0.9/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.9/arch/x86/kernel/trampoline_64.S linux-3.0.9/arch/x86/kernel/trampoline_64.S
---- linux-3.0.9/arch/x86/kernel/trampoline_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/trampoline_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/trampoline_64.S linux-3.1.1/arch/x86/kernel/trampoline_64.S
+--- linux-3.1.1/arch/x86/kernel/trampoline_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/trampoline_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -90,7 +90,7 @@ startup_32:
  	movl	$__KERNEL_DS, %eax	# Initialize the %ds segment register
  	movl	%eax, %ds
@@ -16236,9 +16296,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/trampoline_64.S linux-3.0.9/arch/x86/kern
  	.long	tgdt - r_base
  	.short 0
  	.quad	0x00cf9b000000ffff	# __KERNEL32_CS
-diff -urNp linux-3.0.9/arch/x86/kernel/traps.c linux-3.0.9/arch/x86/kernel/traps.c
---- linux-3.0.9/arch/x86/kernel/traps.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/traps.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/traps.c linux-3.1.1/arch/x86/kernel/traps.c
+--- linux-3.1.1/arch/x86/kernel/traps.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/traps.c	2011-11-16 18:39:07.000000000 -0500
 @@ -70,12 +70,6 @@ asmlinkage int system_call(void);
  
  /* Do we ignore FPU interrupts ? */
@@ -16418,9 +16478,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/traps.c linux-3.0.9/arch/x86/kernel/traps
  
  	if (!tsk_used_math(tsk)) {
  		local_irq_enable();
-diff -urNp linux-3.0.9/arch/x86/kernel/verify_cpu.S linux-3.0.9/arch/x86/kernel/verify_cpu.S
---- linux-3.0.9/arch/x86/kernel/verify_cpu.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/verify_cpu.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/verify_cpu.S linux-3.1.1/arch/x86/kernel/verify_cpu.S
+--- linux-3.1.1/arch/x86/kernel/verify_cpu.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/verify_cpu.S	2011-11-16 18:40:08.000000000 -0500
 @@ -20,6 +20,7 @@
   *	arch/x86/boot/compressed/head_64.S: Boot cpu verification
   *	arch/x86/kernel/trampoline_64.S: secondary processor verification
@@ -16429,9 +16489,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/verify_cpu.S linux-3.0.9/arch/x86/kernel/
   *
   *	verify_cpu, returns the status of longmode and SSE in register %eax.
   *		0: Success    1: Failure
-diff -urNp linux-3.0.9/arch/x86/kernel/vm86_32.c linux-3.0.9/arch/x86/kernel/vm86_32.c
---- linux-3.0.9/arch/x86/kernel/vm86_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/vm86_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/vm86_32.c linux-3.1.1/arch/x86/kernel/vm86_32.c
+--- linux-3.1.1/arch/x86/kernel/vm86_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/vm86_32.c	2011-11-16 18:40:08.000000000 -0500
 @@ -41,6 +41,7 @@
  #include <linux/ptrace.h>
  #include <linux/audit.h>
@@ -16496,9 +16556,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vm86_32.c linux-3.0.9/arch/x86/kernel/vm8
  	if (get_user(segoffs, intr_ptr))
  		goto cannot_handle;
  	if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel/vmlinux.lds.S
---- linux-3.0.9/arch/x86/kernel/vmlinux.lds.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/vmlinux.lds.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/vmlinux.lds.S linux-3.1.1/arch/x86/kernel/vmlinux.lds.S
+--- linux-3.1.1/arch/x86/kernel/vmlinux.lds.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/vmlinux.lds.S	2011-11-16 18:39:07.000000000 -0500
 @@ -26,6 +26,13 @@
  #include <asm/page_types.h>
  #include <asm/cache.h>
@@ -16513,7 +16573,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel
  
  #undef i386     /* in case the preprocessor is a 32bit one */
  
-@@ -69,31 +76,46 @@ jiffies_64 = jiffies;
+@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
  
  PHDRS {
  	text PT_LOAD FLAGS(5);          /* R_E */
@@ -16526,9 +16586,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel
 +	rodata PT_LOAD FLAGS(4);        /* R__ */
 +#endif
  	data PT_LOAD FLAGS(6);          /* RW_ */
- #ifdef CONFIG_X86_64
- 	user PT_LOAD FLAGS(5);          /* R_E */
-+#endif
+-#ifdef CONFIG_X86_64
 +	init.begin PT_LOAD FLAGS(6);    /* RW_ */
  #ifdef CONFIG_SMP
  	percpu PT_LOAD FLAGS(6);        /* RW_ */
@@ -16567,7 +16625,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel
  		HEAD_TEXT
  #ifdef CONFIG_X86_32
  		. = ALIGN(PAGE_SIZE);
-@@ -109,13 +131,47 @@ SECTIONS
+@@ -108,13 +128,47 @@ SECTIONS
  		IRQENTRY_TEXT
  		*(.fixup)
  		*(.gnu.warning)
@@ -16619,7 +16677,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel
  
  #if defined(CONFIG_DEBUG_RODATA)
  	/* .text should occupy whole number of pages */
-@@ -127,16 +183,20 @@ SECTIONS
+@@ -126,16 +180,20 @@ SECTIONS
  
  	/* Data */
  	.data : AT(ADDR(.data) - LOAD_OFFSET) {
@@ -16643,7 +16701,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel
  
  		PAGE_ALIGNED_DATA(PAGE_SIZE)
  
-@@ -208,12 +268,19 @@ SECTIONS
+@@ -176,12 +234,19 @@ SECTIONS
  #endif /* CONFIG_X86_64 */
  
  	/* Init code and data - will be freed after init */
@@ -16666,7 +16724,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel
  	/*
  	 * percpu offsets are zero-based on SMP.  PERCPU_VADDR() changes the
  	 * output PHDR, so the next output section - .init.text - should
-@@ -222,12 +289,27 @@ SECTIONS
+@@ -190,12 +255,27 @@ SECTIONS
  	PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
  #endif
  
@@ -16699,7 +16757,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel
  
  	/*
  	 * Code and data for a variety of lowlevel trampolines, to be
-@@ -301,19 +383,12 @@ SECTIONS
+@@ -269,19 +349,12 @@ SECTIONS
  	}
  
  	. = ALIGN(8);
@@ -16720,7 +16778,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel
  	PERCPU_SECTION(INTERNODE_CACHE_BYTES)
  #endif
  
-@@ -332,16 +407,10 @@ SECTIONS
+@@ -300,16 +373,10 @@ SECTIONS
  	.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
  		__smp_locks = .;
  		*(.smp_locks)
@@ -16738,7 +16796,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel
  	/* BSS */
  	. = ALIGN(PAGE_SIZE);
  	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
-@@ -357,6 +426,7 @@ SECTIONS
+@@ -325,6 +392,7 @@ SECTIONS
  		__brk_base = .;
  		. += 64 * 1024;		/* 64k alignment slop space */
  		*(.brk_reservation)	/* areas brk users have reserved */
@@ -16746,7 +16804,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel
  		__brk_limit = .;
  	}
  
-@@ -383,13 +453,12 @@ SECTIONS
+@@ -351,13 +419,12 @@ SECTIONS
   * for the boot processor.
   */
  #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
@@ -16761,30 +16819,60 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel
  	   "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.9/arch/x86/kernel/vsyscall_64.c linux-3.0.9/arch/x86/kernel/vsyscall_64.c
---- linux-3.0.9/arch/x86/kernel/vsyscall_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/vsyscall_64.c	2011-11-15 20:02:59.000000000 -0500
-@@ -53,7 +53,7 @@ DEFINE_VVAR(int, vgetcpu_mode);
- DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
- {
+diff -urNp linux-3.1.1/arch/x86/kernel/vsyscall_64.c linux-3.1.1/arch/x86/kernel/vsyscall_64.c
+--- linux-3.1.1/arch/x86/kernel/vsyscall_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/vsyscall_64.c	2011-11-16 18:39:07.000000000 -0500
+@@ -56,15 +56,13 @@ DEFINE_VVAR(struct vsyscall_gtod_data, v
  	.lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
--	.sysctl_enabled = 1,
-+	.sysctl_enabled = 0,
  };
  
- void update_vsyscall_tz(void)
-@@ -231,7 +231,7 @@ static long __vsyscall(3) venosys_1(void
- static ctl_table kernel_table2[] = {
- 	{ .procname = "vsyscall64",
- 	  .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int),
--	  .mode = 0644,
-+	  .mode = 0444,
- 	  .proc_handler = proc_dointvec },
- 	{}
- };
-diff -urNp linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c
---- linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c	2011-11-15 20:02:59.000000000 -0500
+-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE;
++static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
+ 
+ static int __init vsyscall_setup(char *str)
+ {
+ 	if (str) {
+ 		if (!strcmp("emulate", str))
+ 			vsyscall_mode = EMULATE;
+-		else if (!strcmp("native", str))
+-			vsyscall_mode = NATIVE;
+ 		else if (!strcmp("none", str))
+ 			vsyscall_mode = NONE;
+ 		else
+@@ -177,7 +175,7 @@ bool emulate_vsyscall(struct pt_regs *re
+ 
+ 	tsk = current;
+ 	if (seccomp_mode(&tsk->seccomp))
+-		do_exit(SIGKILL);
++		do_group_exit(SIGKILL);
+ 
+ 	switch (vsyscall_nr) {
+ 	case 0:
+@@ -219,8 +217,7 @@ bool emulate_vsyscall(struct pt_regs *re
+ 	return true;
+ 
+ sigsegv:
+-	force_sig(SIGSEGV, current);
+-	return true;
++	do_group_exit(SIGKILL);
+ }
+ 
+ /*
+@@ -273,10 +270,7 @@ void __init map_vsyscall(void)
+ 	extern char __vvar_page;
+ 	unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
+ 
+-	__set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
+-		     vsyscall_mode == NATIVE
+-		     ? PAGE_KERNEL_VSYSCALL
+-		     : PAGE_KERNEL_VVAR);
++	__set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
+ 	BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
+ 		     (unsigned long)VSYSCALL_START);
+ 
+diff -urNp linux-3.1.1/arch/x86/kernel/x8664_ksyms_64.c linux-3.1.1/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-3.1.1/arch/x86/kernel/x8664_ksyms_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/x8664_ksyms_64.c	2011-11-16 18:39:07.000000000 -0500
 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
  EXPORT_SYMBOL(copy_user_generic_string);
  EXPORT_SYMBOL(copy_user_generic_unrolled);
@@ -16794,9 +16882,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.9/arch/x86/ker
  
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(clear_page);
-diff -urNp linux-3.0.9/arch/x86/kernel/xsave.c linux-3.0.9/arch/x86/kernel/xsave.c
---- linux-3.0.9/arch/x86/kernel/xsave.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/xsave.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kernel/xsave.c linux-3.1.1/arch/x86/kernel/xsave.c
+--- linux-3.1.1/arch/x86/kernel/xsave.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/xsave.c	2011-11-16 18:39:07.000000000 -0500
 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
  	    fx_sw_user->xstate_size > fx_sw_user->extended_size)
  		return -EINVAL;
@@ -16824,9 +16912,9 @@ diff -urNp linux-3.0.9/arch/x86/kernel/xsave.c linux-3.0.9/arch/x86/kernel/xsave
  				       buf);
  	if (unlikely(err)) {
  		/*
-diff -urNp linux-3.0.9/arch/x86/kvm/emulate.c linux-3.0.9/arch/x86/kvm/emulate.c
---- linux-3.0.9/arch/x86/kvm/emulate.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/emulate.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kvm/emulate.c linux-3.1.1/arch/x86/kvm/emulate.c
+--- linux-3.1.1/arch/x86/kvm/emulate.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/emulate.c	2011-11-16 18:39:07.000000000 -0500
 @@ -96,7 +96,7 @@
  #define Src2ImmByte (2<<29)
  #define Src2One     (3<<29)
@@ -16861,9 +16949,9 @@ diff -urNp linux-3.0.9/arch/x86/kvm/emulate.c linux-3.0.9/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.9/arch/x86/kvm/lapic.c linux-3.0.9/arch/x86/kvm/lapic.c
---- linux-3.0.9/arch/x86/kvm/lapic.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/lapic.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/kvm/lapic.c linux-3.1.1/arch/x86/kvm/lapic.c
+--- linux-3.1.1/arch/x86/kvm/lapic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/lapic.c	2011-11-16 18:39:07.000000000 -0500
 @@ -53,7 +53,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
@@ -16873,10 +16961,10 @@ diff -urNp linux-3.0.9/arch/x86/kvm/lapic.c linux-3.0.9/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.9/arch/x86/kvm/mmu.c linux-3.0.9/arch/x86/kvm/mmu.c
---- linux-3.0.9/arch/x86/kvm/mmu.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/mmu.c	2011-11-15 20:02:59.000000000 -0500
-@@ -3238,7 +3238,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
+diff -urNp linux-3.1.1/arch/x86/kvm/mmu.c linux-3.1.1/arch/x86/kvm/mmu.c
+--- linux-3.1.1/arch/x86/kvm/mmu.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/mmu.c	2011-11-16 18:39:07.000000000 -0500
+@@ -3552,7 +3552,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
  
  	pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
  
@@ -16885,7 +16973,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/mmu.c linux-3.0.9/arch/x86/kvm/mmu.c
  
  	/*
  	 * Assume that the pte write on a page table of the same type
-@@ -3270,7 +3270,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
+@@ -3584,7 +3584,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
  	}
  
  	spin_lock(&vcpu->kvm->mmu_lock);
@@ -16894,19 +16982,19 @@ diff -urNp linux-3.0.9/arch/x86/kvm/mmu.c linux-3.0.9/arch/x86/kvm/mmu.c
  		gentry = 0;
  	kvm_mmu_free_some_pages(vcpu);
  	++vcpu->kvm->stat.mmu_pte_write;
-diff -urNp linux-3.0.9/arch/x86/kvm/paging_tmpl.h linux-3.0.9/arch/x86/kvm/paging_tmpl.h
---- linux-3.0.9/arch/x86/kvm/paging_tmpl.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/paging_tmpl.h	2011-11-15 20:02:59.000000000 -0500
-@@ -182,7 +182,7 @@ walk:
- 			break;
- 		}
+diff -urNp linux-3.1.1/arch/x86/kvm/paging_tmpl.h linux-3.1.1/arch/x86/kvm/paging_tmpl.h
+--- linux-3.1.1/arch/x86/kvm/paging_tmpl.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/paging_tmpl.h	2011-11-16 19:40:44.000000000 -0500
+@@ -197,7 +197,7 @@ retry_walk:
+ 		if (unlikely(kvm_is_error_hva(host_addr)))
+ 			goto error;
  
 -		ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
 +		ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
- 		if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte)))) {
- 			present = false;
- 			break;
-@@ -583,6 +583,8 @@ static int FNAME(page_fault)(struct kvm_
+ 		if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
+ 			goto error;
+ 
+@@ -575,6 +575,8 @@ static int FNAME(page_fault)(struct kvm_
  	unsigned long mmu_seq;
  	bool map_writable;
  
@@ -16914,8 +17002,8 @@ diff -urNp linux-3.0.9/arch/x86/kvm/paging_tmpl.h linux-3.0.9/arch/x86/kvm/pagin
 +
  	pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code);
  
- 	r = mmu_topup_memory_caches(vcpu);
-@@ -703,7 +705,7 @@ static void FNAME(invlpg)(struct kvm_vcp
+ 	if (unlikely(error_code & PFERR_RSVD_MASK))
+@@ -701,7 +703,7 @@ static void FNAME(invlpg)(struct kvm_vcp
  	if (need_flush)
  		kvm_flush_remote_tlbs(vcpu->kvm);
  
@@ -16924,10 +17012,10 @@ diff -urNp linux-3.0.9/arch/x86/kvm/paging_tmpl.h linux-3.0.9/arch/x86/kvm/pagin
  
  	spin_unlock(&vcpu->kvm->mmu_lock);
  
-diff -urNp linux-3.0.9/arch/x86/kvm/svm.c linux-3.0.9/arch/x86/kvm/svm.c
---- linux-3.0.9/arch/x86/kvm/svm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/svm.c	2011-11-15 20:02:59.000000000 -0500
-@@ -3377,7 +3377,11 @@ static void reload_tss(struct kvm_vcpu *
+diff -urNp linux-3.1.1/arch/x86/kvm/svm.c linux-3.1.1/arch/x86/kvm/svm.c
+--- linux-3.1.1/arch/x86/kvm/svm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/svm.c	2011-11-16 18:39:07.000000000 -0500
+@@ -3381,7 +3381,11 @@ static void reload_tss(struct kvm_vcpu *
  	int cpu = raw_smp_processor_id();
  
  	struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
@@ -16939,7 +17027,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/svm.c linux-3.0.9/arch/x86/kvm/svm.c
  	load_TR_desc();
  }
  
-@@ -3755,6 +3759,10 @@ static void svm_vcpu_run(struct kvm_vcpu
+@@ -3759,6 +3763,10 @@ static void svm_vcpu_run(struct kvm_vcpu
  #endif
  #endif
  
@@ -16950,10 +17038,10 @@ diff -urNp linux-3.0.9/arch/x86/kvm/svm.c linux-3.0.9/arch/x86/kvm/svm.c
  	reload_tss(vcpu);
  
  	local_irq_disable();
-diff -urNp linux-3.0.9/arch/x86/kvm/vmx.c linux-3.0.9/arch/x86/kvm/vmx.c
---- linux-3.0.9/arch/x86/kvm/vmx.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/vmx.c	2011-11-15 20:02:59.000000000 -0500
-@@ -797,7 +797,11 @@ static void reload_tss(void)
+diff -urNp linux-3.1.1/arch/x86/kvm/vmx.c linux-3.1.1/arch/x86/kvm/vmx.c
+--- linux-3.1.1/arch/x86/kvm/vmx.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/vmx.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1251,7 +1251,11 @@ static void reload_tss(void)
  	struct desc_struct *descs;
  
  	descs = (void *)gdt->address;
@@ -16965,7 +17053,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/vmx.c linux-3.0.9/arch/x86/kvm/vmx.c
  	load_TR_desc();
  }
  
-@@ -1747,8 +1751,11 @@ static __init int hardware_setup(void)
+@@ -2520,8 +2524,11 @@ static __init int hardware_setup(void)
  	if (!cpu_has_vmx_flexpriority())
  		flexpriority_enabled = 0;
  
@@ -16979,16 +17067,16 @@ diff -urNp linux-3.0.9/arch/x86/kvm/vmx.c linux-3.0.9/arch/x86/kvm/vmx.c
  
  	if (enable_ept && !cpu_has_vmx_ept_2m_page())
  		kvm_disable_largepages();
-@@ -2814,7 +2821,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
+@@ -3535,7 +3542,7 @@ static void vmx_set_constant_host_state(
  	vmcs_writel(HOST_IDTR_BASE, dt.address);   /* 22.2.4 */
  
- 	asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return));
--	vmcs_writel(HOST_RIP, kvm_vmx_return); /* 22.2.5 */
-+	vmcs_writel(HOST_RIP, ktla_ktva(kvm_vmx_return)); /* 22.2.5 */
- 	vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0);
- 	vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0);
- 	vmcs_write64(VM_EXIT_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.host));
-@@ -4211,6 +4218,12 @@ static void __noclone vmx_vcpu_run(struc
+ 	asm("mov $.Lkvm_vmx_return, %0" : "=r"(tmpl));
+-	vmcs_writel(HOST_RIP, tmpl); /* 22.2.5 */
++	vmcs_writel(HOST_RIP, ktla_ktva(tmpl)); /* 22.2.5 */
+ 
+ 	rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
+ 	vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
+@@ -6021,6 +6028,12 @@ static void __noclone vmx_vcpu_run(struc
  		"jmp .Lkvm_vmx_return \n\t"
  		".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
  		".Lkvm_vmx_return: "
@@ -17001,7 +17089,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/vmx.c linux-3.0.9/arch/x86/kvm/vmx.c
  		/* Save guest registers, load host registers, keep flags */
  		"mov %0, %c[wordsize](%%"R"sp) \n\t"
  		"pop %0 \n\t"
-@@ -4259,6 +4272,11 @@ static void __noclone vmx_vcpu_run(struc
+@@ -6069,6 +6082,11 @@ static void __noclone vmx_vcpu_run(struc
  #endif
  		[cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
  		[wordsize]"i"(sizeof(ulong))
@@ -17013,9 +17101,9 @@ diff -urNp linux-3.0.9/arch/x86/kvm/vmx.c linux-3.0.9/arch/x86/kvm/vmx.c
  	      : "cc", "memory"
  		, R"ax", R"bx", R"di", R"si"
  #ifdef CONFIG_X86_64
-@@ -4276,7 +4294,16 @@ static void __noclone vmx_vcpu_run(struc
- 
- 	vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);
+@@ -6097,7 +6115,16 @@ static void __noclone vmx_vcpu_run(struc
+ 		}
+ 	}
  
 -	asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
 +	asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
@@ -17028,13 +17116,13 @@ diff -urNp linux-3.0.9/arch/x86/kvm/vmx.c linux-3.0.9/arch/x86/kvm/vmx.c
 +	__set_fs(current_thread_info()->addr_limit);
 +#endif
 +
- 	vmx->launched = 1;
+ 	vmx->loaded_vmcs->launched = 1;
  
  	vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
-diff -urNp linux-3.0.9/arch/x86/kvm/x86.c linux-3.0.9/arch/x86/kvm/x86.c
---- linux-3.0.9/arch/x86/kvm/x86.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/x86.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1313,8 +1313,8 @@ static int xen_hvm_config(struct kvm_vcp
+diff -urNp linux-3.1.1/arch/x86/kvm/x86.c linux-3.1.1/arch/x86/kvm/x86.c
+--- linux-3.1.1/arch/x86/kvm/x86.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/x86.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1334,8 +1334,8 @@ static int xen_hvm_config(struct kvm_vcp
  {
  	struct kvm *kvm = vcpu->kvm;
  	int lm = is_long_mode(vcpu);
@@ -17045,7 +17133,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/x86.c linux-3.0.9/arch/x86/kvm/x86.c
  	u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
  		: kvm->arch.xen_hvm_config.blob_size_32;
  	u32 page_num = data & ~PAGE_MASK;
-@@ -2057,6 +2057,8 @@ long kvm_arch_dev_ioctl(struct file *fil
+@@ -2137,6 +2137,8 @@ long kvm_arch_dev_ioctl(struct file *fil
  		if (n < msr_list.nmsrs)
  			goto out;
  		r = -EFAULT;
@@ -17054,7 +17142,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/x86.c linux-3.0.9/arch/x86/kvm/x86.c
  		if (copy_to_user(user_msr_list->indices, &msrs_to_save,
  				 num_msrs_to_save * sizeof(u32)))
  			goto out;
-@@ -2229,15 +2231,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str
+@@ -2312,15 +2314,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str
  				     struct kvm_cpuid2 *cpuid,
  				     struct kvm_cpuid_entry2 __user *entries)
  {
@@ -17078,7 +17166,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/x86.c linux-3.0.9/arch/x86/kvm/x86.c
  	vcpu->arch.cpuid_nent = cpuid->nent;
  	kvm_apic_set_version(vcpu);
  	kvm_x86_ops->cpuid_update(vcpu);
-@@ -2252,15 +2259,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(str
+@@ -2335,15 +2342,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(str
  				     struct kvm_cpuid2 *cpuid,
  				     struct kvm_cpuid_entry2 __user *entries)
  {
@@ -17101,7 +17189,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/x86.c linux-3.0.9/arch/x86/kvm/x86.c
  	return 0;
  
  out:
-@@ -2579,7 +2590,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
+@@ -2718,7 +2729,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
  static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
  				    struct kvm_interrupt *irq)
  {
@@ -17110,19 +17198,19 @@ diff -urNp linux-3.0.9/arch/x86/kvm/x86.c linux-3.0.9/arch/x86/kvm/x86.c
  		return -EINVAL;
  	if (irqchip_in_kernel(vcpu->kvm))
  		return -ENXIO;
-@@ -4878,7 +4889,7 @@ void kvm_after_handle_nmi(struct kvm_vcp
+@@ -5089,7 +5100,7 @@ static void kvm_set_mmio_spte_mask(void)
+ 	kvm_mmu_set_mmio_spte_mask(mask);
  }
- EXPORT_SYMBOL_GPL(kvm_after_handle_nmi);
  
 -int kvm_arch_init(void *opaque)
 +int kvm_arch_init(const void *opaque)
  {
  	int r;
  	struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
-diff -urNp linux-3.0.9/arch/x86/lguest/boot.c linux-3.0.9/arch/x86/lguest/boot.c
---- linux-3.0.9/arch/x86/lguest/boot.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lguest/boot.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1176,9 +1176,10 @@ static __init int early_put_chars(u32 vt
+diff -urNp linux-3.1.1/arch/x86/lguest/boot.c linux-3.1.1/arch/x86/lguest/boot.c
+--- linux-3.1.1/arch/x86/lguest/boot.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lguest/boot.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1184,9 +1184,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.
   */
@@ -17134,9 +17222,9 @@ diff -urNp linux-3.0.9/arch/x86/lguest/boot.c linux-3.0.9/arch/x86/lguest/boot.c
  }
  
  /*G:050
-diff -urNp linux-3.0.9/arch/x86/lib/atomic64_32.c linux-3.0.9/arch/x86/lib/atomic64_32.c
---- linux-3.0.9/arch/x86/lib/atomic64_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/atomic64_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/atomic64_32.c linux-3.1.1/arch/x86/lib/atomic64_32.c
+--- linux-3.1.1/arch/x86/lib/atomic64_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/atomic64_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -8,18 +8,30 @@
  
  long long atomic64_read_cx8(long long, const atomic64_t *v);
@@ -17215,9 +17303,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/atomic64_32.c linux-3.0.9/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.9/arch/x86/lib/atomic64_386_32.S linux-3.0.9/arch/x86/lib/atomic64_386_32.S
---- linux-3.0.9/arch/x86/lib/atomic64_386_32.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/atomic64_386_32.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/atomic64_386_32.S linux-3.1.1/arch/x86/lib/atomic64_386_32.S
+--- linux-3.1.1/arch/x86/lib/atomic64_386_32.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/atomic64_386_32.S	2011-11-16 18:39:07.000000000 -0500
 @@ -48,6 +48,10 @@ BEGIN(read)
  	movl  (v), %eax
  	movl 4(v), %edx
@@ -17473,9 +17561,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/atomic64_386_32.S linux-3.0.9/arch/x86/lib/a
  	js 1f
  	movl %eax,  (v)
  	movl %edx, 4(v)
-diff -urNp linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S
---- linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/atomic64_cx8_32.S linux-3.1.1/arch/x86/lib/atomic64_cx8_32.S
+--- linux-3.1.1/arch/x86/lib/atomic64_cx8_32.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/atomic64_cx8_32.S	2011-11-16 18:39:07.000000000 -0500
 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
  	CFI_STARTPROC
  
@@ -17697,9 +17785,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S linux-3.0.9/arch/x86/lib/a
  	ret
  4:
  	testl %edx, %edx
-diff -urNp linux-3.0.9/arch/x86/lib/checksum_32.S linux-3.0.9/arch/x86/lib/checksum_32.S
---- linux-3.0.9/arch/x86/lib/checksum_32.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/checksum_32.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/checksum_32.S linux-3.1.1/arch/x86/lib/checksum_32.S
+--- linux-3.1.1/arch/x86/lib/checksum_32.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/checksum_32.S	2011-11-16 18:39:07.000000000 -0500
 @@ -28,7 +28,8 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -17944,9 +18032,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/checksum_32.S linux-3.0.9/arch/x86/lib/check
  				
  #undef ROUND
  #undef ROUND1		
-diff -urNp linux-3.0.9/arch/x86/lib/clear_page_64.S linux-3.0.9/arch/x86/lib/clear_page_64.S
---- linux-3.0.9/arch/x86/lib/clear_page_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/clear_page_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/clear_page_64.S linux-3.1.1/arch/x86/lib/clear_page_64.S
+--- linux-3.1.1/arch/x86/lib/clear_page_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/clear_page_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -11,6 +11,7 @@ ENTRY(clear_page_c)
  	movl $4096/8,%ecx
  	xorl %eax,%eax
@@ -17980,9 +18068,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/clear_page_64.S linux-3.0.9/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.9/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S
---- linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/cmpxchg16b_emu.S linux-3.1.1/arch/x86/lib/cmpxchg16b_emu.S
+--- linux-3.1.1/arch/x86/lib/cmpxchg16b_emu.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/cmpxchg16b_emu.S	2011-11-16 18:39:07.000000000 -0500
 @@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
  
  	popf
@@ -17997,17 +18085,10 @@ diff -urNp linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.9/arch/x86/lib/cm
  	ret
  
  CFI_ENDPROC
-diff -urNp linux-3.0.9/arch/x86/lib/copy_page_64.S linux-3.0.9/arch/x86/lib/copy_page_64.S
---- linux-3.0.9/arch/x86/lib/copy_page_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/copy_page_64.S	2011-11-15 20:02:59.000000000 -0500
-@@ -2,12 +2,14 @@
- 
- #include <linux/linkage.h>
- #include <asm/dwarf2.h>
-+#include <asm/alternative-asm.h>
- 
- 	ALIGN
- copy_page_c:
+diff -urNp linux-3.1.1/arch/x86/lib/copy_page_64.S linux-3.1.1/arch/x86/lib/copy_page_64.S
+--- linux-3.1.1/arch/x86/lib/copy_page_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/copy_page_64.S	2011-11-16 18:39:07.000000000 -0500
+@@ -9,6 +9,7 @@ copy_page_c:
  	CFI_STARTPROC
  	movl $4096/8,%ecx
  	rep movsq
@@ -18015,7 +18096,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/copy_page_64.S linux-3.0.9/arch/x86/lib/copy
  	ret
  	CFI_ENDPROC
  ENDPROC(copy_page_c)
-@@ -94,6 +96,7 @@ ENTRY(copy_page)
+@@ -95,6 +96,7 @@ ENTRY(copy_page)
  	CFI_RESTORE r13
  	addq	$3*8,%rsp
  	CFI_ADJUST_CFA_OFFSET -3*8
@@ -18023,7 +18104,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/copy_page_64.S linux-3.0.9/arch/x86/lib/copy
  	ret
  .Lcopy_page_end:
  	CFI_ENDPROC
-@@ -104,7 +107,7 @@ ENDPROC(copy_page)
+@@ -105,7 +107,7 @@ ENDPROC(copy_page)
  
  #include <asm/cpufeature.h>
  
@@ -18032,9 +18113,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/copy_page_64.S linux-3.0.9/arch/x86/lib/copy
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (copy_page_c - copy_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-3.0.9/arch/x86/lib/copy_user_64.S linux-3.0.9/arch/x86/lib/copy_user_64.S
---- linux-3.0.9/arch/x86/lib/copy_user_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/copy_user_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/copy_user_64.S linux-3.1.1/arch/x86/lib/copy_user_64.S
+--- linux-3.1.1/arch/x86/lib/copy_user_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/copy_user_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -16,6 +16,7 @@
  #include <asm/thread_info.h>
  #include <asm/cpufeature.h>
@@ -18127,9 +18208,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/copy_user_64.S linux-3.0.9/arch/x86/lib/copy
  	ret
  
  	.section .fixup,"ax"
-diff -urNp linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S
---- linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/copy_user_nocache_64.S linux-3.1.1/arch/x86/lib/copy_user_nocache_64.S
+--- linux-3.1.1/arch/x86/lib/copy_user_nocache_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/copy_user_nocache_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -8,12 +8,14 @@
  
  #include <linux/linkage.h>
@@ -18169,9 +18250,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S linux-3.0.9/arch/x86/
  	ret
  
  	.section .fixup,"ax"
-diff -urNp linux-3.0.9/arch/x86/lib/csum-copy_64.S linux-3.0.9/arch/x86/lib/csum-copy_64.S
---- linux-3.0.9/arch/x86/lib/csum-copy_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/csum-copy_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/csum-copy_64.S linux-3.1.1/arch/x86/lib/csum-copy_64.S
+--- linux-3.1.1/arch/x86/lib/csum-copy_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/csum-copy_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -8,6 +8,7 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -18188,9 +18269,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/csum-copy_64.S linux-3.0.9/arch/x86/lib/csum
  	ret
  	CFI_RESTORE_STATE
  
-diff -urNp linux-3.0.9/arch/x86/lib/csum-wrappers_64.c linux-3.0.9/arch/x86/lib/csum-wrappers_64.c
---- linux-3.0.9/arch/x86/lib/csum-wrappers_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/csum-wrappers_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/csum-wrappers_64.c linux-3.1.1/arch/x86/lib/csum-wrappers_64.c
+--- linux-3.1.1/arch/x86/lib/csum-wrappers_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/csum-wrappers_64.c	2011-11-16 18:39:07.000000000 -0500
 @@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void _
  			len -= 2;
  		}
@@ -18221,9 +18302,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/csum-wrappers_64.c linux-3.0.9/arch/x86/lib/
  					 len, isum, NULL, errp);
  }
  EXPORT_SYMBOL(csum_partial_copy_to_user);
-diff -urNp linux-3.0.9/arch/x86/lib/getuser.S linux-3.0.9/arch/x86/lib/getuser.S
---- linux-3.0.9/arch/x86/lib/getuser.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/getuser.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/getuser.S linux-3.1.1/arch/x86/lib/getuser.S
+--- linux-3.1.1/arch/x86/lib/getuser.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/getuser.S	2011-11-16 18:39:07.000000000 -0500
 @@ -33,15 +33,38 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -18347,9 +18428,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/getuser.S linux-3.0.9/arch/x86/lib/getuser.S
  	ret
  	CFI_ENDPROC
  END(bad_get_user)
-diff -urNp linux-3.0.9/arch/x86/lib/insn.c linux-3.0.9/arch/x86/lib/insn.c
---- linux-3.0.9/arch/x86/lib/insn.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/insn.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/insn.c linux-3.1.1/arch/x86/lib/insn.c
+--- linux-3.1.1/arch/x86/lib/insn.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/insn.c	2011-11-16 18:39:07.000000000 -0500
 @@ -21,6 +21,11 @@
  #include <linux/string.h>
  #include <asm/inat.h>
@@ -18373,9 +18454,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/insn.c linux-3.0.9/arch/x86/lib/insn.c
  	insn->x86_64 = x86_64 ? 1 : 0;
  	insn->opnd_bytes = 4;
  	if (x86_64)
-diff -urNp linux-3.0.9/arch/x86/lib/iomap_copy_64.S linux-3.0.9/arch/x86/lib/iomap_copy_64.S
---- linux-3.0.9/arch/x86/lib/iomap_copy_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/iomap_copy_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/iomap_copy_64.S linux-3.1.1/arch/x86/lib/iomap_copy_64.S
+--- linux-3.1.1/arch/x86/lib/iomap_copy_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/iomap_copy_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -17,6 +17,7 @@
  
  #include <linux/linkage.h>
@@ -18392,9 +18473,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/iomap_copy_64.S linux-3.0.9/arch/x86/lib/iom
  	ret
  	CFI_ENDPROC
  ENDPROC(__iowrite32_copy)
-diff -urNp linux-3.0.9/arch/x86/lib/memcpy_64.S linux-3.0.9/arch/x86/lib/memcpy_64.S
---- linux-3.0.9/arch/x86/lib/memcpy_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/memcpy_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/memcpy_64.S linux-3.1.1/arch/x86/lib/memcpy_64.S
+--- linux-3.1.1/arch/x86/lib/memcpy_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/memcpy_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -34,6 +34,7 @@
  	rep movsq
  	movl %edx, %ecx
@@ -18443,18 +18524,10 @@ diff -urNp linux-3.0.9/arch/x86/lib/memcpy_64.S linux-3.0.9/arch/x86/lib/memcpy_
  	retq
  	CFI_ENDPROC
  ENDPROC(memcpy)
-diff -urNp linux-3.0.9/arch/x86/lib/memmove_64.S linux-3.0.9/arch/x86/lib/memmove_64.S
---- linux-3.0.9/arch/x86/lib/memmove_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/memmove_64.S	2011-11-15 20:02:59.000000000 -0500
-@@ -9,6 +9,7 @@
- #include <linux/linkage.h>
- #include <asm/dwarf2.h>
- #include <asm/cpufeature.h>
-+#include <asm/alternative-asm.h>
- 
- #undef memmove
- 
-@@ -201,6 +202,7 @@ ENTRY(memmove)
+diff -urNp linux-3.1.1/arch/x86/lib/memmove_64.S linux-3.1.1/arch/x86/lib/memmove_64.S
+--- linux-3.1.1/arch/x86/lib/memmove_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/memmove_64.S	2011-11-16 18:39:07.000000000 -0500
+@@ -202,6 +202,7 @@ ENTRY(memmove)
  	movb (%rsi), %r11b
  	movb %r11b, (%rdi)
  13:
@@ -18462,7 +18535,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/memmove_64.S linux-3.0.9/arch/x86/lib/memmov
  	retq
  	CFI_ENDPROC
  
-@@ -209,6 +211,7 @@ ENTRY(memmove)
+@@ -210,6 +211,7 @@ ENTRY(memmove)
  	/* Forward moving data. */
  	movq %rdx, %rcx
  	rep movsb
@@ -18470,9 +18543,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/memmove_64.S linux-3.0.9/arch/x86/lib/memmov
  	retq
  .Lmemmove_end_forward_efs:
  	.previous
-diff -urNp linux-3.0.9/arch/x86/lib/memset_64.S linux-3.0.9/arch/x86/lib/memset_64.S
---- linux-3.0.9/arch/x86/lib/memset_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/memset_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/memset_64.S linux-3.1.1/arch/x86/lib/memset_64.S
+--- linux-3.1.1/arch/x86/lib/memset_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/memset_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -31,6 +31,7 @@
  	movl %r8d,%ecx
  	rep stosb
@@ -18497,9 +18570,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/memset_64.S linux-3.0.9/arch/x86/lib/memset_
  	ret
  
  	CFI_RESTORE_STATE
-diff -urNp linux-3.0.9/arch/x86/lib/mmx_32.c linux-3.0.9/arch/x86/lib/mmx_32.c
---- linux-3.0.9/arch/x86/lib/mmx_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/mmx_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/mmx_32.c linux-3.1.1/arch/x86/lib/mmx_32.c
+--- linux-3.1.1/arch/x86/lib/mmx_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/mmx_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
  {
  	void *p;
@@ -18815,9 +18888,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/mmx_32.c linux-3.0.9/arch/x86/lib/mmx_32.c
  
  		from += 64;
  		to += 64;
-diff -urNp linux-3.0.9/arch/x86/lib/msr-reg.S linux-3.0.9/arch/x86/lib/msr-reg.S
---- linux-3.0.9/arch/x86/lib/msr-reg.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/msr-reg.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/msr-reg.S linux-3.1.1/arch/x86/lib/msr-reg.S
+--- linux-3.1.1/arch/x86/lib/msr-reg.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/msr-reg.S	2011-11-16 18:39:07.000000000 -0500
 @@ -3,6 +3,7 @@
  #include <asm/dwarf2.h>
  #include <asm/asm.h>
@@ -18834,9 +18907,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/msr-reg.S linux-3.0.9/arch/x86/lib/msr-reg.S
  	ret
  3:
  	CFI_RESTORE_STATE
-diff -urNp linux-3.0.9/arch/x86/lib/putuser.S linux-3.0.9/arch/x86/lib/putuser.S
---- linux-3.0.9/arch/x86/lib/putuser.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/putuser.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/putuser.S linux-3.1.1/arch/x86/lib/putuser.S
+--- linux-3.1.1/arch/x86/lib/putuser.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/putuser.S	2011-11-16 18:39:07.000000000 -0500
 @@ -15,7 +15,9 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
@@ -18976,37 +19049,37 @@ diff -urNp linux-3.0.9/arch/x86/lib/putuser.S linux-3.0.9/arch/x86/lib/putuser.S
  #endif
  	xor %eax,%eax
  	EXIT
-diff -urNp linux-3.0.9/arch/x86/lib/rwlock_64.S linux-3.0.9/arch/x86/lib/rwlock_64.S
---- linux-3.0.9/arch/x86/lib/rwlock_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/rwlock_64.S	2011-11-15 20:02:59.000000000 -0500
-@@ -17,6 +17,7 @@ ENTRY(__write_lock_failed)
- 	LOCK_PREFIX
- 	subl $RW_LOCK_BIAS,(%rdi)
- 	jnz  __write_lock_failed
+diff -urNp linux-3.1.1/arch/x86/lib/rwlock.S linux-3.1.1/arch/x86/lib/rwlock.S
+--- linux-3.1.1/arch/x86/lib/rwlock.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/rwlock.S	2011-11-16 18:39:07.000000000 -0500
+@@ -23,6 +23,7 @@ ENTRY(__write_lock_failed)
+ 	WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
+ 	jnz	0b
+ 	ENDFRAME
 +	pax_force_retaddr
  	ret
  	CFI_ENDPROC
  END(__write_lock_failed)
-@@ -33,6 +34,7 @@ ENTRY(__read_lock_failed)
- 	LOCK_PREFIX
- 	decl (%rdi)
- 	js __read_lock_failed
+@@ -39,6 +40,7 @@ ENTRY(__read_lock_failed)
+ 	READ_LOCK_SIZE(dec) (%__lock_ptr)
+ 	js	0b
+ 	ENDFRAME
 +	pax_force_retaddr
  	ret
  	CFI_ENDPROC
  END(__read_lock_failed)
-diff -urNp linux-3.0.9/arch/x86/lib/rwsem_64.S linux-3.0.9/arch/x86/lib/rwsem_64.S
---- linux-3.0.9/arch/x86/lib/rwsem_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/rwsem_64.S	2011-11-15 20:02:59.000000000 -0500
-@@ -51,6 +51,7 @@ ENTRY(call_rwsem_down_read_failed)
- 	popq_cfi %rdx
- 	CFI_RESTORE rdx
+diff -urNp linux-3.1.1/arch/x86/lib/rwsem.S linux-3.1.1/arch/x86/lib/rwsem.S
+--- linux-3.1.1/arch/x86/lib/rwsem.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/rwsem.S	2011-11-16 18:39:07.000000000 -0500
+@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
+ 	__ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
+ 	CFI_RESTORE __ASM_REG(dx)
  	restore_common_regs
 +	pax_force_retaddr
  	ret
  	CFI_ENDPROC
  ENDPROC(call_rwsem_down_read_failed)
-@@ -61,6 +62,7 @@ ENTRY(call_rwsem_down_write_failed)
+@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
  	movq %rax,%rdi
  	call rwsem_down_write_failed
  	restore_common_regs
@@ -19014,7 +19087,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/rwsem_64.S linux-3.0.9/arch/x86/lib/rwsem_64
  	ret
  	CFI_ENDPROC
  ENDPROC(call_rwsem_down_write_failed)
-@@ -73,7 +75,8 @@ ENTRY(call_rwsem_wake)
+@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
  	movq %rax,%rdi
  	call rwsem_wake
  	restore_common_regs
@@ -19024,38 +19097,35 @@ diff -urNp linux-3.0.9/arch/x86/lib/rwsem_64.S linux-3.0.9/arch/x86/lib/rwsem_64
  	CFI_ENDPROC
  ENDPROC(call_rwsem_wake)
  
-@@ -88,6 +91,7 @@ ENTRY(call_rwsem_downgrade_wake)
- 	popq_cfi %rdx
- 	CFI_RESTORE rdx
+@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
+ 	__ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
+ 	CFI_RESTORE __ASM_REG(dx)
  	restore_common_regs
 +	pax_force_retaddr
  	ret
  	CFI_ENDPROC
  ENDPROC(call_rwsem_downgrade_wake)
-diff -urNp linux-3.0.9/arch/x86/lib/thunk_64.S linux-3.0.9/arch/x86/lib/thunk_64.S
---- linux-3.0.9/arch/x86/lib/thunk_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/thunk_64.S	2011-11-15 20:02:59.000000000 -0500
-@@ -10,7 +10,8 @@
- 	#include <asm/dwarf2.h>
- 	#include <asm/calling.h>			
- 	#include <asm/rwlock.h>
--		
-+	#include <asm/alternative-asm.h>
-+
- 	/* rdi:	arg1 ... normal C conventions. rax is saved/restored. */ 	
- 	.macro thunk name,func
- 	.globl \name
-@@ -50,5 +51,6 @@
+diff -urNp linux-3.1.1/arch/x86/lib/thunk_64.S linux-3.1.1/arch/x86/lib/thunk_64.S
+--- linux-3.1.1/arch/x86/lib/thunk_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/thunk_64.S	2011-11-16 18:39:07.000000000 -0500
+@@ -8,6 +8,7 @@
+ #include <linux/linkage.h>
+ #include <asm/dwarf2.h>
+ #include <asm/calling.h>
++#include <asm/alternative-asm.h>
+ 
+ 	/* rdi:	arg1 ... normal C conventions. rax is saved/restored. */
+ 	.macro THUNK name, func, put_ret_addr_in_rdi=0
+@@ -41,5 +42,6 @@
  	SAVE_ARGS
  restore:
  	RESTORE_ARGS
--	ret	
 +	pax_force_retaddr
-+	ret
+ 	ret
  	CFI_ENDPROC
-diff -urNp linux-3.0.9/arch/x86/lib/usercopy_32.c linux-3.0.9/arch/x86/lib/usercopy_32.c
---- linux-3.0.9/arch/x86/lib/usercopy_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/usercopy_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/usercopy_32.c linux-3.1.1/arch/x86/lib/usercopy_32.c
+--- linux-3.1.1/arch/x86/lib/usercopy_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/usercopy_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -43,7 +43,7 @@ do {									   \
  	__asm__ __volatile__(						   \
  		"	testl %1,%1\n"					   \
@@ -19676,9 +19746,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/usercopy_32.c linux-3.0.9/arch/x86/lib/userc
 +}
 +EXPORT_SYMBOL(set_fs);
 +#endif
-diff -urNp linux-3.0.9/arch/x86/lib/usercopy_64.c linux-3.0.9/arch/x86/lib/usercopy_64.c
---- linux-3.0.9/arch/x86/lib/usercopy_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/usercopy_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/lib/usercopy_64.c linux-3.1.1/arch/x86/lib/usercopy_64.c
+--- linux-3.1.1/arch/x86/lib/usercopy_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/usercopy_64.c	2011-11-16 18:39:07.000000000 -0500
 @@ -42,6 +42,12 @@ long
  __strncpy_from_user(char *dst, const char __user *src, long count)
  {
@@ -19737,9 +19807,9 @@ diff -urNp linux-3.0.9/arch/x86/lib/usercopy_64.c linux-3.0.9/arch/x86/lib/userc
  {
  	char c;
  	unsigned zero_len;
-diff -urNp linux-3.0.9/arch/x86/Makefile linux-3.0.9/arch/x86/Makefile
---- linux-3.0.9/arch/x86/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/Makefile	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/Makefile linux-3.1.1/arch/x86/Makefile
+--- linux-3.1.1/arch/x86/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/Makefile	2011-11-16 18:40:08.000000000 -0500
 @@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y)
  else
          BITS := 64
@@ -19761,9 +19831,9 @@ diff -urNp linux-3.0.9/arch/x86/Makefile linux-3.0.9/arch/x86/Makefile
 +
 +archprepare:
 +	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-3.0.9/arch/x86/mm/extable.c linux-3.0.9/arch/x86/mm/extable.c
---- linux-3.0.9/arch/x86/mm/extable.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/extable.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/extable.c linux-3.1.1/arch/x86/mm/extable.c
+--- linux-3.1.1/arch/x86/mm/extable.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/extable.c	2011-11-16 18:39:07.000000000 -0500
 @@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs
  	const struct exception_table_entry *fixup;
  
@@ -19773,10 +19843,10 @@ diff -urNp linux-3.0.9/arch/x86/mm/extable.c linux-3.0.9/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.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
---- linux-3.0.9/arch/x86/mm/fault.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/fault.c	2011-11-15 20:02:59.000000000 -0500
-@@ -13,10 +13,18 @@
+diff -urNp linux-3.1.1/arch/x86/mm/fault.c linux-3.1.1/arch/x86/mm/fault.c
+--- linux-3.1.1/arch/x86/mm/fault.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/fault.c	2011-11-16 20:43:50.000000000 -0500
+@@ -13,11 +13,18 @@
  #include <linux/perf_event.h>		/* perf_sw_event		*/
  #include <linux/hugetlb.h>		/* hstate_index_to_shift	*/
  #include <linux/prefetch.h>		/* prefetchw			*/
@@ -19786,7 +19856,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  #include <asm/traps.h>			/* dotraplinkage, ...		*/
  #include <asm/pgalloc.h>		/* pgd_*(), ...			*/
  #include <asm/kmemcheck.h>		/* kmemcheck_*(), ...		*/
-+#include <asm/vsyscall.h>
+ #include <asm/vsyscall.h>
 +#include <asm/tlbflush.h>
 +
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
@@ -19795,7 +19865,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  
  /*
   * Page fault error code bits:
-@@ -54,7 +62,7 @@ static inline int __kprobes notify_page_
+@@ -55,7 +62,7 @@ static inline int __kprobes notify_page_
  	int ret = 0;
  
  	/* kprobe_running() needs smp_processor_id() */
@@ -19804,7 +19874,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  		preempt_disable();
  		if (kprobe_running() && kprobe_fault_handler(regs, 14))
  			ret = 1;
-@@ -115,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *re
+@@ -116,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *re
  		return !instr_lo || (instr_lo>>1) == 1;
  	case 0x00:
  		/* Prefetch instruction is 0x0F0D or 0x0F18 */
@@ -19816,7 +19886,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  			return 0;
  
  		*prefetch = (instr_lo == 0xF) &&
-@@ -149,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsign
+@@ -150,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsign
  	while (instr < max_instr) {
  		unsigned char opcode;
  
@@ -19828,10 +19898,14 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  			break;
  
  		instr++;
-@@ -180,6 +194,30 @@ force_sig_info_fault(int si_signo, int s
+@@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int s
  	force_sig_info(si_signo, &info, tsk);
  }
  
++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
++static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
++#endif
++
 +#ifdef CONFIG_PAX_EMUTRAMP
 +static int pax_handle_fetch_fault(struct pt_regs *regs);
 +#endif
@@ -19859,7 +19933,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  DEFINE_SPINLOCK(pgd_lock);
  LIST_HEAD(pgd_list);
  
-@@ -230,10 +268,22 @@ void vmalloc_sync_all(void)
+@@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
  	for (address = VMALLOC_START & PMD_MASK;
  	     address >= TASK_SIZE && address < FIXADDR_TOP;
  	     address += PMD_SIZE) {
@@ -19882,7 +19956,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  			spinlock_t *pgt_lock;
  			pmd_t *ret;
  
-@@ -241,8 +291,13 @@ void vmalloc_sync_all(void)
+@@ -242,8 +295,13 @@ void vmalloc_sync_all(void)
  			pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
  
  			spin_lock(pgt_lock);
@@ -19897,7 +19971,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  
  			if (!ret)
  				break;
-@@ -276,6 +331,11 @@ static noinline __kprobes int vmalloc_fa
+@@ -277,6 +335,11 @@ static noinline __kprobes int vmalloc_fa
  	 * an interrupt in the middle of a task switch..
  	 */
  	pgd_paddr = read_cr3();
@@ -19909,7 +19983,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  	pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
  	if (!pmd_k)
  		return -1;
-@@ -371,7 +431,14 @@ static noinline __kprobes int vmalloc_fa
+@@ -372,7 +435,14 @@ static noinline __kprobes int vmalloc_fa
  	 * happen within a race in page table update. In the later
  	 * case just flush:
  	 */
@@ -19924,7 +19998,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  	pgd_ref = pgd_offset_k(address);
  	if (pgd_none(*pgd_ref))
  		return -1;
-@@ -533,7 +600,7 @@ static int is_errata93(struct pt_regs *r
+@@ -534,7 +604,7 @@ static int is_errata93(struct pt_regs *r
  static int is_errata100(struct pt_regs *regs, unsigned long address)
  {
  #ifdef CONFIG_X86_64
@@ -19933,7 +20007,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  		return 1;
  #endif
  	return 0;
-@@ -560,7 +627,7 @@ static int is_f00f_bug(struct pt_regs *r
+@@ -561,7 +631,7 @@ static int is_f00f_bug(struct pt_regs *r
  }
  
  static const char nx_warning[] = KERN_CRIT
@@ -19942,7 +20016,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  
  static void
  show_fault_oops(struct pt_regs *regs, unsigned long error_code,
-@@ -569,14 +636,25 @@ show_fault_oops(struct pt_regs *regs, un
+@@ -570,14 +640,25 @@ show_fault_oops(struct pt_regs *regs, un
  	if (!oops_may_print())
  		return;
  
@@ -19970,55 +20044,12 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  
  	printk(KERN_ALERT "BUG: unable to handle kernel ");
  	if (address < PAGE_SIZE)
-@@ -702,6 +780,66 @@ __bad_area_nosemaphore(struct pt_regs *r
- 		       unsigned long address, int si_code)
- {
- 	struct task_struct *tsk = current;
-+#if defined(CONFIG_X86_64) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
-+	struct mm_struct *mm = tsk->mm;
-+#endif
-+
-+#ifdef CONFIG_X86_64
-+	if (mm && (error_code & PF_INSTR) && mm->context.vdso) {
-+		if (regs->ip == VSYSCALL_ADDR(__NR_vgettimeofday) ||
-+		    regs->ip == VSYSCALL_ADDR(__NR_vtime) ||
-+		    regs->ip == VSYSCALL_ADDR(__NR_vgetcpu)) {
-+			regs->ip += mm->context.vdso - PAGE_SIZE - VSYSCALL_START;
-+			return;
-+		}
-+	}
-+#endif
-+
+@@ -733,6 +814,21 @@ __bad_area_nosemaphore(struct pt_regs *r
+ 		}
+ #endif
+ 
 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
-+	if (mm && (error_code & PF_USER)) {
-+		unsigned long ip = regs->ip;
-+
-+		if (v8086_mode(regs))
-+			ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
-+
-+		/*
-+		 * It's possible to have interrupts off here:
-+		 */
-+		local_irq_enable();
-+
-+#ifdef CONFIG_PAX_PAGEEXEC
-+		if ((mm->pax_flags & MF_PAX_PAGEEXEC) &&
-+		    (((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) || (!(error_code & (PF_PROT | PF_WRITE)) && ip == address))) {
-+
-+#ifdef CONFIG_PAX_EMUTRAMP
-+			switch (pax_handle_fetch_fault(regs)) {
-+			case 2:
-+				return;
-+			}
-+#endif
-+
-+			pax_report_fault(regs, (void *)ip, (void *)regs->sp);
-+			do_group_exit(SIGKILL);
-+		}
-+#endif
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+		if ((mm->pax_flags & MF_PAX_SEGMEXEC) && !(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address)) {
++		if (pax_is_fetch_fault(regs, error_code, address)) {
 +
 +#ifdef CONFIG_PAX_EMUTRAMP
 +			switch (pax_handle_fetch_fault(regs)) {
@@ -20027,17 +20058,24 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
 +			}
 +#endif
 +
-+			pax_report_fault(regs, (void *)ip, (void *)regs->sp);
++			pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
 +			do_group_exit(SIGKILL);
 +		}
 +#endif
 +
-+	}
-+#endif
+ 		if (unlikely(show_unhandled_signals))
+ 			show_signal_msg(regs, error_code, address, tsk);
  
- 	/* User mode accesses just cause a SIGSEGV */
- 	if (error_code & PF_USER) {
-@@ -871,6 +1009,99 @@ static int spurious_fault_check(unsigned
+@@ -829,7 +925,7 @@ do_sigbus(struct pt_regs *regs, unsigned
+ 	if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
+ 		printk(KERN_ERR
+ 	"MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
+-			tsk->comm, tsk->pid, address);
++			tsk->comm, task_pid_nr(tsk), address);
+ 		code = BUS_MCEERR_AR;
+ 	}
+ #endif
+@@ -884,6 +980,99 @@ static int spurious_fault_check(unsigned
  	return 1;
  }
  
@@ -20137,7 +20175,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  /*
   * Handle a spurious fault caused by a stale TLB entry.
   *
-@@ -943,6 +1174,9 @@ int show_unhandled_signals = 1;
+@@ -956,6 +1145,9 @@ int show_unhandled_signals = 1;
  static inline int
  access_error(unsigned long error_code, struct vm_area_struct *vma)
  {
@@ -20147,7 +20185,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  	if (error_code & PF_WRITE) {
  		/* write, present and write, not present: */
  		if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -976,19 +1210,33 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -989,19 +1181,33 @@ do_page_fault(struct pt_regs *regs, unsi
  {
  	struct vm_area_struct *vma;
  	struct task_struct *tsk;
@@ -20169,7 +20207,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
 +		}
 +		if (address < PAX_USER_SHADOW_BASE) {
 +			printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
-+			printk(KERN_ERR "PAX: faulting IP: %pA\n", (void *)regs->ip);
++			printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
 +			show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
 +		} else
 +			address -= PAX_USER_SHADOW_BASE;
@@ -20185,7 +20223,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  	/*
  	 * Detect and handle instructions that would cause a page fault for
  	 * both a tracked kernel page and a userspace page.
-@@ -1048,7 +1296,7 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1061,7 +1267,7 @@ do_page_fault(struct pt_regs *regs, unsi
  	 * User-mode registers count as a user access even for any
  	 * potential system fault or CPU buglet:
  	 */
@@ -20194,7 +20232,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  		local_irq_enable();
  		error_code |= PF_USER;
  	} else {
-@@ -1103,6 +1351,11 @@ retry:
+@@ -1116,6 +1322,11 @@ retry:
  		might_sleep();
  	}
  
@@ -20206,7 +20244,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  	vma = find_vma(mm, address);
  	if (unlikely(!vma)) {
  		bad_area(regs, error_code, address);
-@@ -1114,18 +1367,24 @@ retry:
+@@ -1127,18 +1338,24 @@ retry:
  		bad_area(regs, error_code, address);
  		return;
  	}
@@ -20242,11 +20280,42 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
  	if (unlikely(expand_stack(vma, address))) {
  		bad_area(regs, error_code, address);
  		return;
-@@ -1180,3 +1439,199 @@ good_area:
+@@ -1193,3 +1410,240 @@ good_area:
  
  	up_read(&mm->mmap_sem);
  }
 +
++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
++static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
++{
++	struct mm_struct *mm = current->mm;
++	unsigned long ip = regs->ip;
++
++	if (v8086_mode(regs))
++		ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
++
++#ifdef CONFIG_PAX_PAGEEXEC
++	if (mm->pax_flags & MF_PAX_PAGEEXEC) {
++		if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
++			return true;
++		if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
++			return true;
++		return false;
++	}
++#endif
++
++#ifdef CONFIG_PAX_SEGMEXEC
++	if (mm->pax_flags & MF_PAX_SEGMEXEC) {
++		if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
++			return true;
++		return false;
++	}
++#endif
++
++	return false;
++}
++#endif
++
 +#ifdef CONFIG_PAX_EMUTRAMP
 +static int pax_handle_fetch_fault_32(struct pt_regs *regs)
 +{
@@ -20388,7 +20457,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
 +#endif
 +
 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	long i;
 +
@@ -20405,14 +20474,24 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
 +	printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
 +	for (i = -1; i < 80 / (long)sizeof(long); i++) {
 +		unsigned long c;
-+		if (get_user(c, (unsigned long __force_user *)sp+i))
++		if (get_user(c, (unsigned long __force_user *)sp+i)) {
 +#ifdef CONFIG_X86_32
 +			printk(KERN_CONT "???????? ");
 +#else
-+			printk(KERN_CONT "???????????????? ");
++			if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
++				printk(KERN_CONT "???????? ???????? ");
++			else
++				printk(KERN_CONT "???????????????? ");
 +#endif
-+		else
-+			printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
++		} else {
++#ifdef CONFIG_X86_64
++			if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
++				printk(KERN_CONT "%08x ", (unsigned int)c);
++				printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
++			} else
++#endif
++				printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
++		}
 +	}
 +	printk("\n");
 +}
@@ -20442,9 +20521,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
 +
 +	return ret ? -EFAULT : 0;
 +}
-diff -urNp linux-3.0.9/arch/x86/mm/gup.c linux-3.0.9/arch/x86/mm/gup.c
---- linux-3.0.9/arch/x86/mm/gup.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/gup.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/gup.c linux-3.1.1/arch/x86/mm/gup.c
+--- linux-3.1.1/arch/x86/mm/gup.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/gup.c	2011-11-16 18:39:07.000000000 -0500
 @@ -253,7 +253,7 @@ int __get_user_pages_fast(unsigned long 
  	addr = start;
  	len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -20454,9 +20533,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/gup.c linux-3.0.9/arch/x86/mm/gup.c
  					(void __user *)start, len)))
  		return 0;
  
-diff -urNp linux-3.0.9/arch/x86/mm/highmem_32.c linux-3.0.9/arch/x86/mm/highmem_32.c
---- linux-3.0.9/arch/x86/mm/highmem_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/highmem_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/highmem_32.c linux-3.1.1/arch/x86/mm/highmem_32.c
+--- linux-3.1.1/arch/x86/mm/highmem_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/highmem_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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);
@@ -20468,9 +20547,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/highmem_32.c linux-3.0.9/arch/x86/mm/highmem_
  
  	return (void *)vaddr;
  }
-diff -urNp linux-3.0.9/arch/x86/mm/hugetlbpage.c linux-3.0.9/arch/x86/mm/hugetlbpage.c
---- linux-3.0.9/arch/x86/mm/hugetlbpage.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/hugetlbpage.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/hugetlbpage.c linux-3.1.1/arch/x86/mm/hugetlbpage.c
+--- linux-3.1.1/arch/x86/mm/hugetlbpage.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/hugetlbpage.c	2011-11-16 18:39:07.000000000 -0500
 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
  	struct hstate *h = hstate_file(file);
  	struct mm_struct *mm = current->mm;
@@ -20678,9 +20757,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/hugetlbpage.c linux-3.0.9/arch/x86/mm/hugetlb
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-3.0.9/arch/x86/mm/init_32.c linux-3.0.9/arch/x86/mm/init_32.c
---- linux-3.0.9/arch/x86/mm/init_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/init_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/init_32.c linux-3.1.1/arch/x86/mm/init_32.c
+--- linux-3.1.1/arch/x86/mm/init_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/init_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
  }
  
@@ -20955,9 +21034,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/init_32.c linux-3.0.9/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.9/arch/x86/mm/init_64.c linux-3.0.9/arch/x86/mm/init_64.c
---- linux-3.0.9/arch/x86/mm/init_64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/init_64.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/init_64.c linux-3.1.1/arch/x86/mm/init_64.c
+--- linux-3.1.1/arch/x86/mm/init_64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/init_64.c	2011-11-16 18:39:07.000000000 -0500
 @@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpa
   * around without checking the pgd every time.
   */
@@ -21087,9 +21166,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/init_64.c linux-3.0.9/arch/x86/mm/init_64.c
  		return "[vdso]";
  	if (vma == &gate_vma)
  		return "[vsyscall]";
-diff -urNp linux-3.0.9/arch/x86/mm/init.c linux-3.0.9/arch/x86/mm/init.c
---- linux-3.0.9/arch/x86/mm/init.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/init.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/init.c linux-3.1.1/arch/x86/mm/init.c
+--- linux-3.1.1/arch/x86/mm/init.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/init.c	2011-11-16 18:40:08.000000000 -0500
 @@ -31,7 +31,7 @@ int direct_gbpages
  static void __init find_early_table_space(unsigned long end, int use_pse,
  					  int use_gbpages)
@@ -21222,9 +21301,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/init.c linux-3.0.9/arch/x86/mm/init.c
  	free_init_pages("unused kernel memory",
  			(unsigned long)(&__init_begin),
  			(unsigned long)(&__init_end));
-diff -urNp linux-3.0.9/arch/x86/mm/iomap_32.c linux-3.0.9/arch/x86/mm/iomap_32.c
---- linux-3.0.9/arch/x86/mm/iomap_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/iomap_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/iomap_32.c linux-3.1.1/arch/x86/mm/iomap_32.c
+--- linux-3.1.1/arch/x86/mm/iomap_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/iomap_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
  	type = kmap_atomic_idx_push();
  	idx = type + KM_TYPE_NR * smp_processor_id();
@@ -21237,9 +21316,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/iomap_32.c linux-3.0.9/arch/x86/mm/iomap_32.c
  	arch_flush_lazy_mmu_mode();
  
  	return (void *)vaddr;
-diff -urNp linux-3.0.9/arch/x86/mm/ioremap.c linux-3.0.9/arch/x86/mm/ioremap.c
---- linux-3.0.9/arch/x86/mm/ioremap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/ioremap.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/ioremap.c linux-3.1.1/arch/x86/mm/ioremap.c
+--- linux-3.1.1/arch/x86/mm/ioremap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/ioremap.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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);
@@ -21268,9 +21347,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/ioremap.c linux-3.0.9/arch/x86/mm/ioremap.c
  
  	/*
  	 * The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.1.1/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-3.1.1/arch/x86/mm/kmemcheck/kmemcheck.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/kmemcheck/kmemcheck.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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.
@@ -21283,9 +21362,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.9/arch/x86/mm
  		return false;
  
  	pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-3.0.9/arch/x86/mm/mmap.c linux-3.0.9/arch/x86/mm/mmap.c
---- linux-3.0.9/arch/x86/mm/mmap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/mmap.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/mmap.c linux-3.1.1/arch/x86/mm/mmap.c
+--- linux-3.1.1/arch/x86/mm/mmap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/mmap.c	2011-11-16 18:39:07.000000000 -0500
 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
   * Leave an at least ~128 MB hole with possible stack randomization.
   */
@@ -21367,9 +21446,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/mmap.c linux-3.0.9/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.9/arch/x86/mm/mmio-mod.c linux-3.0.9/arch/x86/mm/mmio-mod.c
---- linux-3.0.9/arch/x86/mm/mmio-mod.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/mmio-mod.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/mmio-mod.c linux-3.1.1/arch/x86/mm/mmio-mod.c
+--- linux-3.1.1/arch/x86/mm/mmio-mod.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/mmio-mod.c	2011-11-16 18:39:07.000000000 -0500
 @@ -195,7 +195,7 @@ static void pre(struct kmmio_probe *p, s
  		break;
  	default:
@@ -21397,9 +21476,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/mmio-mod.c linux-3.0.9/arch/x86/mm/mmio-mod.c
  	};
  	map.map_id = trace->id;
  
-diff -urNp linux-3.0.9/arch/x86/mm/pageattr.c linux-3.0.9/arch/x86/mm/pageattr.c
---- linux-3.0.9/arch/x86/mm/pageattr.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/pageattr.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/pageattr.c linux-3.1.1/arch/x86/mm/pageattr.c
+--- linux-3.1.1/arch/x86/mm/pageattr.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/pageattr.c	2011-11-16 18:39:07.000000000 -0500
 @@ -261,7 +261,7 @@ static inline pgprot_t static_protection
  	 */
  #ifdef CONFIG_PCI_BIOS
@@ -21484,9 +21563,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/pageattr.c linux-3.0.9/arch/x86/mm/pageattr.c
  }
  
  static int
-diff -urNp linux-3.0.9/arch/x86/mm/pageattr-test.c linux-3.0.9/arch/x86/mm/pageattr-test.c
---- linux-3.0.9/arch/x86/mm/pageattr-test.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/pageattr-test.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/pageattr-test.c linux-3.1.1/arch/x86/mm/pageattr-test.c
+--- linux-3.1.1/arch/x86/mm/pageattr-test.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/pageattr-test.c	2011-11-16 18:39:07.000000000 -0500
 @@ -36,7 +36,7 @@ enum {
  
  static int pte_testbit(pte_t pte)
@@ -21496,9 +21575,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/pageattr-test.c linux-3.0.9/arch/x86/mm/pagea
  }
  
  struct split_state {
-diff -urNp linux-3.0.9/arch/x86/mm/pat.c linux-3.0.9/arch/x86/mm/pat.c
---- linux-3.0.9/arch/x86/mm/pat.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/pat.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/pat.c linux-3.1.1/arch/x86/mm/pat.c
+--- linux-3.1.1/arch/x86/mm/pat.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/pat.c	2011-11-16 18:39:07.000000000 -0500
 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
  
  	if (!entry) {
@@ -21546,9 +21625,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/pat.c linux-3.0.9/arch/x86/mm/pat.c
  				cattr_name(want_flags),
  				(unsigned long long)paddr,
  				(unsigned long long)(paddr + size),
-diff -urNp linux-3.0.9/arch/x86/mm/pf_in.c linux-3.0.9/arch/x86/mm/pf_in.c
---- linux-3.0.9/arch/x86/mm/pf_in.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/pf_in.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/pf_in.c linux-3.1.1/arch/x86/mm/pf_in.c
+--- linux-3.1.1/arch/x86/mm/pf_in.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/pf_in.c	2011-11-16 18:39:07.000000000 -0500
 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l
  	int i;
  	enum reason_type rv = OTHERS;
@@ -21594,9 +21673,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/pf_in.c linux-3.0.9/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.9/arch/x86/mm/pgtable_32.c linux-3.0.9/arch/x86/mm/pgtable_32.c
---- linux-3.0.9/arch/x86/mm/pgtable_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/pgtable_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/pgtable_32.c linux-3.1.1/arch/x86/mm/pgtable_32.c
+--- linux-3.1.1/arch/x86/mm/pgtable_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/pgtable_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, 
  		return;
  	}
@@ -21611,9 +21690,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/pgtable_32.c linux-3.0.9/arch/x86/mm/pgtable_
  
  	/*
  	 * It's enough to flush this one mapping.
-diff -urNp linux-3.0.9/arch/x86/mm/pgtable.c linux-3.0.9/arch/x86/mm/pgtable.c
---- linux-3.0.9/arch/x86/mm/pgtable.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/pgtable.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/pgtable.c linux-3.1.1/arch/x86/mm/pgtable.c
+--- linux-3.1.1/arch/x86/mm/pgtable.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/pgtable.c	2011-11-16 18:39:07.000000000 -0500
 @@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p
  	list_del(&page->lru);
  }
@@ -21859,9 +21938,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/pgtable.c linux-3.0.9/arch/x86/mm/pgtable.c
  	pgd_dtor(pgd);
  	paravirt_pgd_free(mm, pgd);
  	free_page((unsigned long)pgd);
-diff -urNp linux-3.0.9/arch/x86/mm/setup_nx.c linux-3.0.9/arch/x86/mm/setup_nx.c
---- linux-3.0.9/arch/x86/mm/setup_nx.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/setup_nx.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/setup_nx.c linux-3.1.1/arch/x86/mm/setup_nx.c
+--- linux-3.1.1/arch/x86/mm/setup_nx.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/setup_nx.c	2011-11-16 18:39:07.000000000 -0500
 @@ -5,8 +5,10 @@
  #include <asm/pgtable.h>
  #include <asm/proto.h>
@@ -21891,9 +21970,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/setup_nx.c linux-3.0.9/arch/x86/mm/setup_nx.c
  		__supported_pte_mask &= ~_PAGE_NX;
  }
  
-diff -urNp linux-3.0.9/arch/x86/mm/tlb.c linux-3.0.9/arch/x86/mm/tlb.c
---- linux-3.0.9/arch/x86/mm/tlb.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/tlb.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/mm/tlb.c linux-3.1.1/arch/x86/mm/tlb.c
+--- linux-3.1.1/arch/x86/mm/tlb.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/tlb.c	2011-11-16 18:39:07.000000000 -0500
 @@ -65,7 +65,11 @@ void leave_mm(int cpu)
  		BUG();
  	cpumask_clear_cpu(cpu,
@@ -21906,9 +21985,9 @@ diff -urNp linux-3.0.9/arch/x86/mm/tlb.c linux-3.0.9/arch/x86/mm/tlb.c
  }
  EXPORT_SYMBOL_GPL(leave_mm);
  
-diff -urNp linux-3.0.9/arch/x86/net/bpf_jit_comp.c linux-3.0.9/arch/x86/net/bpf_jit_comp.c
---- linux-3.0.9/arch/x86/net/bpf_jit_comp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/net/bpf_jit_comp.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/net/bpf_jit_comp.c linux-3.1.1/arch/x86/net/bpf_jit_comp.c
+--- linux-3.1.1/arch/x86/net/bpf_jit_comp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/net/bpf_jit_comp.c	2011-11-16 18:39:07.000000000 -0500
 @@ -589,7 +589,9 @@ cond_branch:			f_offset = addrs[i + filt
  					module_free(NULL, image);
  					return;
@@ -21928,9 +22007,9 @@ diff -urNp linux-3.0.9/arch/x86/net/bpf_jit_comp.c linux-3.0.9/arch/x86/net/bpf_
  						   proglen,
  						   sizeof(struct work_struct)));
  			if (!image)
-diff -urNp linux-3.0.9/arch/x86/net/bpf_jit.S linux-3.0.9/arch/x86/net/bpf_jit.S
---- linux-3.0.9/arch/x86/net/bpf_jit.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/net/bpf_jit.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/net/bpf_jit.S linux-3.1.1/arch/x86/net/bpf_jit.S
+--- linux-3.1.1/arch/x86/net/bpf_jit.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/net/bpf_jit.S	2011-11-16 18:39:07.000000000 -0500
 @@ -9,6 +9,7 @@
   */
  #include <linux/linkage.h>
@@ -22008,10 +22087,10 @@ diff -urNp linux-3.0.9/arch/x86/net/bpf_jit.S linux-3.0.9/arch/x86/net/bpf_jit.S
  	xchg	%eax,%ebx
 +	pax_force_retaddr
  	ret
-diff -urNp linux-3.0.9/arch/x86/oprofile/backtrace.c linux-3.0.9/arch/x86/oprofile/backtrace.c
---- linux-3.0.9/arch/x86/oprofile/backtrace.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/oprofile/backtrace.c	2011-11-15 20:02:59.000000000 -0500
-@@ -83,11 +83,11 @@ dump_user_backtrace_32(struct stack_fram
+diff -urNp linux-3.1.1/arch/x86/oprofile/backtrace.c linux-3.1.1/arch/x86/oprofile/backtrace.c
+--- linux-3.1.1/arch/x86/oprofile/backtrace.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/oprofile/backtrace.c	2011-11-16 18:39:07.000000000 -0500
+@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_fram
  	struct stack_frame_ia32 *fp;
  	unsigned long bytes;
  
@@ -22025,7 +22104,7 @@ diff -urNp linux-3.0.9/arch/x86/oprofile/backtrace.c linux-3.0.9/arch/x86/oprofi
  
  	oprofile_add_trace(bufhead[0].return_address);
  
-@@ -129,7 +129,7 @@ static struct stack_frame *dump_user_bac
+@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_bac
  	struct stack_frame bufhead[2];
  	unsigned long bytes;
  
@@ -22034,7 +22113,7 @@ diff -urNp linux-3.0.9/arch/x86/oprofile/backtrace.c linux-3.0.9/arch/x86/oprofi
  	if (bytes != sizeof(bufhead))
  		return NULL;
  
-@@ -148,7 +148,7 @@ x86_backtrace(struct pt_regs * const reg
+@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const reg
  {
  	struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
  
@@ -22043,9 +22122,9 @@ diff -urNp linux-3.0.9/arch/x86/oprofile/backtrace.c linux-3.0.9/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.9/arch/x86/pci/mrst.c linux-3.0.9/arch/x86/pci/mrst.c
---- linux-3.0.9/arch/x86/pci/mrst.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/pci/mrst.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/pci/mrst.c linux-3.1.1/arch/x86/pci/mrst.c
+--- linux-3.1.1/arch/x86/pci/mrst.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/pci/mrst.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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();
@@ -22057,9 +22136,9 @@ diff -urNp linux-3.0.9/arch/x86/pci/mrst.c linux-3.0.9/arch/x86/pci/mrst.c
  	/* Continue with standard init */
  	return 1;
  }
-diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
---- linux-3.0.9/arch/x86/pci/pcbios.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/pci/pcbios.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/pci/pcbios.c linux-3.1.1/arch/x86/pci/pcbios.c
+--- linux-3.1.1/arch/x86/pci/pcbios.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/pci/pcbios.c	2011-11-16 18:39:07.000000000 -0500
 @@ -79,50 +79,93 @@ union bios32 {
  static struct {
  	unsigned long address;
@@ -22195,7 +22274,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  			: "memory");
  		local_irq_restore(flags);
  
-@@ -188,7 +234,10 @@ static int pci_bios_read(unsigned int se
+@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int se
  
  	switch (len) {
  	case 1:
@@ -22207,7 +22286,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -197,7 +246,8 @@ static int pci_bios_read(unsigned int se
+@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int se
  			: "1" (PCIBIOS_READ_CONFIG_BYTE),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -22217,7 +22296,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  		/*
  		 * Zero-extend the result beyond 8 bits, do not trust the
  		 * BIOS having done it:
-@@ -205,7 +255,10 @@ static int pci_bios_read(unsigned int se
+@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int se
  		*value &= 0xff;
  		break;
  	case 2:
@@ -22229,7 +22308,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -214,7 +267,8 @@ static int pci_bios_read(unsigned int se
+@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int se
  			: "1" (PCIBIOS_READ_CONFIG_WORD),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -22239,7 +22318,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  		/*
  		 * Zero-extend the result beyond 16 bits, do not trust the
  		 * BIOS having done it:
-@@ -222,7 +276,10 @@ static int pci_bios_read(unsigned int se
+@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int se
  		*value &= 0xffff;
  		break;
  	case 4:
@@ -22251,7 +22330,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -231,7 +288,8 @@ static int pci_bios_read(unsigned int se
+@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int se
  			: "1" (PCIBIOS_READ_CONFIG_DWORD),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -22261,7 +22340,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  		break;
  	}
  
-@@ -254,7 +312,10 @@ static int pci_bios_write(unsigned int s
+@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int s
  
  	switch (len) {
  	case 1:
@@ -22273,7 +22352,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -263,10 +324,14 @@ static int pci_bios_write(unsigned int s
+@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int s
  			  "c" (value),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -22290,7 +22369,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -275,10 +340,14 @@ static int pci_bios_write(unsigned int s
+@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int s
  			  "c" (value),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -22307,7 +22386,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -287,7 +356,8 @@ static int pci_bios_write(unsigned int s
+@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int s
  			  "c" (value),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -22317,7 +22396,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  		break;
  	}
  
-@@ -392,10 +462,13 @@ struct irq_routing_table * pcibios_get_i
+@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_i
  
  	DBG("PCI: Fetching IRQ routing table... ");
  	__asm__("push %%es\n\t"
@@ -22332,7 +22411,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  		"jc 1f\n\t"
  		"xor %%ah, %%ah\n"
  		"1:"
-@@ -406,7 +479,8 @@ struct irq_routing_table * pcibios_get_i
+@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_i
  		  "1" (0),
  		  "D" ((long) &opt),
  		  "S" (&pci_indirect),
@@ -22342,7 +22421,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  		: "memory");
  	DBG("OK  ret=%d, size=%d, map=%x\n", ret, opt.size, map);
  	if (ret & 0xff00)
-@@ -430,7 +504,10 @@ int pcibios_set_irq_routing(struct pci_d
+@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_d
  {
  	int ret;
  
@@ -22354,7 +22433,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  		"jc 1f\n\t"
  		"xor %%ah, %%ah\n"
  		"1:"
-@@ -438,7 +515,8 @@ int pcibios_set_irq_routing(struct pci_d
+@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_d
  		: "0" (PCIBIOS_SET_PCI_HW_INT),
  		  "b" ((dev->bus->number << 8) | dev->devfn),
  		  "c" ((irq << 8) | (pin + 10)),
@@ -22364,9 +22443,9 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
  	return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_32.c linux-3.0.9/arch/x86/platform/efi/efi_32.c
---- linux-3.0.9/arch/x86/platform/efi/efi_32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/platform/efi/efi_32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/platform/efi/efi_32.c linux-3.1.1/arch/x86/platform/efi/efi_32.c
+--- linux-3.1.1/arch/x86/platform/efi/efi_32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/platform/efi/efi_32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -38,70 +38,56 @@
   */
  
@@ -22464,9 +22543,9 @@ diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_32.c linux-3.0.9/arch/x86/platf
  
  	/*
  	 * After the lock is released, the original page table is restored.
-diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S
---- linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/platform/efi/efi_stub_32.S linux-3.1.1/arch/x86/platform/efi/efi_stub_32.S
+--- linux-3.1.1/arch/x86/platform/efi/efi_stub_32.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/platform/efi/efi_stub_32.S	2011-11-16 18:39:07.000000000 -0500
 @@ -6,7 +6,9 @@
   */
  
@@ -22575,9 +22654,9 @@ diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S linux-3.0.9/arch/x86/
  saved_return_addr:
  	.long 0
  efi_rt_function_ptr:
-diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S
---- linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/platform/efi/efi_stub_64.S linux-3.1.1/arch/x86/platform/efi/efi_stub_64.S
+--- linux-3.1.1/arch/x86/platform/efi/efi_stub_64.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/platform/efi/efi_stub_64.S	2011-11-16 18:39:07.000000000 -0500
 @@ -7,6 +7,7 @@
   */
  
@@ -22641,9 +22720,9 @@ diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S linux-3.0.9/arch/x86/
 +	pax_force_retaddr
  	ret
  ENDPROC(efi_call6)
-diff -urNp linux-3.0.9/arch/x86/platform/mrst/mrst.c linux-3.0.9/arch/x86/platform/mrst/mrst.c
---- linux-3.0.9/arch/x86/platform/mrst/mrst.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/platform/mrst/mrst.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/platform/mrst/mrst.c linux-3.1.1/arch/x86/platform/mrst/mrst.c
+--- linux-3.1.1/arch/x86/platform/mrst/mrst.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/platform/mrst/mrst.c	2011-11-16 18:39:07.000000000 -0500
 @@ -239,14 +239,16 @@ static int mrst_i8042_detect(void)
  }
  
@@ -22663,21 +22742,21 @@ diff -urNp linux-3.0.9/arch/x86/platform/mrst/mrst.c linux-3.0.9/arch/x86/platfo
  }
  
  /*
-diff -urNp linux-3.0.9/arch/x86/platform/uv/tlb_uv.c linux-3.0.9/arch/x86/platform/uv/tlb_uv.c
---- linux-3.0.9/arch/x86/platform/uv/tlb_uv.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/platform/uv/tlb_uv.c	2011-11-15 20:02:59.000000000 -0500
-@@ -370,6 +370,8 @@ static void reset_with_ipi(struct bau_ta
- 	cpumask_t mask;
+diff -urNp linux-3.1.1/arch/x86/platform/uv/tlb_uv.c linux-3.1.1/arch/x86/platform/uv/tlb_uv.c
+--- linux-3.1.1/arch/x86/platform/uv/tlb_uv.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/platform/uv/tlb_uv.c	2011-11-16 19:39:11.000000000 -0500
+@@ -377,6 +377,8 @@ static void reset_with_ipi(struct pnmask
+ 	struct bau_control *smaster = bcp->socket_master;
  	struct reset_args reset_args;
  
 +	pax_track_stack();
 +
  	reset_args.sender = sender;
- 	cpus_clear(mask);
+ 	cpus_clear(*mask);
  	/* find a single cpu for each uvhub in this distribution mask */
-diff -urNp linux-3.0.9/arch/x86/power/cpu.c linux-3.0.9/arch/x86/power/cpu.c
---- linux-3.0.9/arch/x86/power/cpu.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/power/cpu.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/power/cpu.c linux-3.1.1/arch/x86/power/cpu.c
+--- linux-3.1.1/arch/x86/power/cpu.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/power/cpu.c	2011-11-16 18:39:07.000000000 -0500
 @@ -130,7 +130,7 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
@@ -22697,10 +22776,10 @@ diff -urNp linux-3.0.9/arch/x86/power/cpu.c linux-3.0.9/arch/x86/power/cpu.c
  
  	syscall_init();				/* This sets MSR_*STAR and related */
  #endif
-diff -urNp linux-3.0.9/arch/x86/vdso/Makefile linux-3.0.9/arch/x86/vdso/Makefile
---- linux-3.0.9/arch/x86/vdso/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/vdso/Makefile	2011-11-15 20:02:59.000000000 -0500
-@@ -136,7 +136,7 @@ quiet_cmd_vdso = VDSO    $@
+diff -urNp linux-3.1.1/arch/x86/vdso/Makefile linux-3.1.1/arch/x86/vdso/Makefile
+--- linux-3.1.1/arch/x86/vdso/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/vdso/Makefile	2011-11-16 18:39:07.000000000 -0500
+@@ -137,7 +137,7 @@ quiet_cmd_vdso = VDSO    $@
  		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
  		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
  
@@ -22709,9 +22788,9 @@ diff -urNp linux-3.0.9/arch/x86/vdso/Makefile linux-3.0.9/arch/x86/vdso/Makefile
  GCOV_PROFILE := n
  
  #
-diff -urNp linux-3.0.9/arch/x86/vdso/vdso32-setup.c linux-3.0.9/arch/x86/vdso/vdso32-setup.c
---- linux-3.0.9/arch/x86/vdso/vdso32-setup.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/vdso/vdso32-setup.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/vdso/vdso32-setup.c linux-3.1.1/arch/x86/vdso/vdso32-setup.c
+--- linux-3.1.1/arch/x86/vdso/vdso32-setup.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/vdso/vdso32-setup.c	2011-11-16 18:39:07.000000000 -0500
 @@ -25,6 +25,7 @@
  #include <asm/tlbflush.h>
  #include <asm/vdso.h>
@@ -22794,100 +22873,58 @@ diff -urNp linux-3.0.9/arch/x86/vdso/vdso32-setup.c linux-3.0.9/arch/x86/vdso/vd
  		return &gate_vma;
  	return NULL;
  }
-diff -urNp linux-3.0.9/arch/x86/vdso/vma.c linux-3.0.9/arch/x86/vdso/vma.c
---- linux-3.0.9/arch/x86/vdso/vma.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/vdso/vma.c	2011-11-15 20:02:59.000000000 -0500
-@@ -15,18 +15,19 @@
- #include <asm/proto.h>
+diff -urNp linux-3.1.1/arch/x86/vdso/vma.c linux-3.1.1/arch/x86/vdso/vma.c
+--- linux-3.1.1/arch/x86/vdso/vma.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/vdso/vma.c	2011-11-16 18:39:07.000000000 -0500
+@@ -16,8 +16,6 @@
  #include <asm/vdso.h>
+ #include <asm/page.h>
  
 -unsigned int __read_mostly vdso_enabled = 1;
 -
  extern char vdso_start[], vdso_end[];
  extern unsigned short vdso_sync_cpuid;
-+extern char __vsyscall_0;
  
- static struct page **vdso_pages;
-+static struct page *vsyscall_page;
- static unsigned vdso_size;
- 
- static int __init init_vdso_vars(void)
+@@ -97,13 +95,15 @@ static unsigned long vdso_addr(unsigned 
+ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
  {
--	int npages = (vdso_end - vdso_start + PAGE_SIZE - 1) / PAGE_SIZE;
--	int i;
-+	size_t nbytes = vdso_end - vdso_start;
-+	size_t npages = (nbytes + PAGE_SIZE - 1) / PAGE_SIZE;
-+	size_t i;
- 
- 	vdso_size = npages << PAGE_SHIFT;
- 	vdso_pages = kmalloc(sizeof(struct page *) * npages, GFP_KERNEL);
-@@ -34,19 +35,19 @@ static int __init init_vdso_vars(void)
- 		goto oom;
- 	for (i = 0; i < npages; i++) {
- 		struct page *p;
--		p = alloc_page(GFP_KERNEL);
-+		p = alloc_page(GFP_KERNEL | __GFP_ZERO);
- 		if (!p)
- 			goto oom;
- 		vdso_pages[i] = p;
--		copy_page(page_address(p), vdso_start + i*PAGE_SIZE);
-+		memcpy(page_address(p), vdso_start + i*PAGE_SIZE, nbytes > PAGE_SIZE ? PAGE_SIZE : nbytes);
-+		nbytes -= PAGE_SIZE;
- 	}
-+	vsyscall_page = pfn_to_page((__pa_symbol(&__vsyscall_0)) >> PAGE_SHIFT);
- 
- 	return 0;
- 
-  oom:
--	printk("Cannot allocate vdso\n");
--	vdso_enabled = 0;
--	return -ENOMEM;
-+	panic("Cannot allocate vdso\n");
- }
- subsys_initcall(init_vdso_vars);
- 
-@@ -80,37 +81,35 @@ int arch_setup_additional_pages(struct l
- 	unsigned long addr;
+ 	struct mm_struct *mm = current->mm;
+-	unsigned long addr;
++	unsigned long addr = 0;
  	int ret;
  
 -	if (!vdso_enabled)
 -		return 0;
 -
  	down_write(&mm->mmap_sem);
--	addr = vdso_addr(mm->start_stack, vdso_size);
--	addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
-+	addr = vdso_addr(mm->start_stack, vdso_size + PAGE_SIZE);
-+	addr = get_unmapped_area(NULL, addr, vdso_size + PAGE_SIZE, 0, 0);
++
++#ifdef CONFIG_PAX_RANDMMAP
++	if (!(mm->pax_flags & MF_PAX_RANDMMAP))
++#endif
++
+ 	addr = vdso_addr(mm->start_stack, vdso_size);
+ 	addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
  	if (IS_ERR_VALUE(addr)) {
- 		ret = addr;
+@@ -111,26 +111,18 @@ int arch_setup_additional_pages(struct l
  		goto up_fail;
  	}
  
 -	current->mm->context.vdso = (void *)addr;
-+	mm->context.vdso = addr + PAGE_SIZE;
++	mm->context.vdso = addr;
  
--	ret = install_special_mapping(mm, addr, vdso_size,
-+	ret = install_special_mapping(mm, addr, PAGE_SIZE,
+ 	ret = install_special_mapping(mm, addr, vdso_size,
  				      VM_READ|VM_EXEC|
--				      VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
-+				      VM_MAYREAD|VM_MAYEXEC|
+ 				      VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
  				      VM_ALWAYSDUMP,
--				      vdso_pages);
-+				      &vsyscall_page);
- 	if (ret) {
+ 				      vdso_pages);
+-	if (ret) {
 -		current->mm->context.vdso = NULL;
-+		mm->context.vdso = 0;
- 		goto up_fail;
- 	}
- 
-+	ret = install_special_mapping(mm, addr + PAGE_SIZE, vdso_size,
-+				      VM_READ|VM_EXEC|
-+				      VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
-+				      VM_ALWAYSDUMP,
-+				      vdso_pages);
+-		goto up_fail;
+-	}
++
 +	if (ret)
 +		mm->context.vdso = 0;
-+
+ 
  up_fail:
  	up_write(&mm->mmap_sem);
  	return ret;
@@ -22899,9 +22936,9 @@ diff -urNp linux-3.0.9/arch/x86/vdso/vma.c linux-3.0.9/arch/x86/vdso/vma.c
 -	return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff -urNp linux-3.0.9/arch/x86/xen/enlighten.c linux-3.0.9/arch/x86/xen/enlighten.c
---- linux-3.0.9/arch/x86/xen/enlighten.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/xen/enlighten.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/xen/enlighten.c linux-3.1.1/arch/x86/xen/enlighten.c
+--- linux-3.1.1/arch/x86/xen/enlighten.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/xen/enlighten.c	2011-11-16 18:39:07.000000000 -0500
 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
@@ -22911,7 +22948,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/enlighten.c linux-3.0.9/arch/x86/xen/enlight
  RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
  __read_mostly int xen_have_vector_callback;
  EXPORT_SYMBOL_GPL(xen_have_vector_callback);
-@@ -1010,7 +1008,7 @@ static const struct pv_apic_ops xen_apic
+@@ -1028,7 +1026,7 @@ static const struct pv_apic_ops xen_apic
  #endif
  };
  
@@ -22920,7 +22957,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/enlighten.c linux-3.0.9/arch/x86/xen/enlight
  {
  	struct sched_shutdown r = { .reason = reason };
  
-@@ -1018,17 +1016,17 @@ static void xen_reboot(int reason)
+@@ -1036,17 +1034,17 @@ static void xen_reboot(int reason)
  		BUG();
  }
  
@@ -22941,7 +22978,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/enlighten.c linux-3.0.9/arch/x86/xen/enlight
  {
  	xen_reboot(SHUTDOWN_poweroff);
  }
-@@ -1134,7 +1132,17 @@ asmlinkage void __init xen_start_kernel(
+@@ -1152,7 +1150,17 @@ asmlinkage void __init xen_start_kernel(
  	__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
  
  	/* Work out if we support NX */
@@ -22960,7 +22997,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/enlighten.c linux-3.0.9/arch/x86/xen/enlight
  
  	xen_setup_features();
  
-@@ -1165,13 +1173,6 @@ asmlinkage void __init xen_start_kernel(
+@@ -1183,13 +1191,6 @@ asmlinkage void __init xen_start_kernel(
  
  	machine_ops = xen_machine_ops;
  
@@ -22974,10 +23011,10 @@ diff -urNp linux-3.0.9/arch/x86/xen/enlighten.c linux-3.0.9/arch/x86/xen/enlight
  	xen_smp_init();
  
  #ifdef CONFIG_ACPI_NUMA
-diff -urNp linux-3.0.9/arch/x86/xen/mmu.c linux-3.0.9/arch/x86/xen/mmu.c
---- linux-3.0.9/arch/x86/xen/mmu.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/xen/mmu.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1683,6 +1683,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
+diff -urNp linux-3.1.1/arch/x86/xen/mmu.c linux-3.1.1/arch/x86/xen/mmu.c
+--- linux-3.1.1/arch/x86/xen/mmu.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/xen/mmu.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1768,6 +1768,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
  	convert_pfn_mfn(init_level4_pgt);
  	convert_pfn_mfn(level3_ident_pgt);
  	convert_pfn_mfn(level3_kernel_pgt);
@@ -22986,7 +23023,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/mmu.c linux-3.0.9/arch/x86/xen/mmu.c
  
  	l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
  	l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
-@@ -1701,7 +1703,10 @@ pgd_t * __init xen_setup_kernel_pagetabl
+@@ -1786,7 +1788,10 @@ pgd_t * __init xen_setup_kernel_pagetabl
  	set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
  	set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
  	set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
@@ -22997,7 +23034,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/mmu.c linux-3.0.9/arch/x86/xen/mmu.c
  	set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
  	set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
  
-@@ -1913,6 +1918,7 @@ static void __init xen_post_allocator_in
+@@ -2000,6 +2005,7 @@ static void __init xen_post_allocator_in
  	pv_mmu_ops.set_pud = xen_set_pud;
  #if PAGETABLE_LEVELS == 4
  	pv_mmu_ops.set_pgd = xen_set_pgd;
@@ -23005,7 +23042,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/mmu.c linux-3.0.9/arch/x86/xen/mmu.c
  #endif
  
  	/* This will work as long as patching hasn't happened yet
-@@ -1994,6 +2000,7 @@ static const struct pv_mmu_ops xen_mmu_o
+@@ -2081,6 +2087,7 @@ static const struct pv_mmu_ops xen_mmu_o
  	.pud_val = PV_CALLEE_SAVE(xen_pud_val),
  	.make_pud = PV_CALLEE_SAVE(xen_make_pud),
  	.set_pgd = xen_set_pgd_hyper,
@@ -23013,9 +23050,9 @@ diff -urNp linux-3.0.9/arch/x86/xen/mmu.c linux-3.0.9/arch/x86/xen/mmu.c
  
  	.alloc_pud = xen_alloc_pmd_init,
  	.release_pud = xen_release_pmd_init,
-diff -urNp linux-3.0.9/arch/x86/xen/smp.c linux-3.0.9/arch/x86/xen/smp.c
---- linux-3.0.9/arch/x86/xen/smp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/xen/smp.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/xen/smp.c linux-3.1.1/arch/x86/xen/smp.c
+--- linux-3.1.1/arch/x86/xen/smp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/xen/smp.c	2011-11-16 18:39:07.000000000 -0500
 @@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
  {
  	BUG_ON(smp_processor_id() != 0);
@@ -23060,9 +23097,9 @@ diff -urNp linux-3.0.9/arch/x86/xen/smp.c linux-3.0.9/arch/x86/xen/smp.c
  #endif
  	xen_setup_runstate_info(cpu);
  	xen_setup_timer(cpu);
-diff -urNp linux-3.0.9/arch/x86/xen/xen-asm_32.S linux-3.0.9/arch/x86/xen/xen-asm_32.S
---- linux-3.0.9/arch/x86/xen/xen-asm_32.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/xen/xen-asm_32.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/xen/xen-asm_32.S linux-3.1.1/arch/x86/xen/xen-asm_32.S
+--- linux-3.1.1/arch/x86/xen/xen-asm_32.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/xen/xen-asm_32.S	2011-11-16 18:39:07.000000000 -0500
 @@ -83,14 +83,14 @@ ENTRY(xen_iret)
  	ESP_OFFSET=4	# bytes pushed onto stack
  
@@ -23084,9 +23121,9 @@ diff -urNp linux-3.0.9/arch/x86/xen/xen-asm_32.S linux-3.0.9/arch/x86/xen/xen-as
  #else
  	movl xen_vcpu, %eax
  #endif
-diff -urNp linux-3.0.9/arch/x86/xen/xen-head.S linux-3.0.9/arch/x86/xen/xen-head.S
---- linux-3.0.9/arch/x86/xen/xen-head.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/xen/xen-head.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/xen/xen-head.S linux-3.1.1/arch/x86/xen/xen-head.S
+--- linux-3.1.1/arch/x86/xen/xen-head.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/xen/xen-head.S	2011-11-16 18:39:07.000000000 -0500
 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
  #ifdef CONFIG_X86_32
  	mov %esi,xen_start_info
@@ -23105,9 +23142,9 @@ diff -urNp linux-3.0.9/arch/x86/xen/xen-head.S linux-3.0.9/arch/x86/xen/xen-head
  #else
  	mov %rsi,xen_start_info
  	mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-3.0.9/arch/x86/xen/xen-ops.h linux-3.0.9/arch/x86/xen/xen-ops.h
---- linux-3.0.9/arch/x86/xen/xen-ops.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/xen/xen-ops.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/arch/x86/xen/xen-ops.h linux-3.1.1/arch/x86/xen/xen-ops.h
+--- linux-3.1.1/arch/x86/xen/xen-ops.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/xen/xen-ops.h	2011-11-16 18:39:07.000000000 -0500
 @@ -10,8 +10,6 @@
  extern const char xen_hypervisor_callback[];
  extern const char xen_failsafe_callback[];
@@ -23117,9 +23154,9 @@ diff -urNp linux-3.0.9/arch/x86/xen/xen-ops.h linux-3.0.9/arch/x86/xen/xen-ops.h
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff -urNp linux-3.0.9/block/blk-iopoll.c linux-3.0.9/block/blk-iopoll.c
---- linux-3.0.9/block/blk-iopoll.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/block/blk-iopoll.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/block/blk-iopoll.c linux-3.1.1/block/blk-iopoll.c
+--- linux-3.1.1/block/blk-iopoll.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/block/blk-iopoll.c	2011-11-16 18:39:07.000000000 -0500
 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
  }
  EXPORT_SYMBOL(blk_iopoll_complete);
@@ -23129,9 +23166,9 @@ diff -urNp linux-3.0.9/block/blk-iopoll.c linux-3.0.9/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.9/block/blk-map.c linux-3.0.9/block/blk-map.c
---- linux-3.0.9/block/blk-map.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/block/blk-map.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/block/blk-map.c linux-3.1.1/block/blk-map.c
+--- linux-3.1.1/block/blk-map.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/block/blk-map.c	2011-11-16 18:39:07.000000000 -0500
 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
  	if (!len || !kbuf)
  		return -EINVAL;
@@ -23141,9 +23178,9 @@ diff -urNp linux-3.0.9/block/blk-map.c linux-3.0.9/block/blk-map.c
  	if (do_copy)
  		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
  	else
-diff -urNp linux-3.0.9/block/blk-softirq.c linux-3.0.9/block/blk-softirq.c
---- linux-3.0.9/block/blk-softirq.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/block/blk-softirq.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/block/blk-softirq.c linux-3.1.1/block/blk-softirq.c
+--- linux-3.1.1/block/blk-softirq.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/block/blk-softirq.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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.
@@ -23153,9 +23190,9 @@ diff -urNp linux-3.0.9/block/blk-softirq.c linux-3.0.9/block/blk-softirq.c
  {
  	struct list_head *cpu_list, local_list;
  
-diff -urNp linux-3.0.9/block/bsg.c linux-3.0.9/block/bsg.c
---- linux-3.0.9/block/bsg.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/block/bsg.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/block/bsg.c linux-3.1.1/block/bsg.c
+--- linux-3.1.1/block/bsg.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/block/bsg.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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)
@@ -23172,7 +23209,7 @@ diff -urNp linux-3.0.9/block/bsg.c linux-3.0.9/block/bsg.c
 +	} else
 +		cmdptr = tmpcmd;
  
--	if (copy_from_user(rq->cmd, (void *)(unsigned long)hdr->request,
+-	if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
 +	if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
  			   hdr->request_len))
  		return -EFAULT;
@@ -23183,50 +23220,10 @@ diff -urNp linux-3.0.9/block/bsg.c linux-3.0.9/block/bsg.c
  	if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
  		if (blk_verify_command(rq->cmd, has_write_perm))
  			return -EPERM;
-@@ -249,7 +257,7 @@ bsg_map_hdr(struct bsg_device *bd, struc
- 	struct request *rq, *next_rq = NULL;
- 	int ret, rw;
- 	unsigned int dxfer_len;
--	void *dxferp = NULL;
-+	void __user *dxferp = NULL;
- 	struct bsg_class_device *bcd = &q->bsg_dev;
- 
- 	/* if the LLD has been removed then the bsg_unregister_queue will
-@@ -291,7 +299,7 @@ bsg_map_hdr(struct bsg_device *bd, struc
- 		rq->next_rq = next_rq;
- 		next_rq->cmd_type = rq->cmd_type;
- 
--		dxferp = (void*)(unsigned long)hdr->din_xferp;
-+		dxferp = (void __user *)(unsigned long)hdr->din_xferp;
- 		ret =  blk_rq_map_user(q, next_rq, NULL, dxferp,
- 				       hdr->din_xfer_len, GFP_KERNEL);
- 		if (ret)
-@@ -300,10 +308,10 @@ bsg_map_hdr(struct bsg_device *bd, struc
- 
- 	if (hdr->dout_xfer_len) {
- 		dxfer_len = hdr->dout_xfer_len;
--		dxferp = (void*)(unsigned long)hdr->dout_xferp;
-+		dxferp = (void __user *)(unsigned long)hdr->dout_xferp;
- 	} else if (hdr->din_xfer_len) {
- 		dxfer_len = hdr->din_xfer_len;
--		dxferp = (void*)(unsigned long)hdr->din_xferp;
-+		dxferp = (void __user *)(unsigned long)hdr->din_xferp;
- 	} else
- 		dxfer_len = 0;
- 
-@@ -445,7 +453,7 @@ static int blk_complete_sgv4_hdr_rq(stru
- 		int len = min_t(unsigned int, hdr->max_response_len,
- 					rq->sense_len);
- 
--		ret = copy_to_user((void*)(unsigned long)hdr->response,
-+		ret = copy_to_user((void __user *)(unsigned long)hdr->response,
- 				   rq->sense, len);
- 		if (!ret)
- 			hdr->response_len = len;
-diff -urNp linux-3.0.9/block/compat_ioctl.c linux-3.0.9/block/compat_ioctl.c
---- linux-3.0.9/block/compat_ioctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/block/compat_ioctl.c	2011-11-15 20:02:59.000000000 -0500
-@@ -354,7 +354,7 @@ static int compat_fd_ioctl(struct block_
+diff -urNp linux-3.1.1/block/compat_ioctl.c linux-3.1.1/block/compat_ioctl.c
+--- linux-3.1.1/block/compat_ioctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/block/compat_ioctl.c	2011-11-16 18:39:07.000000000 -0500
+@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_
  		err |= __get_user(f->spec1, &uf->spec1);
  		err |= __get_user(f->fmt_gap, &uf->fmt_gap);
  		err |= __get_user(name, &uf->name);
@@ -23235,9 +23232,9 @@ diff -urNp linux-3.0.9/block/compat_ioctl.c linux-3.0.9/block/compat_ioctl.c
  		if (err) {
  			err = -EFAULT;
  			goto out;
-diff -urNp linux-3.0.9/block/scsi_ioctl.c linux-3.0.9/block/scsi_ioctl.c
---- linux-3.0.9/block/scsi_ioctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/block/scsi_ioctl.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/block/scsi_ioctl.c linux-3.1.1/block/scsi_ioctl.c
+--- linux-3.1.1/block/scsi_ioctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/block/scsi_ioctl.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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)
@@ -23289,9 +23286,9 @@ diff -urNp linux-3.0.9/block/scsi_ioctl.c linux-3.0.9/block/scsi_ioctl.c
  	if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
  		goto error;
  
-diff -urNp linux-3.0.9/crypto/cryptd.c linux-3.0.9/crypto/cryptd.c
---- linux-3.0.9/crypto/cryptd.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/crypto/cryptd.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/crypto/cryptd.c linux-3.1.1/crypto/cryptd.c
+--- linux-3.1.1/crypto/cryptd.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/crypto/cryptd.c	2011-11-16 18:39:07.000000000 -0500
 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
  
  struct cryptd_blkcipher_request_ctx {
@@ -23310,30 +23307,9 @@ diff -urNp linux-3.0.9/crypto/cryptd.c linux-3.0.9/crypto/cryptd.c
  
  static void cryptd_queue_worker(struct work_struct *work);
  
-diff -urNp linux-3.0.9/crypto/gf128mul.c linux-3.0.9/crypto/gf128mul.c
---- linux-3.0.9/crypto/gf128mul.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/crypto/gf128mul.c	2011-11-15 20:02:59.000000000 -0500
-@@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128 
- 	for (i = 0; i < 7; ++i)
- 		gf128mul_x_lle(&p[i + 1], &p[i]);
- 
--	memset(r, 0, sizeof(r));
-+	memset(r, 0, sizeof(*r));
- 	for (i = 0;;) {
- 		u8 ch = ((u8 *)b)[15 - i];
- 
-@@ -220,7 +220,7 @@ void gf128mul_bbe(be128 *r, const be128 
- 	for (i = 0; i < 7; ++i)
- 		gf128mul_x_bbe(&p[i + 1], &p[i]);
- 
--	memset(r, 0, sizeof(r));
-+	memset(r, 0, sizeof(*r));
- 	for (i = 0;;) {
- 		u8 ch = ((u8 *)b)[i];
- 
-diff -urNp linux-3.0.9/crypto/serpent.c linux-3.0.9/crypto/serpent.c
---- linux-3.0.9/crypto/serpent.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/crypto/serpent.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/crypto/serpent.c linux-3.1.1/crypto/serpent.c
+--- linux-3.1.1/crypto/serpent.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/crypto/serpent.c	2011-11-16 18:40:10.000000000 -0500
 @@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_
  	u32 r0,r1,r2,r3,r4;
  	int i;
@@ -23343,9 +23319,9 @@ diff -urNp linux-3.0.9/crypto/serpent.c linux-3.0.9/crypto/serpent.c
  	/* Copy key, add padding */
  
  	for (i = 0; i < keylen; ++i)
-diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
---- linux-3.0.9/Documentation/dontdiff	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/Documentation/dontdiff	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/Documentation/dontdiff linux-3.1.1/Documentation/dontdiff
+--- linux-3.1.1/Documentation/dontdiff	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/Documentation/dontdiff	2011-11-16 18:39:07.000000000 -0500
 @@ -5,6 +5,7 @@
  *.cis
  *.cpio
@@ -23374,7 +23350,13 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
  SCCS
  System.map*
  TAGS
-@@ -98,14 +102,18 @@ bzImage*
+@@ -93,19 +97,24 @@ bounds.h
+ bsetup
+ btfixupprep
+ build
++builtin-policy.h
+ bvmlinux
+ bzImage*
  capability_names.h
  capflags.c
  classlist.h*
@@ -23393,7 +23375,15 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
  conmakehash
  consolemap_deftbl.c*
  cpustr.h
-@@ -126,12 +134,14 @@ fore200e_pca_fw.c*
+@@ -119,6 +128,7 @@ dslm
+ elf2ecoff
+ elfconfig.h*
+ evergreen_reg_safe.h
++exception_policy.conf
+ fixdep
+ flask.h
+ fore200e_mkfirm
+@@ -126,12 +136,14 @@ fore200e_pca_fw.c*
  gconf
  gconf.glade.h
  gen-devlist
@@ -23408,7 +23398,7 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
  hpet_example
  hugepage-mmap
  hugepage-shm
-@@ -146,7 +156,7 @@ int32.c
+@@ -146,7 +158,7 @@ int32.c
  int4.c
  int8.c
  kallsyms
@@ -23417,7 +23407,7 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
  keywords.c
  ksym.c*
  ksym.h*
-@@ -154,7 +164,6 @@ kxgettext
+@@ -154,7 +166,6 @@ kxgettext
  lkc_defs.h
  lex.c
  lex.*.c
@@ -23425,7 +23415,7 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
  logo_*.c
  logo_*_clut224.c
  logo_*_mono.c
-@@ -166,7 +175,6 @@ machtypes.h
+@@ -166,7 +177,6 @@ machtypes.h
  map
  map_hugetlb
  maui_boot.h
@@ -23433,7 +23423,7 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
  mconf
  miboot*
  mk_elfconfig
-@@ -174,6 +182,7 @@ mkboot
+@@ -174,6 +184,7 @@ mkboot
  mkbugboot
  mkcpustr
  mkdep
@@ -23441,7 +23431,7 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
  mkprep
  mkregtable
  mktables
-@@ -209,6 +218,7 @@ r300_reg_safe.h
+@@ -209,6 +220,7 @@ r300_reg_safe.h
  r420_reg_safe.h
  r600_reg_safe.h
  recordmcount
@@ -23449,7 +23439,7 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
  relocs
  rlim_names.h
  rn50_reg_safe.h
-@@ -219,6 +229,7 @@ setup
+@@ -219,6 +231,7 @@ setup
  setup.bin
  setup.elf
  sImage
@@ -23457,7 +23447,7 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
  sm_tbl*
  split-include
  syscalltab.h
-@@ -229,6 +240,7 @@ tftpboot.img
+@@ -229,6 +242,7 @@ tftpboot.img
  timeconst.h
  times.h*
  trix_boot.h
@@ -23465,7 +23455,7 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
  utsrelease.h*
  vdso-syms.lds
  vdso.lds
-@@ -246,7 +258,9 @@ vmlinux
+@@ -246,7 +260,9 @@ vmlinux
  vmlinux-*
  vmlinux.aout
  vmlinux.bin.all
@@ -23475,7 +23465,7 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
  vmlinuz
  voffset.h
  vsyscall.lds
-@@ -254,6 +268,7 @@ vsyscall_32.lds
+@@ -254,9 +270,11 @@ vsyscall_32.lds
  wanxlfw.inc
  uImage
  unifdef
@@ -23483,10 +23473,14 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
  wakeup.bin
  wakeup.elf
  wakeup.lds
-diff -urNp linux-3.0.9/Documentation/kernel-parameters.txt linux-3.0.9/Documentation/kernel-parameters.txt
---- linux-3.0.9/Documentation/kernel-parameters.txt	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/Documentation/kernel-parameters.txt	2011-11-15 20:02:59.000000000 -0500
-@@ -1883,6 +1883,13 @@ bytes respectively. Such letter suffixes
+ zImage*
+ zconf.hash.c
++zconf.lex.c
+ zoffset.h
+diff -urNp linux-3.1.1/Documentation/kernel-parameters.txt linux-3.1.1/Documentation/kernel-parameters.txt
+--- linux-3.1.1/Documentation/kernel-parameters.txt	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/Documentation/kernel-parameters.txt	2011-11-16 18:39:07.000000000 -0500
+@@ -1898,6 +1898,13 @@ bytes respectively. Such letter suffixes
  			the specified number of seconds.  This is to be used if
  			your oopses keep scrolling off the screen.
  
@@ -23500,9 +23494,9 @@ diff -urNp linux-3.0.9/Documentation/kernel-parameters.txt linux-3.0.9/Documenta
  	pcbit=		[HW,ISDN]
  
  	pcd.		[PARIDE]
-diff -urNp linux-3.0.9/drivers/acpi/apei/cper.c linux-3.0.9/drivers/acpi/apei/cper.c
---- linux-3.0.9/drivers/acpi/apei/cper.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/acpi/apei/cper.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/acpi/apei/cper.c linux-3.1.1/drivers/acpi/apei/cper.c
+--- linux-3.1.1/drivers/acpi/apei/cper.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/acpi/apei/cper.c	2011-11-16 18:39:07.000000000 -0500
 @@ -38,12 +38,12 @@
   */
  u64 cper_next_record_id(void)
@@ -23520,9 +23514,9 @@ diff -urNp linux-3.0.9/drivers/acpi/apei/cper.c linux-3.0.9/drivers/acpi/apei/cp
  }
  EXPORT_SYMBOL_GPL(cper_next_record_id);
  
-diff -urNp linux-3.0.9/drivers/acpi/ec_sys.c linux-3.0.9/drivers/acpi/ec_sys.c
---- linux-3.0.9/drivers/acpi/ec_sys.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/acpi/ec_sys.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/acpi/ec_sys.c linux-3.1.1/drivers/acpi/ec_sys.c
+--- linux-3.1.1/drivers/acpi/ec_sys.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/acpi/ec_sys.c	2011-11-16 18:39:07.000000000 -0500
 @@ -11,6 +11,7 @@
  #include <linux/kernel.h>
  #include <linux/acpi.h>
@@ -23572,9 +23566,9 @@ diff -urNp linux-3.0.9/drivers/acpi/ec_sys.c linux-3.0.9/drivers/acpi/ec_sys.c
  		err = ec_write(*off, byte_write);
  		if (err)
  			return err;
-diff -urNp linux-3.0.9/drivers/acpi/proc.c linux-3.0.9/drivers/acpi/proc.c
---- linux-3.0.9/drivers/acpi/proc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/acpi/proc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/acpi/proc.c linux-3.1.1/drivers/acpi/proc.c
+--- linux-3.1.1/drivers/acpi/proc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/acpi/proc.c	2011-11-16 18:39:07.000000000 -0500
 @@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f
  				size_t count, loff_t * ppos)
  {
@@ -23609,9 +23603,9 @@ diff -urNp linux-3.0.9/drivers/acpi/proc.c linux-3.0.9/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.9/drivers/acpi/processor_driver.c linux-3.0.9/drivers/acpi/processor_driver.c
---- linux-3.0.9/drivers/acpi/processor_driver.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/acpi/processor_driver.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/acpi/processor_driver.c linux-3.1.1/drivers/acpi/processor_driver.c
+--- linux-3.1.1/drivers/acpi/processor_driver.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/acpi/processor_driver.c	2011-11-16 18:39:07.000000000 -0500
 @@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(
  		return 0;
  #endif
@@ -23621,10 +23615,10 @@ diff -urNp linux-3.0.9/drivers/acpi/processor_driver.c linux-3.0.9/drivers/acpi/
  
  	/*
  	 * Buggy BIOS check
-diff -urNp linux-3.0.9/drivers/ata/libata-core.c linux-3.0.9/drivers/ata/libata-core.c
---- linux-3.0.9/drivers/ata/libata-core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ata/libata-core.c	2011-11-15 20:02:59.000000000 -0500
-@@ -4753,7 +4753,7 @@ void ata_qc_free(struct ata_queued_cmd *
+diff -urNp linux-3.1.1/drivers/ata/libata-core.c linux-3.1.1/drivers/ata/libata-core.c
+--- linux-3.1.1/drivers/ata/libata-core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ata/libata-core.c	2011-11-16 18:39:07.000000000 -0500
+@@ -4733,7 +4733,7 @@ void ata_qc_free(struct ata_queued_cmd *
  	struct ata_port *ap;
  	unsigned int tag;
  
@@ -23633,7 +23627,7 @@ diff -urNp linux-3.0.9/drivers/ata/libata-core.c linux-3.0.9/drivers/ata/libata-
  	ap = qc->ap;
  
  	qc->flags = 0;
-@@ -4769,7 +4769,7 @@ void __ata_qc_complete(struct ata_queued
+@@ -4749,7 +4749,7 @@ void __ata_qc_complete(struct ata_queued
  	struct ata_port *ap;
  	struct ata_link *link;
  
@@ -23642,7 +23636,7 @@ diff -urNp linux-3.0.9/drivers/ata/libata-core.c linux-3.0.9/drivers/ata/libata-
  	WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
  	ap = qc->ap;
  	link = qc->dev->link;
-@@ -5774,6 +5774,7 @@ static void ata_finalize_port_ops(struct
+@@ -5754,6 +5754,7 @@ static void ata_finalize_port_ops(struct
  		return;
  
  	spin_lock(&lock);
@@ -23650,7 +23644,7 @@ diff -urNp linux-3.0.9/drivers/ata/libata-core.c linux-3.0.9/drivers/ata/libata-
  
  	for (cur = ops->inherits; cur; cur = cur->inherits) {
  		void **inherit = (void **)cur;
-@@ -5787,8 +5788,9 @@ static void ata_finalize_port_ops(struct
+@@ -5767,8 +5768,9 @@ static void ata_finalize_port_ops(struct
  		if (IS_ERR(*pp))
  			*pp = NULL;
  
@@ -23661,10 +23655,10 @@ diff -urNp linux-3.0.9/drivers/ata/libata-core.c linux-3.0.9/drivers/ata/libata-
  	spin_unlock(&lock);
  }
  
-diff -urNp linux-3.0.9/drivers/ata/libata-eh.c linux-3.0.9/drivers/ata/libata-eh.c
---- linux-3.0.9/drivers/ata/libata-eh.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ata/libata-eh.c	2011-11-15 20:02:59.000000000 -0500
-@@ -2518,6 +2518,8 @@ void ata_eh_report(struct ata_port *ap)
+diff -urNp linux-3.1.1/drivers/ata/libata-eh.c linux-3.1.1/drivers/ata/libata-eh.c
+--- linux-3.1.1/drivers/ata/libata-eh.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ata/libata-eh.c	2011-11-16 18:40:10.000000000 -0500
+@@ -2515,6 +2515,8 @@ void ata_eh_report(struct ata_port *ap)
  {
  	struct ata_link *link;
  
@@ -23673,9 +23667,9 @@ diff -urNp linux-3.0.9/drivers/ata/libata-eh.c linux-3.0.9/drivers/ata/libata-eh
  	ata_for_each_link(link, ap, HOST_FIRST)
  		ata_eh_link_report(link);
  }
-diff -urNp linux-3.0.9/drivers/ata/pata_arasan_cf.c linux-3.0.9/drivers/ata/pata_arasan_cf.c
---- linux-3.0.9/drivers/ata/pata_arasan_cf.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ata/pata_arasan_cf.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ata/pata_arasan_cf.c linux-3.1.1/drivers/ata/pata_arasan_cf.c
+--- linux-3.1.1/drivers/ata/pata_arasan_cf.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ata/pata_arasan_cf.c	2011-11-16 18:39:07.000000000 -0500
 @@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str
  	/* Handle platform specific quirks */
  	if (pdata->quirk) {
@@ -23687,9 +23681,9 @@ diff -urNp linux-3.0.9/drivers/ata/pata_arasan_cf.c linux-3.0.9/drivers/ata/pata
  			ap->pio_mask = 0;
  		}
  		if (pdata->quirk & CF_BROKEN_MWDMA)
-diff -urNp linux-3.0.9/drivers/atm/adummy.c linux-3.0.9/drivers/atm/adummy.c
---- linux-3.0.9/drivers/atm/adummy.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/adummy.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/atm/adummy.c linux-3.1.1/drivers/atm/adummy.c
+--- linux-3.1.1/drivers/atm/adummy.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/adummy.c	2011-11-16 18:39:07.000000000 -0500
 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct 
  		vcc->pop(vcc, skb);
  	else
@@ -23699,9 +23693,9 @@ diff -urNp linux-3.0.9/drivers/atm/adummy.c linux-3.0.9/drivers/atm/adummy.c
  
  	return 0;
  }
-diff -urNp linux-3.0.9/drivers/atm/ambassador.c linux-3.0.9/drivers/atm/ambassador.c
---- linux-3.0.9/drivers/atm/ambassador.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/ambassador.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/atm/ambassador.c linux-3.1.1/drivers/atm/ambassador.c
+--- linux-3.1.1/drivers/atm/ambassador.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/ambassador.c	2011-11-16 18:39:07.000000000 -0500
 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, 
    PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
    
@@ -23729,7 +23723,7 @@ diff -urNp linux-3.0.9/drivers/atm/ambassador.c linux-3.0.9/drivers/atm/ambassad
        }
        
      } else {
-@@ -1342,7 +1342,7 @@ static int amb_send (struct atm_vcc * at
+@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * at
    }
    
    if (check_area (skb->data, skb->len)) {
@@ -23738,9 +23732,9 @@ diff -urNp linux-3.0.9/drivers/atm/ambassador.c linux-3.0.9/drivers/atm/ambassad
      return -ENOMEM; // ?
    }
    
-diff -urNp linux-3.0.9/drivers/atm/atmtcp.c linux-3.0.9/drivers/atm/atmtcp.c
---- linux-3.0.9/drivers/atm/atmtcp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/atmtcp.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/atm/atmtcp.c linux-3.1.1/drivers/atm/atmtcp.c
+--- linux-3.1.1/drivers/atm/atmtcp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/atmtcp.c	2011-11-16 18:39:07.000000000 -0500
 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc 
  		if (vcc->pop) vcc->pop(vcc,skb);
  		else dev_kfree_skb(skb);
@@ -23790,9 +23784,9 @@ diff -urNp linux-3.0.9/drivers/atm/atmtcp.c linux-3.0.9/drivers/atm/atmtcp.c
  done:
  	if (vcc->pop) vcc->pop(vcc,skb);
  	else dev_kfree_skb(skb);
-diff -urNp linux-3.0.9/drivers/atm/eni.c linux-3.0.9/drivers/atm/eni.c
---- linux-3.0.9/drivers/atm/eni.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/eni.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/atm/eni.c linux-3.1.1/drivers/atm/eni.c
+--- linux-3.1.1/drivers/atm/eni.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/eni.c	2011-11-16 18:39:07.000000000 -0500
 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
  		DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
  		    vcc->dev->number);
@@ -23847,10 +23841,10 @@ diff -urNp linux-3.0.9/drivers/atm/eni.c linux-3.0.9/drivers/atm/eni.c
      "MMF", "SMF", "MMF", "03?", /*  0- 3 */
      "UTP", "05?", "06?", "07?", /*  4- 7 */
      "TAXI","09?", "10?", "11?", /*  8-11 */
-diff -urNp linux-3.0.9/drivers/atm/firestream.c linux-3.0.9/drivers/atm/firestream.c
---- linux-3.0.9/drivers/atm/firestream.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/firestream.c	2011-11-15 20:02:59.000000000 -0500
-@@ -749,7 +749,7 @@ static void process_txdone_queue (struct
+diff -urNp linux-3.1.1/drivers/atm/firestream.c linux-3.1.1/drivers/atm/firestream.c
+--- linux-3.1.1/drivers/atm/firestream.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/firestream.c	2011-11-16 18:39:07.000000000 -0500
+@@ -750,7 +750,7 @@ static void process_txdone_queue (struct
  				}
  			}
  
@@ -23859,7 +23853,7 @@ diff -urNp linux-3.0.9/drivers/atm/firestream.c linux-3.0.9/drivers/atm/firestre
  
  			fs_dprintk (FS_DEBUG_TXMEM, "i");
  			fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
-@@ -816,7 +816,7 @@ static void process_incoming (struct fs_
+@@ -817,7 +817,7 @@ static void process_incoming (struct fs_
  #endif
  				skb_put (skb, qe->p1 & 0xffff); 
  				ATM_SKB(skb)->vcc = atm_vcc;
@@ -23868,7 +23862,7 @@ diff -urNp linux-3.0.9/drivers/atm/firestream.c linux-3.0.9/drivers/atm/firestre
  				__net_timestamp(skb);
  				fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
  				atm_vcc->push (atm_vcc, skb);
-@@ -837,12 +837,12 @@ static void process_incoming (struct fs_
+@@ -838,12 +838,12 @@ static void process_incoming (struct fs_
  				kfree (pe);
  			}
  			if (atm_vcc)
@@ -23883,9 +23877,9 @@ diff -urNp linux-3.0.9/drivers/atm/firestream.c linux-3.0.9/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.9/drivers/atm/fore200e.c linux-3.0.9/drivers/atm/fore200e.c
---- linux-3.0.9/drivers/atm/fore200e.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/fore200e.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/atm/fore200e.c linux-3.1.1/drivers/atm/fore200e.c
+--- linux-3.1.1/drivers/atm/fore200e.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/fore200e.c	2011-11-16 18:39:07.000000000 -0500
 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
  #endif
  		/* check error condition */
@@ -23942,9 +23936,9 @@ diff -urNp linux-3.0.9/drivers/atm/fore200e.c linux-3.0.9/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.9/drivers/atm/he.c linux-3.0.9/drivers/atm/he.c
---- linux-3.0.9/drivers/atm/he.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/he.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/atm/he.c linux-3.1.1/drivers/atm/he.c
+--- linux-3.1.1/drivers/atm/he.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/he.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  
  		if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -24026,10 +24020,10 @@ diff -urNp linux-3.0.9/drivers/atm/he.c linux-3.0.9/drivers/atm/he.c
  
  	return 0;
  }
-diff -urNp linux-3.0.9/drivers/atm/horizon.c linux-3.0.9/drivers/atm/horizon.c
---- linux-3.0.9/drivers/atm/horizon.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/horizon.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, 
+diff -urNp linux-3.1.1/drivers/atm/horizon.c linux-3.1.1/drivers/atm/horizon.c
+--- linux-3.1.1/drivers/atm/horizon.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/horizon.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1035,7 +1035,7 @@ static void rx_schedule (hrz_dev * dev, 
  	{
  	  struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
  	  // VC layer stats
@@ -24038,7 +24032,7 @@ diff -urNp linux-3.0.9/drivers/atm/horizon.c linux-3.0.9/drivers/atm/horizon.c
  	  __net_timestamp(skb);
  	  // end of our responsibility
  	  vcc->push (vcc, skb);
-@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const
+@@ -1187,7 +1187,7 @@ static void tx_schedule (hrz_dev * const
  	dev->tx_iovec = NULL;
  	
  	// VC layer stats
@@ -24047,10 +24041,10 @@ diff -urNp linux-3.0.9/drivers/atm/horizon.c linux-3.0.9/drivers/atm/horizon.c
  	
  	// free the skb
  	hrz_kfree_skb (skb);
-diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
---- linux-3.0.9/drivers/atm/idt77252.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/idt77252.c	2011-11-15 20:02:59.000000000 -0500
-@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
+diff -urNp linux-3.1.1/drivers/atm/idt77252.c linux-3.1.1/drivers/atm/idt77252.c
+--- linux-3.1.1/drivers/atm/idt77252.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/idt77252.c	2011-11-16 18:39:07.000000000 -0500
+@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, str
  		else
  			dev_kfree_skb(skb);
  
@@ -24059,7 +24053,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  	}
  
  	atomic_dec(&scq->used);
-@@ -1074,13 +1074,13 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, st
  			if ((sb = dev_alloc_skb(64)) == NULL) {
  				printk("%s: Can't allocate buffers for aal0.\n",
  				       card->name);
@@ -24075,7 +24069,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  				dev_kfree_skb(sb);
  				break;
  			}
-@@ -1097,7 +1097,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, st
  			ATM_SKB(sb)->vcc = vcc;
  			__net_timestamp(sb);
  			vcc->push(vcc, sb);
@@ -24084,7 +24078,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  
  			cell += ATM_CELL_PAYLOAD;
  		}
-@@ -1134,13 +1134,13 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, st
  			         "(CDC: %08x)\n",
  			         card->name, len, rpp->len, readl(SAR_REG_CDC));
  			recycle_rx_pool_skb(card, rpp);
@@ -24100,7 +24094,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  			return;
  		}
  		if (skb_queue_len(&rpp->queue) > 1) {
-@@ -1151,7 +1151,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, st
  				RXPRINTK("%s: Can't alloc RX skb.\n",
  					 card->name);
  				recycle_rx_pool_skb(card, rpp);
@@ -24109,7 +24103,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  				return;
  			}
  			if (!atm_charge(vcc, skb->truesize)) {
-@@ -1170,7 +1170,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, st
  			__net_timestamp(skb);
  
  			vcc->push(vcc, skb);
@@ -24118,7 +24112,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  
  			return;
  		}
-@@ -1192,7 +1192,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, st
  		__net_timestamp(skb);
  
  		vcc->push(vcc, skb);
@@ -24127,7 +24121,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  
  		if (skb->truesize > SAR_FB_SIZE_3)
  			add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
-@@ -1303,14 +1303,14 @@ idt77252_rx_raw(struct idt77252_dev *car
+@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *car
  		if (vcc->qos.aal != ATM_AAL0) {
  			RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
  				card->name, vpi, vci);
@@ -24144,7 +24138,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  			goto drop;
  		}
  
-@@ -1329,7 +1329,7 @@ idt77252_rx_raw(struct idt77252_dev *car
+@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *car
  		ATM_SKB(sb)->vcc = vcc;
  		__net_timestamp(sb);
  		vcc->push(vcc, sb);
@@ -24153,7 +24147,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  
  drop:
  		skb_pull(queue, 64);
-@@ -1954,13 +1954,13 @@ idt77252_send_skb(struct atm_vcc *vcc, s
+@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, s
  
  	if (vc == NULL) {
  		printk("%s: NULL connection in send().\n", card->name);
@@ -24169,7 +24163,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  		dev_kfree_skb(skb);
  		return -EINVAL;
  	}
-@@ -1972,14 +1972,14 @@ idt77252_send_skb(struct atm_vcc *vcc, s
+@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, s
  		break;
  	default:
  		printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
@@ -24186,7 +24180,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  		dev_kfree_skb(skb);
  		return -EINVAL;
  	}
-@@ -1987,7 +1987,7 @@ idt77252_send_skb(struct atm_vcc *vcc, s
+@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, s
  
  	err = queue_skb(card, vc, skb, oam);
  	if (err) {
@@ -24195,7 +24189,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  		dev_kfree_skb(skb);
  		return err;
  	}
-@@ -2010,7 +2010,7 @@ idt77252_send_oam(struct atm_vcc *vcc, v
+@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, v
  	skb = dev_alloc_skb(64);
  	if (!skb) {
  		printk("%s: Out of memory in send_oam().\n", card->name);
@@ -24204,10 +24198,10 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
  		return -ENOMEM;
  	}
  	atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-3.0.9/drivers/atm/iphase.c linux-3.0.9/drivers/atm/iphase.c
---- linux-3.0.9/drivers/atm/iphase.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/iphase.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1120,7 +1120,7 @@ static int rx_pkt(struct atm_dev *dev)  
+diff -urNp linux-3.1.1/drivers/atm/iphase.c linux-3.1.1/drivers/atm/iphase.c
+--- linux-3.1.1/drivers/atm/iphase.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/iphase.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1121,7 +1121,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))  
  	{  
@@ -24216,7 +24210,7 @@ diff -urNp linux-3.0.9/drivers/atm/iphase.c linux-3.0.9/drivers/atm/iphase.c
  		IF_ERR(printk("IA: bad packet, dropping it");)  
                  if (status & RX_CER) { 
                      IF_ERR(printk(" cause: packet CRC error\n");)
-@@ -1143,7 +1143,7 @@ static int rx_pkt(struct atm_dev *dev)  
+@@ -1144,7 +1144,7 @@ static int rx_pkt(struct atm_dev *dev)  
  	len = dma_addr - buf_addr;  
          if (len > iadev->rx_buf_sz) {
             printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
@@ -24225,7 +24219,7 @@ diff -urNp linux-3.0.9/drivers/atm/iphase.c linux-3.0.9/drivers/atm/iphase.c
  	   goto out_free_desc;
          }
  		  
-@@ -1293,7 +1293,7 @@ static void rx_dle_intr(struct atm_dev *
+@@ -1294,7 +1294,7 @@ static void rx_dle_intr(struct atm_dev *
            ia_vcc = INPH_IA_VCC(vcc);
            if (ia_vcc == NULL)
            {
@@ -24234,7 +24228,7 @@ diff -urNp linux-3.0.9/drivers/atm/iphase.c linux-3.0.9/drivers/atm/iphase.c
               dev_kfree_skb_any(skb);
               atm_return(vcc, atm_guess_pdu2truesize(len));
               goto INCR_DLE;
-@@ -1305,7 +1305,7 @@ static void rx_dle_intr(struct atm_dev *
+@@ -1306,7 +1306,7 @@ static void rx_dle_intr(struct atm_dev *
            if ((length > iadev->rx_buf_sz) || (length > 
                                (skb->len - sizeof(struct cpcs_trailer))))
            {
@@ -24243,7 +24237,7 @@ diff -urNp linux-3.0.9/drivers/atm/iphase.c linux-3.0.9/drivers/atm/iphase.c
               IF_ERR(printk("rx_dle_intr: Bad  AAL5 trailer %d (skb len %d)", 
                                                              length, skb->len);)
               dev_kfree_skb_any(skb);
-@@ -1321,7 +1321,7 @@ static void rx_dle_intr(struct atm_dev *
+@@ -1322,7 +1322,7 @@ static void rx_dle_intr(struct atm_dev *
  
  	  IF_RX(printk("rx_dle_intr: skb push");)  
  	  vcc->push(vcc,skb);  
@@ -24252,7 +24246,7 @@ diff -urNp linux-3.0.9/drivers/atm/iphase.c linux-3.0.9/drivers/atm/iphase.c
            iadev->rx_pkt_cnt++;
        }  
  INCR_DLE:
-@@ -2801,15 +2801,15 @@ static int ia_ioctl(struct atm_dev *dev,
+@@ -2802,15 +2802,15 @@ static int ia_ioctl(struct atm_dev *dev,
           {
               struct k_sonet_stats *stats;
               stats = &PRIV(_ia_dev[board])->sonet_stats;
@@ -24277,7 +24271,7 @@ diff -urNp linux-3.0.9/drivers/atm/iphase.c linux-3.0.9/drivers/atm/iphase.c
           }
              ia_cmds.status = 0;
              break;
-@@ -2914,7 +2914,7 @@ static int ia_pkt_tx (struct atm_vcc *vc
+@@ -2915,7 +2915,7 @@ static int ia_pkt_tx (struct atm_vcc *vc
  	if ((desc == 0) || (desc > iadev->num_tx_desc))  
  	{  
  		IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);) 
@@ -24286,7 +24280,7 @@ diff -urNp linux-3.0.9/drivers/atm/iphase.c linux-3.0.9/drivers/atm/iphase.c
  		if (vcc->pop)   
  		    vcc->pop(vcc, skb);   
  		else  
-@@ -3019,14 +3019,14 @@ static int ia_pkt_tx (struct atm_vcc *vc
+@@ -3020,14 +3020,14 @@ static int ia_pkt_tx (struct atm_vcc *vc
          ATM_DESC(skb) = vcc->vci;
          skb_queue_tail(&iadev->tx_dma_q, skb);
  
@@ -24303,9 +24297,9 @@ diff -urNp linux-3.0.9/drivers/atm/iphase.c linux-3.0.9/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.9/drivers/atm/lanai.c linux-3.0.9/drivers/atm/lanai.c
---- linux-3.0.9/drivers/atm/lanai.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/lanai.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/atm/lanai.c linux-3.1.1/drivers/atm/lanai.c
+--- linux-3.1.1/drivers/atm/lanai.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/lanai.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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);
@@ -24360,9 +24354,9 @@ diff -urNp linux-3.0.9/drivers/atm/lanai.c linux-3.0.9/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.9/drivers/atm/nicstar.c linux-3.0.9/drivers/atm/nicstar.c
---- linux-3.0.9/drivers/atm/nicstar.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/nicstar.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/atm/nicstar.c linux-3.1.1/drivers/atm/nicstar.c
+--- linux-3.1.1/drivers/atm/nicstar.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/nicstar.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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",
@@ -24564,9 +24558,9 @@ diff -urNp linux-3.0.9/drivers/atm/nicstar.c linux-3.0.9/drivers/atm/nicstar.c
  			}
  		}
  
-diff -urNp linux-3.0.9/drivers/atm/solos-pci.c linux-3.0.9/drivers/atm/solos-pci.c
---- linux-3.0.9/drivers/atm/solos-pci.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/solos-pci.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/atm/solos-pci.c linux-3.1.1/drivers/atm/solos-pci.c
+--- linux-3.1.1/drivers/atm/solos-pci.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/solos-pci.c	2011-11-16 18:40:10.000000000 -0500
 @@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
  				}
  				atm_charge(vcc, skb->truesize);
@@ -24594,9 +24588,9 @@ diff -urNp linux-3.0.9/drivers/atm/solos-pci.c linux-3.0.9/drivers/atm/solos-pci
  				solos_pop(vcc, oldskb);
  			} else
  				dev_kfree_skb_irq(oldskb);
-diff -urNp linux-3.0.9/drivers/atm/suni.c linux-3.0.9/drivers/atm/suni.c
---- linux-3.0.9/drivers/atm/suni.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/suni.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/atm/suni.c linux-3.1.1/drivers/atm/suni.c
+--- linux-3.1.1/drivers/atm/suni.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/suni.c	2011-11-16 18:39:07.000000000 -0500
 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
@@ -24608,9 +24602,9 @@ diff -urNp linux-3.0.9/drivers/atm/suni.c linux-3.0.9/drivers/atm/suni.c
  
  
  static void suni_hz(unsigned long from_timer)
-diff -urNp linux-3.0.9/drivers/atm/uPD98402.c linux-3.0.9/drivers/atm/uPD98402.c
---- linux-3.0.9/drivers/atm/uPD98402.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/uPD98402.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/atm/uPD98402.c linux-3.1.1/drivers/atm/uPD98402.c
+--- linux-3.1.1/drivers/atm/uPD98402.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/uPD98402.c	2011-11-16 18:39:07.000000000 -0500
 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
  	struct sonet_stats tmp;
   	int error = 0;
@@ -24655,10 +24649,10 @@ diff -urNp linux-3.0.9/drivers/atm/uPD98402.c linux-3.0.9/drivers/atm/uPD98402.c
  	return 0;
  }
  
-diff -urNp linux-3.0.9/drivers/atm/zatm.c linux-3.0.9/drivers/atm/zatm.c
---- linux-3.0.9/drivers/atm/zatm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/zatm.c	2011-11-15 20:02:59.000000000 -0500
-@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
+diff -urNp linux-3.1.1/drivers/atm/zatm.c linux-3.1.1/drivers/atm/zatm.c
+--- linux-3.1.1/drivers/atm/zatm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/zatm.c	2011-11-16 18:39:07.000000000 -0500
+@@ -460,7 +460,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
  		}
  		if (!size) {
  			dev_kfree_skb_irq(skb);
@@ -24667,7 +24661,7 @@ diff -urNp linux-3.0.9/drivers/atm/zatm.c linux-3.0.9/drivers/atm/zatm.c
  			continue;
  		}
  		if (!atm_charge(vcc,skb->truesize)) {
-@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
+@@ -470,7 +470,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
  		skb->len = size;
  		ATM_SKB(skb)->vcc = vcc;
  		vcc->push(vcc,skb);
@@ -24676,7 +24670,7 @@ diff -urNp linux-3.0.9/drivers/atm/zatm.c linux-3.0.9/drivers/atm/zatm.c
  	}
  	zout(pos & 0xffff,MTA(mbx));
  #if 0 /* probably a stupid idea */
-@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD
+@@ -734,7 +734,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD
  			skb_queue_head(&zatm_vcc->backlog,skb);
  			break;
  		}
@@ -24685,11 +24679,11 @@ diff -urNp linux-3.0.9/drivers/atm/zatm.c linux-3.0.9/drivers/atm/zatm.c
  	wake_up(&zatm_vcc->tx_wait);
  }
  
-diff -urNp linux-3.0.9/drivers/base/devtmpfs.c linux-3.0.9/drivers/base/devtmpfs.c
---- linux-3.0.9/drivers/base/devtmpfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/base/devtmpfs.c	2011-11-15 20:02:59.000000000 -0500
-@@ -357,7 +357,7 @@ int devtmpfs_mount(const char *mntdir)
- 	if (!dev_mnt)
+diff -urNp linux-3.1.1/drivers/base/devtmpfs.c linux-3.1.1/drivers/base/devtmpfs.c
+--- linux-3.1.1/drivers/base/devtmpfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/base/devtmpfs.c	2011-11-16 18:39:07.000000000 -0500
+@@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
+ 	if (!thread)
  		return 0;
  
 -	err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
@@ -24697,9 +24691,9 @@ diff -urNp linux-3.0.9/drivers/base/devtmpfs.c linux-3.0.9/drivers/base/devtmpfs
  	if (err)
  		printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
  	else
-diff -urNp linux-3.0.9/drivers/base/power/wakeup.c linux-3.0.9/drivers/base/power/wakeup.c
---- linux-3.0.9/drivers/base/power/wakeup.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/base/power/wakeup.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/base/power/wakeup.c linux-3.1.1/drivers/base/power/wakeup.c
+--- linux-3.1.1/drivers/base/power/wakeup.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/base/power/wakeup.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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.
@@ -24735,9 +24729,9 @@ diff -urNp linux-3.0.9/drivers/base/power/wakeup.c linux-3.0.9/drivers/base/powe
  }
  
  /**
-diff -urNp linux-3.0.9/drivers/block/cciss.c linux-3.0.9/drivers/block/cciss.c
---- linux-3.0.9/drivers/block/cciss.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/cciss.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/block/cciss.c linux-3.1.1/drivers/block/cciss.c
+--- linux-3.1.1/drivers/block/cciss.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/cciss.c	2011-11-16 18:40:10.000000000 -0500
 @@ -1179,6 +1179,8 @@ static int cciss_ioctl32_passthru(struct
  	int err;
  	u32 cp;
@@ -24861,9 +24855,9 @@ diff -urNp linux-3.0.9/drivers/block/cciss.c linux-3.0.9/drivers/block/cciss.c
  	free_irq(h->intr[PERF_MODE_INT], h);
  }
  
-diff -urNp linux-3.0.9/drivers/block/cciss.h linux-3.0.9/drivers/block/cciss.h
---- linux-3.0.9/drivers/block/cciss.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/cciss.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/block/cciss.h linux-3.1.1/drivers/block/cciss.h
+--- linux-3.1.1/drivers/block/cciss.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/cciss.h	2011-11-16 18:39:07.000000000 -0500
 @@ -100,7 +100,7 @@ struct ctlr_info
  	/* information about each logical volume */
  	drive_info_struct *drv[CISS_MAX_LUN];
@@ -24873,9 +24867,9 @@ diff -urNp linux-3.0.9/drivers/block/cciss.h linux-3.0.9/drivers/block/cciss.h
  
  	/* queue and queue Info */ 
  	struct list_head reqQ;
-diff -urNp linux-3.0.9/drivers/block/cpqarray.c linux-3.0.9/drivers/block/cpqarray.c
---- linux-3.0.9/drivers/block/cpqarray.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/cpqarray.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/block/cpqarray.c linux-3.1.1/drivers/block/cpqarray.c
+--- linux-3.1.1/drivers/block/cpqarray.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/cpqarray.c	2011-11-16 18:40:10.000000000 -0500
 @@ -404,7 +404,7 @@ static int __devinit cpqarray_register_c
  	if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
  		goto Enomem4;
@@ -25001,9 +24995,9 @@ diff -urNp linux-3.0.9/drivers/block/cpqarray.c linux-3.0.9/drivers/block/cpqarr
  		if (done == 0) {
  			udelay(10);	/* a short fixed delay */
  		} else
-diff -urNp linux-3.0.9/drivers/block/cpqarray.h linux-3.0.9/drivers/block/cpqarray.h
---- linux-3.0.9/drivers/block/cpqarray.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/cpqarray.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/block/cpqarray.h linux-3.1.1/drivers/block/cpqarray.h
+--- linux-3.1.1/drivers/block/cpqarray.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/cpqarray.h	2011-11-16 18:39:07.000000000 -0500
 @@ -99,7 +99,7 @@ struct ctlr_info {
  	drv_info_t	drv[NWD];
  	struct proc_dir_entry *proc;
@@ -25013,9 +25007,9 @@ diff -urNp linux-3.0.9/drivers/block/cpqarray.h linux-3.0.9/drivers/block/cpqarr
  
  	cmdlist_t *reqQ;
  	cmdlist_t *cmpQ;
-diff -urNp linux-3.0.9/drivers/block/DAC960.c linux-3.0.9/drivers/block/DAC960.c
---- linux-3.0.9/drivers/block/DAC960.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/DAC960.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/block/DAC960.c linux-3.1.1/drivers/block/DAC960.c
+--- linux-3.1.1/drivers/block/DAC960.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/DAC960.c	2011-11-16 18:40:10.000000000 -0500
 @@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur
    unsigned long flags;
    int Channel, TargetID;
@@ -25025,9 +25019,9 @@ diff -urNp linux-3.0.9/drivers/block/DAC960.c linux-3.0.9/drivers/block/DAC960.c
    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.9/drivers/block/drbd/drbd_int.h linux-3.0.9/drivers/block/drbd/drbd_int.h
---- linux-3.0.9/drivers/block/drbd/drbd_int.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/drbd/drbd_int.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/block/drbd/drbd_int.h linux-3.1.1/drivers/block/drbd/drbd_int.h
+--- linux-3.1.1/drivers/block/drbd/drbd_int.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/drbd/drbd_int.h	2011-11-16 18:39:07.000000000 -0500
 @@ -737,7 +737,7 @@ struct drbd_request;
  struct drbd_epoch {
  	struct list_head list;
@@ -25085,9 +25079,9 @@ diff -urNp linux-3.0.9/drivers/block/drbd/drbd_int.h linux-3.0.9/drivers/block/d
  }
  
  void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
-diff -urNp linux-3.0.9/drivers/block/drbd/drbd_main.c linux-3.0.9/drivers/block/drbd/drbd_main.c
---- linux-3.0.9/drivers/block/drbd/drbd_main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/drbd/drbd_main.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/block/drbd/drbd_main.c linux-3.1.1/drivers/block/drbd/drbd_main.c
+--- linux-3.1.1/drivers/block/drbd/drbd_main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/drbd/drbd_main.c	2011-11-16 18:39:07.000000000 -0500
 @@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_co
  	p.sector   = sector;
  	p.block_id = block_id;
@@ -25126,9 +25120,9 @@ diff -urNp linux-3.0.9/drivers/block/drbd/drbd_main.c linux-3.0.9/drivers/block/
  	mdev->al_writ_cnt  =
  	mdev->bm_writ_cnt  =
  	mdev->read_cnt     =
-diff -urNp linux-3.0.9/drivers/block/drbd/drbd_nl.c linux-3.0.9/drivers/block/drbd/drbd_nl.c
---- linux-3.0.9/drivers/block/drbd/drbd_nl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/drbd/drbd_nl.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/block/drbd/drbd_nl.c linux-3.1.1/drivers/block/drbd/drbd_nl.c
+--- linux-3.1.1/drivers/block/drbd/drbd_nl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/drbd/drbd_nl.c	2011-11-16 18:39:07.000000000 -0500
 @@ -2359,7 +2359,7 @@ static void drbd_connector_callback(stru
  	module_put(THIS_MODULE);
  }
@@ -25174,9 +25168,9 @@ diff -urNp linux-3.0.9/drivers/block/drbd/drbd_nl.c linux-3.0.9/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.9/drivers/block/drbd/drbd_receiver.c linux-3.0.9/drivers/block/drbd/drbd_receiver.c
---- linux-3.0.9/drivers/block/drbd/drbd_receiver.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/drbd/drbd_receiver.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/block/drbd/drbd_receiver.c linux-3.1.1/drivers/block/drbd/drbd_receiver.c
+--- linux-3.1.1/drivers/block/drbd/drbd_receiver.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/drbd/drbd_receiver.c	2011-11-16 18:39:07.000000000 -0500
 @@ -894,7 +894,7 @@ retry:
  	sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
  	sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
@@ -25262,9 +25256,9 @@ diff -urNp linux-3.0.9/drivers/block/drbd/drbd_receiver.c linux-3.0.9/drivers/bl
  	D_ASSERT(list_empty(&mdev->current_epoch->list));
  }
  
-diff -urNp linux-3.0.9/drivers/block/loop.c linux-3.0.9/drivers/block/loop.c
---- linux-3.0.9/drivers/block/loop.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/loop.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/block/loop.c linux-3.1.1/drivers/block/loop.c
+--- linux-3.1.1/drivers/block/loop.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/loop.c	2011-11-16 18:39:07.000000000 -0500
 @@ -283,7 +283,7 @@ static int __do_lo_send_write(struct fil
  	mm_segment_t old_fs = get_fs();
  
@@ -25274,9 +25268,9 @@ diff -urNp linux-3.0.9/drivers/block/loop.c linux-3.0.9/drivers/block/loop.c
  	set_fs(old_fs);
  	if (likely(bw == len))
  		return 0;
-diff -urNp linux-3.0.9/drivers/block/nbd.c linux-3.0.9/drivers/block/nbd.c
---- linux-3.0.9/drivers/block/nbd.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/nbd.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/block/nbd.c linux-3.1.1/drivers/block/nbd.c
+--- linux-3.1.1/drivers/block/nbd.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/nbd.c	2011-11-16 18:40:10.000000000 -0500
 @@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device *
  	struct kvec iov;
  	sigset_t blocked, oldset;
@@ -25295,9 +25289,9 @@ diff -urNp linux-3.0.9/drivers/block/nbd.c linux-3.0.9/drivers/block/nbd.c
  	switch (cmd) {
  	case NBD_DISCONNECT: {
  		struct request sreq;
-diff -urNp linux-3.0.9/drivers/char/agp/frontend.c linux-3.0.9/drivers/char/agp/frontend.c
---- linux-3.0.9/drivers/char/agp/frontend.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/agp/frontend.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/agp/frontend.c linux-3.1.1/drivers/char/agp/frontend.c
+--- linux-3.1.1/drivers/char/agp/frontend.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/agp/frontend.c	2011-11-16 18:39:07.000000000 -0500
 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
  	if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
  		return -EFAULT;
@@ -25307,9 +25301,9 @@ diff -urNp linux-3.0.9/drivers/char/agp/frontend.c linux-3.0.9/drivers/char/agp/
  		return -EFAULT;
  
  	client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-3.0.9/drivers/char/briq_panel.c linux-3.0.9/drivers/char/briq_panel.c
---- linux-3.0.9/drivers/char/briq_panel.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/briq_panel.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/briq_panel.c linux-3.1.1/drivers/char/briq_panel.c
+--- linux-3.1.1/drivers/char/briq_panel.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/briq_panel.c	2011-11-16 18:40:10.000000000 -0500
 @@ -9,6 +9,7 @@
  #include <linux/types.h>
  #include <linux/errno.h>
@@ -25351,9 +25345,9 @@ diff -urNp linux-3.0.9/drivers/char/briq_panel.c linux-3.0.9/drivers/char/briq_p
  
  	return len;
  }
-diff -urNp linux-3.0.9/drivers/char/genrtc.c linux-3.0.9/drivers/char/genrtc.c
---- linux-3.0.9/drivers/char/genrtc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/genrtc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/genrtc.c linux-3.1.1/drivers/char/genrtc.c
+--- linux-3.1.1/drivers/char/genrtc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/genrtc.c	2011-11-16 18:40:10.000000000 -0500
 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi
  	switch (cmd) {
  
@@ -25362,9 +25356,9 @@ diff -urNp linux-3.0.9/drivers/char/genrtc.c linux-3.0.9/drivers/char/genrtc.c
  	    if (get_rtc_pll(&pll))
  	 	    return -EINVAL;
  	    else
-diff -urNp linux-3.0.9/drivers/char/hpet.c linux-3.0.9/drivers/char/hpet.c
---- linux-3.0.9/drivers/char/hpet.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/hpet.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/hpet.c linux-3.1.1/drivers/char/hpet.c
+--- linux-3.1.1/drivers/char/hpet.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/hpet.c	2011-11-16 18:39:07.000000000 -0500
 @@ -572,7 +572,7 @@ static inline unsigned long hpet_time_di
  }
  
@@ -25374,9 +25368,9 @@ diff -urNp linux-3.0.9/drivers/char/hpet.c linux-3.0.9/drivers/char/hpet.c
  		  struct hpet_info *info)
  {
  	struct hpet_timer __iomem *timer;
-diff -urNp linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c
---- linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/ipmi/ipmi_msghandler.c linux-3.1.1/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-3.1.1/drivers/char/ipmi/ipmi_msghandler.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/ipmi/ipmi_msghandler.c	2011-11-16 18:40:10.000000000 -0500
 @@ -415,7 +415,7 @@ struct ipmi_smi {
  	struct proc_dir_entry *proc_dir;
  	char                  proc_dir_name[10];
@@ -25416,9 +25410,9 @@ diff -urNp linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.9/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.9/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c
---- linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/ipmi/ipmi_si_intf.c linux-3.1.1/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-3.1.1/drivers/char/ipmi/ipmi_si_intf.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/ipmi/ipmi_si_intf.c	2011-11-16 18:39:07.000000000 -0500
 @@ -277,7 +277,7 @@ struct smi_info {
  	unsigned char slave_addr;
  
@@ -25449,9 +25443,9 @@ diff -urNp linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.9/drivers/char
  
  	new_smi->interrupt_disabled = 1;
  	atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-3.0.9/drivers/char/Kconfig linux-3.0.9/drivers/char/Kconfig
---- linux-3.0.9/drivers/char/Kconfig	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/Kconfig	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/Kconfig linux-3.1.1/drivers/char/Kconfig
+--- linux-3.1.1/drivers/char/Kconfig	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/Kconfig	2011-11-16 18:40:10.000000000 -0500
 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
  
  config DEVKMEM
@@ -25470,9 +25464,9 @@ diff -urNp linux-3.0.9/drivers/char/Kconfig linux-3.0.9/drivers/char/Kconfig
  	default y
  
  source "drivers/s390/char/Kconfig"
-diff -urNp linux-3.0.9/drivers/char/mbcs.c linux-3.0.9/drivers/char/mbcs.c
---- linux-3.0.9/drivers/char/mbcs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/mbcs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/mbcs.c linux-3.1.1/drivers/char/mbcs.c
+--- linux-3.1.1/drivers/char/mbcs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/mbcs.c	2011-11-16 18:39:07.000000000 -0500
 @@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *de
  	return 0;
  }
@@ -25482,9 +25476,9 @@ diff -urNp linux-3.0.9/drivers/char/mbcs.c linux-3.0.9/drivers/char/mbcs.c
  	{
  	 .part_num = MBCS_PART_NUM,
  	 .mfg_num = MBCS_MFG_NUM,
-diff -urNp linux-3.0.9/drivers/char/mem.c linux-3.0.9/drivers/char/mem.c
---- linux-3.0.9/drivers/char/mem.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/mem.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/mem.c linux-3.1.1/drivers/char/mem.c
+--- linux-3.1.1/drivers/char/mem.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/mem.c	2011-11-16 18:40:10.000000000 -0500
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -25617,10 +25611,10 @@ diff -urNp linux-3.0.9/drivers/char/mem.c linux-3.0.9/drivers/char/mem.c
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-3.0.9/drivers/char/nvram.c linux-3.0.9/drivers/char/nvram.c
---- linux-3.0.9/drivers/char/nvram.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/nvram.c	2011-11-15 20:02:59.000000000 -0500
-@@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
+diff -urNp linux-3.1.1/drivers/char/nvram.c linux-3.1.1/drivers/char/nvram.c
+--- linux-3.1.1/drivers/char/nvram.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/nvram.c	2011-11-16 18:39:07.000000000 -0500
+@@ -248,7 +248,7 @@ static ssize_t nvram_read(struct file *f
  
  	spin_unlock_irq(&rtc_lock);
  
@@ -25629,9 +25623,9 @@ diff -urNp linux-3.0.9/drivers/char/nvram.c linux-3.0.9/drivers/char/nvram.c
  		return -EFAULT;
  
  	*ppos = i;
-diff -urNp linux-3.0.9/drivers/char/random.c linux-3.0.9/drivers/char/random.c
---- linux-3.0.9/drivers/char/random.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/random.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/random.c linux-3.1.1/drivers/char/random.c
+--- linux-3.1.1/drivers/char/random.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/random.c	2011-11-16 18:40:10.000000000 -0500
 @@ -261,8 +261,13 @@
  /*
   * Configuration information
@@ -25682,9 +25676,9 @@ diff -urNp linux-3.0.9/drivers/char/random.c linux-3.0.9/drivers/char/random.c
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff -urNp linux-3.0.9/drivers/char/sonypi.c linux-3.0.9/drivers/char/sonypi.c
---- linux-3.0.9/drivers/char/sonypi.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/sonypi.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/sonypi.c linux-3.1.1/drivers/char/sonypi.c
+--- linux-3.1.1/drivers/char/sonypi.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/sonypi.c	2011-11-16 18:39:07.000000000 -0500
 @@ -55,6 +55,7 @@
  #include <asm/uaccess.h>
  #include <asm/io.h>
@@ -25723,9 +25717,9 @@ diff -urNp linux-3.0.9/drivers/char/sonypi.c linux-3.0.9/drivers/char/sonypi.c
  	mutex_unlock(&sonypi_device.lock);
  
  	return 0;
-diff -urNp linux-3.0.9/drivers/char/tpm/tpm_bios.c linux-3.0.9/drivers/char/tpm/tpm_bios.c
---- linux-3.0.9/drivers/char/tpm/tpm_bios.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/tpm/tpm_bios.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/tpm/tpm_bios.c linux-3.1.1/drivers/char/tpm/tpm_bios.c
+--- linux-3.1.1/drivers/char/tpm/tpm_bios.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/tpm/tpm_bios.c	2011-11-16 18:39:07.000000000 -0500
 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
  	event = addr;
  
@@ -25769,9 +25763,9 @@ diff -urNp linux-3.0.9/drivers/char/tpm/tpm_bios.c linux-3.0.9/drivers/char/tpm/
  
  	acpi_os_unmap_memory(virt, len);
  	return 0;
-diff -urNp linux-3.0.9/drivers/char/tpm/tpm.c linux-3.0.9/drivers/char/tpm/tpm.c
---- linux-3.0.9/drivers/char/tpm/tpm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/tpm/tpm.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/tpm/tpm.c linux-3.1.1/drivers/char/tpm/tpm.c
+--- linux-3.1.1/drivers/char/tpm/tpm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/tpm/tpm.c	2011-11-16 18:40:10.000000000 -0500
 @@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_c
  		    chip->vendor.req_complete_val)
  			goto out_recv;
@@ -25781,7 +25775,7 @@ diff -urNp linux-3.0.9/drivers/char/tpm/tpm.c linux-3.0.9/drivers/char/tpm/tpm.c
  			dev_err(chip->dev, "Operation Canceled\n");
  			rc = -ECANCELED;
  			goto out;
-@@ -847,6 +847,8 @@ ssize_t tpm_show_pubek(struct device *de
+@@ -862,6 +862,8 @@ ssize_t tpm_show_pubek(struct device *de
  
  	struct tpm_chip *chip = dev_get_drvdata(dev);
  
@@ -25790,9 +25784,9 @@ diff -urNp linux-3.0.9/drivers/char/tpm/tpm.c linux-3.0.9/drivers/char/tpm/tpm.c
  	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.9/drivers/char/virtio_console.c linux-3.0.9/drivers/char/virtio_console.c
---- linux-3.0.9/drivers/char/virtio_console.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/virtio_console.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/char/virtio_console.c linux-3.1.1/drivers/char/virtio_console.c
+--- linux-3.1.1/drivers/char/virtio_console.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/virtio_console.c	2011-11-16 18:39:07.000000000 -0500
 @@ -555,7 +555,7 @@ static ssize_t fill_readbuf(struct port 
  	if (to_user) {
  		ssize_t ret;
@@ -25811,9 +25805,9 @@ diff -urNp linux-3.0.9/drivers/char/virtio_console.c linux-3.0.9/drivers/char/vi
  }
  
  static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
-diff -urNp linux-3.0.9/drivers/crypto/hifn_795x.c linux-3.0.9/drivers/crypto/hifn_795x.c
---- linux-3.0.9/drivers/crypto/hifn_795x.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/crypto/hifn_795x.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/crypto/hifn_795x.c linux-3.1.1/drivers/crypto/hifn_795x.c
+--- linux-3.1.1/drivers/crypto/hifn_795x.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/crypto/hifn_795x.c	2011-11-16 18:40:10.000000000 -0500
 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device 
  		0xCA, 0x34, 0x2B, 0x2E};
  	struct scatterlist sg;
@@ -25823,9 +25817,9 @@ diff -urNp linux-3.0.9/drivers/crypto/hifn_795x.c linux-3.0.9/drivers/crypto/hif
  	memset(src, 0, sizeof(src));
  	memset(ctx.key, 0, sizeof(ctx.key));
  
-diff -urNp linux-3.0.9/drivers/crypto/padlock-aes.c linux-3.0.9/drivers/crypto/padlock-aes.c
---- linux-3.0.9/drivers/crypto/padlock-aes.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/crypto/padlock-aes.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/crypto/padlock-aes.c linux-3.1.1/drivers/crypto/padlock-aes.c
+--- linux-3.1.1/drivers/crypto/padlock-aes.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/crypto/padlock-aes.c	2011-11-16 18:40:10.000000000 -0500
 @@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm
  	struct crypto_aes_ctx gen_aes;
  	int cpu;
@@ -25835,27 +25829,9 @@ diff -urNp linux-3.0.9/drivers/crypto/padlock-aes.c linux-3.0.9/drivers/crypto/p
  	if (key_len % 8) {
  		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
  		return -EINVAL;
-diff -urNp linux-3.0.9/drivers/dma/ioat/dma_v3.c linux-3.0.9/drivers/dma/ioat/dma_v3.c
---- linux-3.0.9/drivers/dma/ioat/dma_v3.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/dma/ioat/dma_v3.c	2011-11-15 20:02:59.000000000 -0500
-@@ -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.9/drivers/edac/amd64_edac.c linux-3.0.9/drivers/edac/amd64_edac.c
---- linux-3.0.9/drivers/edac/amd64_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/amd64_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/amd64_edac.c linux-3.1.1/drivers/edac/amd64_edac.c
+--- linux-3.1.1/drivers/edac/amd64_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/amd64_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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.
@@ -25865,9 +25841,9 @@ diff -urNp linux-3.0.9/drivers/edac/amd64_edac.c linux-3.0.9/drivers/edac/amd64_
  	{
  		.vendor		= PCI_VENDOR_ID_AMD,
  		.device		= PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
-diff -urNp linux-3.0.9/drivers/edac/amd76x_edac.c linux-3.0.9/drivers/edac/amd76x_edac.c
---- linux-3.0.9/drivers/edac/amd76x_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/amd76x_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/amd76x_edac.c linux-3.1.1/drivers/edac/amd76x_edac.c
+--- linux-3.1.1/drivers/edac/amd76x_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/amd76x_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(
  	edac_mc_free(mci);
  }
@@ -25877,9 +25853,9 @@ diff -urNp linux-3.0.9/drivers/edac/amd76x_edac.c linux-3.0.9/drivers/edac/amd76
  	{
  	 PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
  	 AMD762},
-diff -urNp linux-3.0.9/drivers/edac/e752x_edac.c linux-3.0.9/drivers/edac/e752x_edac.c
---- linux-3.0.9/drivers/edac/e752x_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/e752x_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/e752x_edac.c linux-3.1.1/drivers/edac/e752x_edac.c
+--- linux-3.1.1/drivers/edac/e752x_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/e752x_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(s
  	edac_mc_free(mci);
  }
@@ -25889,9 +25865,9 @@ diff -urNp linux-3.0.9/drivers/edac/e752x_edac.c linux-3.0.9/drivers/edac/e752x_
  	{
  	 PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
  	 E7520},
-diff -urNp linux-3.0.9/drivers/edac/e7xxx_edac.c linux-3.0.9/drivers/edac/e7xxx_edac.c
---- linux-3.0.9/drivers/edac/e7xxx_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/e7xxx_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/e7xxx_edac.c linux-3.1.1/drivers/edac/e7xxx_edac.c
+--- linux-3.1.1/drivers/edac/e7xxx_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/e7xxx_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(s
  	edac_mc_free(mci);
  }
@@ -25901,9 +25877,9 @@ diff -urNp linux-3.0.9/drivers/edac/e7xxx_edac.c linux-3.0.9/drivers/edac/e7xxx_
  	{
  	 PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
  	 E7205},
-diff -urNp linux-3.0.9/drivers/edac/edac_pci_sysfs.c linux-3.0.9/drivers/edac/edac_pci_sysfs.c
---- linux-3.0.9/drivers/edac/edac_pci_sysfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/edac_pci_sysfs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/edac_pci_sysfs.c linux-3.1.1/drivers/edac/edac_pci_sysfs.c
+--- linux-3.1.1/drivers/edac/edac_pci_sysfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/edac_pci_sysfs.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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 */
@@ -25987,9 +25963,9 @@ diff -urNp linux-3.0.9/drivers/edac/edac_pci_sysfs.c linux-3.0.9/drivers/edac/ed
  			panic("EDAC: PCI Parity Error");
  	}
  }
-diff -urNp linux-3.0.9/drivers/edac/i3000_edac.c linux-3.0.9/drivers/edac/i3000_edac.c
---- linux-3.0.9/drivers/edac/i3000_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i3000_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/i3000_edac.c linux-3.1.1/drivers/edac/i3000_edac.c
+--- linux-3.1.1/drivers/edac/i3000_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i3000_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(s
  	edac_mc_free(mci);
  }
@@ -25999,9 +25975,9 @@ diff -urNp linux-3.0.9/drivers/edac/i3000_edac.c linux-3.0.9/drivers/edac/i3000_
  	{
  	 PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
  	 I3000},
-diff -urNp linux-3.0.9/drivers/edac/i3200_edac.c linux-3.0.9/drivers/edac/i3200_edac.c
---- linux-3.0.9/drivers/edac/i3200_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i3200_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/i3200_edac.c linux-3.1.1/drivers/edac/i3200_edac.c
+--- linux-3.1.1/drivers/edac/i3200_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i3200_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(s
  	edac_mc_free(mci);
  }
@@ -26011,9 +25987,9 @@ diff -urNp linux-3.0.9/drivers/edac/i3200_edac.c linux-3.0.9/drivers/edac/i3200_
  	{
  		PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
  		I3200},
-diff -urNp linux-3.0.9/drivers/edac/i5000_edac.c linux-3.0.9/drivers/edac/i5000_edac.c
---- linux-3.0.9/drivers/edac/i5000_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i5000_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/i5000_edac.c linux-3.1.1/drivers/edac/i5000_edac.c
+--- linux-3.1.1/drivers/edac/i5000_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i5000_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(s
   *
   *	The "E500P" device is the first device supported.
@@ -26023,9 +25999,9 @@ diff -urNp linux-3.0.9/drivers/edac/i5000_edac.c linux-3.0.9/drivers/edac/i5000_
  	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
  	 .driver_data = I5000P},
  
-diff -urNp linux-3.0.9/drivers/edac/i5100_edac.c linux-3.0.9/drivers/edac/i5100_edac.c
---- linux-3.0.9/drivers/edac/i5100_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i5100_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/i5100_edac.c linux-3.1.1/drivers/edac/i5100_edac.c
+--- linux-3.1.1/drivers/edac/i5100_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i5100_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(s
  	edac_mc_free(mci);
  }
@@ -26035,9 +26011,9 @@ diff -urNp linux-3.0.9/drivers/edac/i5100_edac.c linux-3.0.9/drivers/edac/i5100_
  	/* 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.9/drivers/edac/i5400_edac.c linux-3.0.9/drivers/edac/i5400_edac.c
---- linux-3.0.9/drivers/edac/i5400_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i5400_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/i5400_edac.c linux-3.1.1/drivers/edac/i5400_edac.c
+--- linux-3.1.1/drivers/edac/i5400_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i5400_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(s
   *
   *	The "E500P" device is the first device supported.
@@ -26047,9 +26023,9 @@ diff -urNp linux-3.0.9/drivers/edac/i5400_edac.c linux-3.0.9/drivers/edac/i5400_
  	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
  	{0,}			/* 0 terminated list. */
  };
-diff -urNp linux-3.0.9/drivers/edac/i7300_edac.c linux-3.0.9/drivers/edac/i7300_edac.c
---- linux-3.0.9/drivers/edac/i7300_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i7300_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/i7300_edac.c linux-3.1.1/drivers/edac/i7300_edac.c
+--- linux-3.1.1/drivers/edac/i7300_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i7300_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1191,7 +1191,7 @@ static void __devexit i7300_remove_one(s
   *
   * Has only 8086:360c PCI ID
@@ -26059,9 +26035,9 @@ diff -urNp linux-3.0.9/drivers/edac/i7300_edac.c linux-3.0.9/drivers/edac/i7300_
  	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
  	{0,}			/* 0 terminated list. */
  };
-diff -urNp linux-3.0.9/drivers/edac/i7core_edac.c linux-3.0.9/drivers/edac/i7core_edac.c
---- linux-3.0.9/drivers/edac/i7core_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i7core_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/i7core_edac.c linux-3.1.1/drivers/edac/i7core_edac.c
+--- linux-3.1.1/drivers/edac/i7core_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i7core_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -359,7 +359,7 @@ static const struct pci_id_table pci_dev
  /*
   *	pci_device_id	table for which devices we are looking for
@@ -26071,9 +26047,9 @@ diff -urNp linux-3.0.9/drivers/edac/i7core_edac.c linux-3.0.9/drivers/edac/i7cor
  	{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.9/drivers/edac/i82443bxgx_edac.c linux-3.0.9/drivers/edac/i82443bxgx_edac.c
---- linux-3.0.9/drivers/edac/i82443bxgx_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i82443bxgx_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/i82443bxgx_edac.c linux-3.1.1/drivers/edac/i82443bxgx_edac.c
+--- linux-3.1.1/drivers/edac/i82443bxgx_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i82443bxgx_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_
  
  EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
@@ -26083,9 +26059,9 @@ diff -urNp linux-3.0.9/drivers/edac/i82443bxgx_edac.c linux-3.0.9/drivers/edac/i
  	{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.9/drivers/edac/i82860_edac.c linux-3.0.9/drivers/edac/i82860_edac.c
---- linux-3.0.9/drivers/edac/i82860_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i82860_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/i82860_edac.c linux-3.1.1/drivers/edac/i82860_edac.c
+--- linux-3.1.1/drivers/edac/i82860_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i82860_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(
  	edac_mc_free(mci);
  }
@@ -26095,9 +26071,9 @@ diff -urNp linux-3.0.9/drivers/edac/i82860_edac.c linux-3.0.9/drivers/edac/i8286
  	{
  	 PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
  	 I82860},
-diff -urNp linux-3.0.9/drivers/edac/i82875p_edac.c linux-3.0.9/drivers/edac/i82875p_edac.c
---- linux-3.0.9/drivers/edac/i82875p_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i82875p_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/i82875p_edac.c linux-3.1.1/drivers/edac/i82875p_edac.c
+--- linux-3.1.1/drivers/edac/i82875p_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i82875p_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one
  	edac_mc_free(mci);
  }
@@ -26107,9 +26083,9 @@ diff -urNp linux-3.0.9/drivers/edac/i82875p_edac.c linux-3.0.9/drivers/edac/i828
  	{
  	 PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
  	 I82875P},
-diff -urNp linux-3.0.9/drivers/edac/i82975x_edac.c linux-3.0.9/drivers/edac/i82975x_edac.c
---- linux-3.0.9/drivers/edac/i82975x_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i82975x_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/i82975x_edac.c linux-3.1.1/drivers/edac/i82975x_edac.c
+--- linux-3.1.1/drivers/edac/i82975x_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i82975x_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one
  	edac_mc_free(mci);
  }
@@ -26119,9 +26095,9 @@ diff -urNp linux-3.0.9/drivers/edac/i82975x_edac.c linux-3.0.9/drivers/edac/i829
  	{
  		PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
  		I82975X
-diff -urNp linux-3.0.9/drivers/edac/mce_amd.h linux-3.0.9/drivers/edac/mce_amd.h
---- linux-3.0.9/drivers/edac/mce_amd.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/mce_amd.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/mce_amd.h linux-3.1.1/drivers/edac/mce_amd.h
+--- linux-3.1.1/drivers/edac/mce_amd.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/mce_amd.h	2011-11-16 18:39:07.000000000 -0500
 @@ -83,7 +83,7 @@ struct amd_decoder_ops {
  	bool (*dc_mce)(u16, u8);
  	bool (*ic_mce)(u16, u8);
@@ -26131,9 +26107,9 @@ diff -urNp linux-3.0.9/drivers/edac/mce_amd.h linux-3.0.9/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.9/drivers/edac/r82600_edac.c linux-3.0.9/drivers/edac/r82600_edac.c
---- linux-3.0.9/drivers/edac/r82600_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/r82600_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/r82600_edac.c linux-3.1.1/drivers/edac/r82600_edac.c
+--- linux-3.1.1/drivers/edac/r82600_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/r82600_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(
  	edac_mc_free(mci);
  }
@@ -26143,9 +26119,9 @@ diff -urNp linux-3.0.9/drivers/edac/r82600_edac.c linux-3.0.9/drivers/edac/r8260
  	{
  	 PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
  	 },
-diff -urNp linux-3.0.9/drivers/edac/x38_edac.c linux-3.0.9/drivers/edac/x38_edac.c
---- linux-3.0.9/drivers/edac/x38_edac.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/x38_edac.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/edac/x38_edac.c linux-3.1.1/drivers/edac/x38_edac.c
+--- linux-3.1.1/drivers/edac/x38_edac.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/x38_edac.c	2011-11-16 18:39:07.000000000 -0500
 @@ -440,7 +440,7 @@ static void __devexit x38_remove_one(str
  	edac_mc_free(mci);
  }
@@ -26155,9 +26131,9 @@ diff -urNp linux-3.0.9/drivers/edac/x38_edac.c linux-3.0.9/drivers/edac/x38_edac
  	{
  	 PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
  	 X38},
-diff -urNp linux-3.0.9/drivers/firewire/core-card.c linux-3.0.9/drivers/firewire/core-card.c
---- linux-3.0.9/drivers/firewire/core-card.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/firewire/core-card.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/firewire/core-card.c linux-3.1.1/drivers/firewire/core-card.c
+--- linux-3.1.1/drivers/firewire/core-card.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/firewire/core-card.c	2011-11-16 18:39:07.000000000 -0500
 @@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
  
  void fw_core_remove_card(struct fw_card *card)
@@ -26167,10 +26143,10 @@ diff -urNp linux-3.0.9/drivers/firewire/core-card.c linux-3.0.9/drivers/firewire
  
  	card->driver->update_phy_reg(card, 4,
  				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
-diff -urNp linux-3.0.9/drivers/firewire/core-cdev.c linux-3.0.9/drivers/firewire/core-cdev.c
---- linux-3.0.9/drivers/firewire/core-cdev.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/firewire/core-cdev.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1313,8 +1313,7 @@ static int init_iso_resource(struct clie
+diff -urNp linux-3.1.1/drivers/firewire/core-cdev.c linux-3.1.1/drivers/firewire/core-cdev.c
+--- linux-3.1.1/drivers/firewire/core-cdev.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/firewire/core-cdev.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1331,8 +1331,7 @@ static int init_iso_resource(struct clie
  	int ret;
  
  	if ((request->channels == 0 && request->bandwidth == 0) ||
@@ -26180,9 +26156,9 @@ diff -urNp linux-3.0.9/drivers/firewire/core-cdev.c linux-3.0.9/drivers/firewire
  		return -EINVAL;
  
  	r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-3.0.9/drivers/firewire/core.h linux-3.0.9/drivers/firewire/core.h
---- linux-3.0.9/drivers/firewire/core.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/firewire/core.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/firewire/core.h linux-3.1.1/drivers/firewire/core.h
+--- linux-3.1.1/drivers/firewire/core.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/firewire/core.h	2011-11-16 18:39:07.000000000 -0500
 @@ -101,6 +101,7 @@ struct fw_card_driver {
  
  	int (*stop_iso)(struct fw_iso_context *ctx);
@@ -26191,9 +26167,9 @@ diff -urNp linux-3.0.9/drivers/firewire/core.h linux-3.0.9/drivers/firewire/core
  
  void fw_card_initialize(struct fw_card *card,
  		const struct fw_card_driver *driver, struct device *device);
-diff -urNp linux-3.0.9/drivers/firewire/core-transaction.c linux-3.0.9/drivers/firewire/core-transaction.c
---- linux-3.0.9/drivers/firewire/core-transaction.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/firewire/core-transaction.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/firewire/core-transaction.c linux-3.1.1/drivers/firewire/core-transaction.c
+--- linux-3.1.1/drivers/firewire/core-transaction.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/firewire/core-transaction.c	2011-11-16 18:40:10.000000000 -0500
 @@ -37,6 +37,7 @@
  #include <linux/timer.h>
  #include <linux/types.h>
@@ -26211,9 +26187,9 @@ diff -urNp linux-3.0.9/drivers/firewire/core-transaction.c linux-3.0.9/drivers/f
  	init_timer_on_stack(&t.split_timeout_timer);
  	init_completion(&d.done);
  	d.payload = payload;
-diff -urNp linux-3.0.9/drivers/firmware/dmi_scan.c linux-3.0.9/drivers/firmware/dmi_scan.c
---- linux-3.0.9/drivers/firmware/dmi_scan.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/firmware/dmi_scan.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/firmware/dmi_scan.c linux-3.1.1/drivers/firmware/dmi_scan.c
+--- linux-3.1.1/drivers/firmware/dmi_scan.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/firmware/dmi_scan.c	2011-11-16 18:39:07.000000000 -0500
 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
  		}
  	}
@@ -26235,9 +26211,9 @@ diff -urNp linux-3.0.9/drivers/firmware/dmi_scan.c linux-3.0.9/drivers/firmware/
  
  	iounmap(buf);
  	return 0;
-diff -urNp linux-3.0.9/drivers/gpio/vr41xx_giu.c linux-3.0.9/drivers/gpio/vr41xx_giu.c
---- linux-3.0.9/drivers/gpio/vr41xx_giu.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpio/vr41xx_giu.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpio/gpio-vr41xx.c linux-3.1.1/drivers/gpio/gpio-vr41xx.c
+--- linux-3.1.1/drivers/gpio/gpio-vr41xx.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpio/gpio-vr41xx.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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);
@@ -26247,10 +26223,10 @@ diff -urNp linux-3.0.9/drivers/gpio/vr41xx_giu.c linux-3.0.9/drivers/gpio/vr41xx
  
  	return -EINVAL;
  }
-diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/drm_crtc.c
---- linux-3.0.9/drivers/gpu/drm/drm_crtc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_crtc.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1372,7 +1372,7 @@ int drm_mode_getconnector(struct drm_dev
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_crtc.c linux-3.1.1/drivers/gpu/drm/drm_crtc.c
+--- linux-3.1.1/drivers/gpu/drm/drm_crtc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_crtc.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1374,7 +1374,7 @@ int drm_mode_getconnector(struct drm_dev
  	 */
  	if ((out_resp->count_modes >= mode_count) && mode_count) {
  		copied = 0;
@@ -26259,7 +26235,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/dr
  		list_for_each_entry(mode, &connector->modes, head) {
  			drm_crtc_convert_to_umode(&u_mode, mode);
  			if (copy_to_user(mode_ptr + copied,
-@@ -1387,8 +1387,8 @@ int drm_mode_getconnector(struct drm_dev
+@@ -1389,8 +1389,8 @@ int drm_mode_getconnector(struct drm_dev
  
  	if ((out_resp->count_props >= props_count) && props_count) {
  		copied = 0;
@@ -26270,7 +26246,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/dr
  		for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
  			if (connector->property_ids[i] != 0) {
  				if (put_user(connector->property_ids[i],
-@@ -1410,7 +1410,7 @@ int drm_mode_getconnector(struct drm_dev
+@@ -1412,7 +1412,7 @@ int drm_mode_getconnector(struct drm_dev
  
  	if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
  		copied = 0;
@@ -26279,7 +26255,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/dr
  		for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
  			if (connector->encoder_ids[i] != 0) {
  				if (put_user(connector->encoder_ids[i],
-@@ -1569,7 +1569,7 @@ int drm_mode_setcrtc(struct drm_device *
+@@ -1571,7 +1571,7 @@ int drm_mode_setcrtc(struct drm_device *
  		}
  
  		for (i = 0; i < crtc_req->count_connectors; i++) {
@@ -26288,7 +26264,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/dr
  			if (get_user(out_id, &set_connectors_ptr[i])) {
  				ret = -EFAULT;
  				goto out;
-@@ -1850,7 +1850,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_de
+@@ -1852,7 +1852,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_de
  	fb = obj_to_fb(obj);
  
  	num_clips = r->num_clips;
@@ -26297,7 +26273,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/dr
  
  	if (!num_clips != !clips_ptr) {
  		ret = -EINVAL;
-@@ -2270,7 +2270,7 @@ int drm_mode_getproperty_ioctl(struct dr
+@@ -2272,7 +2272,7 @@ int drm_mode_getproperty_ioctl(struct dr
  	out_resp->flags = property->flags;
  
  	if ((out_resp->count_values >= value_count) && value_count) {
@@ -26306,7 +26282,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/dr
  		for (i = 0; i < value_count; i++) {
  			if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
  				ret = -EFAULT;
-@@ -2283,7 +2283,7 @@ int drm_mode_getproperty_ioctl(struct dr
+@@ -2285,7 +2285,7 @@ int drm_mode_getproperty_ioctl(struct dr
  	if (property->flags & DRM_MODE_PROP_ENUM) {
  		if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
  			copied = 0;
@@ -26315,7 +26291,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/dr
  			list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
  
  				if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
-@@ -2306,7 +2306,7 @@ int drm_mode_getproperty_ioctl(struct dr
+@@ -2308,7 +2308,7 @@ int drm_mode_getproperty_ioctl(struct dr
  		if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
  			copied = 0;
  			blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr;
@@ -26324,7 +26300,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/dr
  
  			list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
  				if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
-@@ -2367,7 +2367,7 @@ int drm_mode_getblob_ioctl(struct drm_de
+@@ -2369,7 +2369,7 @@ int drm_mode_getblob_ioctl(struct drm_de
  	struct drm_mode_get_blob *out_resp = data;
  	struct drm_property_blob *blob;
  	int ret = 0;
@@ -26333,7 +26309,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/dr
  
  	if (!drm_core_check_feature(dev, DRIVER_MODESET))
  		return -EINVAL;
-@@ -2381,7 +2381,7 @@ int drm_mode_getblob_ioctl(struct drm_de
+@@ -2383,7 +2383,7 @@ int drm_mode_getblob_ioctl(struct drm_de
  	blob = obj_to_blob(obj);
  
  	if (out_resp->length == blob->length) {
@@ -26342,9 +26318,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/dr
  		if (copy_to_user(blob_ptr, blob->data, blob->length)){
  			ret = -EFAULT;
  			goto done;
-diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c
---- linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_crtc_helper.c linux-3.1.1/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-3.1.1/drivers/gpu/drm/drm_crtc_helper.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_crtc_helper.c	2011-11-16 18:40:10.000000000 -0500
 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
  	struct drm_crtc *tmp;
  	int crtc_mask = 1;
@@ -26363,9 +26339,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.9/drivers/gpu
  	crtc->enabled = drm_helper_crtc_in_use(crtc);
  	if (!crtc->enabled)
  		return true;
-diff -urNp linux-3.0.9/drivers/gpu/drm/drm_drv.c linux-3.0.9/drivers/gpu/drm/drm_drv.c
---- linux-3.0.9/drivers/gpu/drm/drm_drv.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_drv.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_drv.c linux-3.1.1/drivers/gpu/drm/drm_drv.c
+--- linux-3.1.1/drivers/gpu/drm/drm_drv.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_drv.c	2011-11-16 18:39:07.000000000 -0500
 @@ -307,7 +307,7 @@ module_exit(drm_core_exit);
  /**
   * Copy and IOCTL return string to user space
@@ -26384,9 +26360,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_drv.c linux-3.0.9/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.9/drivers/gpu/drm/drm_fops.c linux-3.0.9/drivers/gpu/drm/drm_fops.c
---- linux-3.0.9/drivers/gpu/drm/drm_fops.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_fops.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_fops.c linux-3.1.1/drivers/gpu/drm/drm_fops.c
+--- linux-3.1.1/drivers/gpu/drm/drm_fops.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_fops.c	2011-11-16 18:39:07.000000000 -0500
 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
  	}
  
@@ -26436,9 +26412,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_fops.c linux-3.0.9/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.9/drivers/gpu/drm/drm_global.c linux-3.0.9/drivers/gpu/drm/drm_global.c
---- linux-3.0.9/drivers/gpu/drm/drm_global.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_global.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_global.c linux-3.1.1/drivers/gpu/drm/drm_global.c
+--- linux-3.1.1/drivers/gpu/drm/drm_global.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_global.c	2011-11-16 18:39:07.000000000 -0500
 @@ -36,7 +36,7 @@
  struct drm_global_item {
  	struct mutex mutex;
@@ -26496,9 +26472,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_global.c linux-3.0.9/drivers/gpu/drm/
  		ref->release(ref);
  		item->object = NULL;
  	}
-diff -urNp linux-3.0.9/drivers/gpu/drm/drm_info.c linux-3.0.9/drivers/gpu/drm/drm_info.c
---- linux-3.0.9/drivers/gpu/drm/drm_info.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_info.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_info.c linux-3.1.1/drivers/gpu/drm/drm_info.c
+--- linux-3.1.1/drivers/gpu/drm/drm_info.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_info.c	2011-11-16 18:40:10.000000000 -0500
 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
  	struct drm_local_map *map;
  	struct drm_map_list *r_list;
@@ -26539,9 +26515,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_info.c linux-3.0.9/drivers/gpu/drm/dr
  
  #if defined(__i386__)
  		pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-3.0.9/drivers/gpu/drm/drm_ioc32.c linux-3.0.9/drivers/gpu/drm/drm_ioc32.c
---- linux-3.0.9/drivers/gpu/drm/drm_ioc32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_ioc32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_ioc32.c linux-3.1.1/drivers/gpu/drm/drm_ioc32.c
+--- linux-3.1.1/drivers/gpu/drm/drm_ioc32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_ioc32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -455,7 +455,7 @@ static int compat_drm_infobufs(struct fi
  	request = compat_alloc_user_space(nbytes);
  	if (!access_ok(VERIFY_WRITE, request, nbytes))
@@ -26560,9 +26536,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_ioc32.c linux-3.0.9/drivers/gpu/drm/d
  
  	if (__put_user(count, &request->count)
  	    || __put_user(list, &request->list))
-diff -urNp linux-3.0.9/drivers/gpu/drm/drm_ioctl.c linux-3.0.9/drivers/gpu/drm/drm_ioctl.c
---- linux-3.0.9/drivers/gpu/drm/drm_ioctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_ioctl.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_ioctl.c linux-3.1.1/drivers/gpu/drm/drm_ioctl.c
+--- linux-3.1.1/drivers/gpu/drm/drm_ioctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_ioctl.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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);
@@ -26572,9 +26548,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_ioctl.c linux-3.0.9/drivers/gpu/drm/d
  		stats->data[i].type = dev->types[i];
  	}
  
-diff -urNp linux-3.0.9/drivers/gpu/drm/drm_lock.c linux-3.0.9/drivers/gpu/drm/drm_lock.c
---- linux-3.0.9/drivers/gpu/drm/drm_lock.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_lock.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_lock.c linux-3.1.1/drivers/gpu/drm/drm_lock.c
+--- linux-3.1.1/drivers/gpu/drm/drm_lock.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_lock.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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;
@@ -26593,9 +26569,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_lock.c linux-3.0.9/drivers/gpu/drm/dr
  
  	if (drm_lock_free(&master->lock, lock->context)) {
  		/* FIXME: Should really bail out here. */
-diff -urNp linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c
---- linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/i810/i810_dma.c linux-3.1.1/drivers/gpu/drm/i810/i810_dma.c
+--- linux-3.1.1/drivers/gpu/drm/i810/i810_dma.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i810/i810_dma.c	2011-11-16 18:39:07.000000000 -0500
 @@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de
  				 dma->buflist[vertex->idx],
  				 vertex->discard, vertex->used);
@@ -26618,9 +26594,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c linux-3.0.9/drivers/gpu/d
  	sarea_priv->last_enqueue = dev_priv->counter - 1;
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff -urNp linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h
---- linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/i810/i810_drv.h linux-3.1.1/drivers/gpu/drm/i810/i810_drv.h
+--- linux-3.1.1/drivers/gpu/drm/i810/i810_drv.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i810/i810_drv.h	2011-11-16 18:39:07.000000000 -0500
 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
  	int page_flipping;
  
@@ -26632,9 +26608,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h linux-3.0.9/drivers/gpu/d
  
  	int front_offset;
  } drm_i810_private_t;
-diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c
---- linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_debugfs.c linux-3.1.1/drivers/gpu/drm/i915/i915_debugfs.c
+--- linux-3.1.1/drivers/gpu/drm/i915/i915_debugfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i915/i915_debugfs.c	2011-11-16 18:39:07.000000000 -0500
 @@ -497,7 +497,7 @@ static int i915_interrupt_info(struct se
  			   I915_READ(GTIMR));
  	}
@@ -26642,9 +26618,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.9/drivers/g
 -		   atomic_read(&dev_priv->irq_received));
 +		   atomic_read_unchecked(&dev_priv->irq_received));
  	for (i = 0; i < I915_NUM_RINGS; i++) {
- 		if (IS_GEN6(dev)) {
+ 		if (IS_GEN6(dev) || IS_GEN7(dev)) {
  			seq_printf(m, "Graphics Interrupt mask (%s):	%08x\n",
-@@ -1147,7 +1147,7 @@ static int i915_opregion(struct seq_file
+@@ -1185,7 +1185,7 @@ static int i915_opregion(struct seq_file
  		return ret;
  
  	if (opregion->header)
@@ -26653,10 +26629,10 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.9/drivers/g
  
  	mutex_unlock(&dev->struct_mutex);
  
-diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c
---- linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1169,7 +1169,7 @@ static bool i915_switcheroo_can_switch(s
+diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_dma.c linux-3.1.1/drivers/gpu/drm/i915/i915_dma.c
+--- linux-3.1.1/drivers/gpu/drm/i915/i915_dma.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i915/i915_dma.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1171,7 +1171,7 @@ static bool i915_switcheroo_can_switch(s
  	bool can_switch;
  
  	spin_lock(&dev->count_lock);
@@ -26665,10 +26641,10 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c linux-3.0.9/drivers/gpu/d
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h
---- linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h	2011-11-15 20:02:59.000000000 -0500
-@@ -219,7 +219,7 @@ struct drm_i915_display_funcs {
+diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_drv.h linux-3.1.1/drivers/gpu/drm/i915/i915_drv.h
+--- linux-3.1.1/drivers/gpu/drm/i915/i915_drv.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i915/i915_drv.h	2011-11-16 18:39:07.000000000 -0500
+@@ -222,7 +222,7 @@ struct drm_i915_display_funcs {
  	/* render clock increase/decrease */
  	/* display clock increase/decrease */
  	/* pll clock increase/decrease */
@@ -26677,7 +26653,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h linux-3.0.9/drivers/gpu/d
  
  struct intel_device_info {
  	u8 gen;
-@@ -300,7 +300,7 @@ typedef struct drm_i915_private {
+@@ -305,7 +305,7 @@ typedef struct drm_i915_private {
  	int current_page;
  	int page_flipping;
  
@@ -26686,7 +26662,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h linux-3.0.9/drivers/gpu/d
  
  	/* protects the irq masks */
  	spinlock_t irq_lock;
-@@ -874,7 +874,7 @@ struct drm_i915_gem_object {
+@@ -882,7 +882,7 @@ struct drm_i915_gem_object {
  	 * will be page flipped away on the next vblank.  When it
  	 * reaches 0, dev_priv->pending_flip_queue will be woken up.
  	 */
@@ -26695,7 +26671,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h linux-3.0.9/drivers/gpu/d
  };
  
  #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
-@@ -1247,7 +1247,7 @@ extern int intel_setup_gmbus(struct drm_
+@@ -1262,7 +1262,7 @@ extern int intel_setup_gmbus(struct drm_
  extern void intel_teardown_gmbus(struct drm_device *dev);
  extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
  extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
@@ -26704,9 +26680,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h linux-3.0.9/drivers/gpu/d
  {
  	return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
  }
-diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c
---- linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.1.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-3.1.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-11-16 18:39:07.000000000 -0500
 @@ -188,7 +188,7 @@ i915_gem_object_set_to_gpu_domain(struct
  		i915_gem_clflush_object(obj);
  
@@ -26716,10 +26692,10 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.9/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.9/drivers/gpu/drm/i915/i915_irq.c linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c
---- linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c	2011-11-15 20:02:59.000000000 -0500
-@@ -473,7 +473,7 @@ static irqreturn_t ivybridge_irq_handler
+diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_irq.c linux-3.1.1/drivers/gpu/drm/i915/i915_irq.c
+--- linux-3.1.1/drivers/gpu/drm/i915/i915_irq.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i915/i915_irq.c	2011-11-16 18:39:07.000000000 -0500
+@@ -475,7 +475,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;
  
@@ -26728,7 +26704,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c linux-3.0.9/drivers/gpu/d
  
  	/* disable master interrupt before clearing iir  */
  	de_ier = I915_READ(DEIER);
-@@ -563,7 +563,7 @@ static irqreturn_t ironlake_irq_handler(
+@@ -565,7 +565,7 @@ static irqreturn_t ironlake_irq_handler(
  	struct drm_i915_master_private *master_priv;
  	u32 bsd_usr_interrupt = GT_BSD_USER_INTERRUPT;
  
@@ -26737,7 +26713,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c linux-3.0.9/drivers/gpu/d
  
  	if (IS_GEN6(dev))
  		bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT;
-@@ -1226,7 +1226,7 @@ static irqreturn_t i915_driver_irq_handl
+@@ -1228,7 +1228,7 @@ static irqreturn_t i915_driver_irq_handl
  	int ret = IRQ_NONE, pipe;
  	bool blc_event = false;
  
@@ -26746,7 +26722,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c linux-3.0.9/drivers/gpu/d
  
  	iir = I915_READ(IIR);
  
-@@ -1735,7 +1735,7 @@ static void ironlake_irq_preinstall(stru
+@@ -1740,7 +1740,7 @@ static void ironlake_irq_preinstall(stru
  {
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  
@@ -26755,7 +26731,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c linux-3.0.9/drivers/gpu/d
  
  	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
  	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
-@@ -1899,7 +1899,7 @@ static void i915_driver_irq_preinstall(s
+@@ -1904,7 +1904,7 @@ static void i915_driver_irq_preinstall(s
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  	int pipe;
  
@@ -26764,10 +26740,10 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c linux-3.0.9/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.9/drivers/gpu/drm/i915/intel_display.c linux-3.0.9/drivers/gpu/drm/i915/intel_display.c
---- linux-3.0.9/drivers/gpu/drm/i915/intel_display.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i915/intel_display.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1961,7 +1961,7 @@ intel_pipe_set_base(struct drm_crtc *crt
+diff -urNp linux-3.1.1/drivers/gpu/drm/i915/intel_display.c linux-3.1.1/drivers/gpu/drm/i915/intel_display.c
+--- linux-3.1.1/drivers/gpu/drm/i915/intel_display.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i915/intel_display.c	2011-11-16 18:39:07.000000000 -0500
+@@ -2205,7 +2205,7 @@ intel_pipe_set_base(struct drm_crtc *crt
  
  		wait_event(dev_priv->pending_flip_queue,
  			   atomic_read(&dev_priv->mm.wedged) ||
@@ -26776,7 +26752,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/intel_display.c linux-3.0.9/drivers/
  
  		/* Big Hammer, we also need to ensure that any pending
  		 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
-@@ -2548,7 +2548,7 @@ static void intel_crtc_wait_for_pending_
+@@ -2824,7 +2824,7 @@ static void intel_crtc_wait_for_pending_
  	obj = to_intel_framebuffer(crtc->fb)->obj;
  	dev_priv = crtc->dev->dev_private;
  	wait_event(dev_priv->pending_flip_queue,
@@ -26785,7 +26761,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/intel_display.c linux-3.0.9/drivers/
  }
  
  static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
-@@ -6225,7 +6225,7 @@ static void do_intel_finish_page_flip(st
+@@ -6644,7 +6644,7 @@ static void do_intel_finish_page_flip(st
  
  	atomic_clear_mask(1 << intel_crtc->plane,
  			  &obj->pending_flip.counter);
@@ -26794,7 +26770,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/intel_display.c linux-3.0.9/drivers/
  		wake_up(&dev_priv->pending_flip_queue);
  
  	schedule_work(&work->work);
-@@ -6514,7 +6514,7 @@ static int intel_crtc_page_flip(struct d
+@@ -6933,7 +6933,7 @@ static int intel_crtc_page_flip(struct d
  	/* Block clients from rendering to the new back buffer until
  	 * the flip occurs and the object is no longer visible.
  	 */
@@ -26803,7 +26779,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/intel_display.c linux-3.0.9/drivers/
  
  	ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
  	if (ret)
-@@ -6527,7 +6527,7 @@ static int intel_crtc_page_flip(struct d
+@@ -6947,7 +6947,7 @@ static int intel_crtc_page_flip(struct d
  	return 0;
  
  cleanup_pending:
@@ -26812,9 +26788,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/intel_display.c linux-3.0.9/drivers/
  cleanup_objs:
  	drm_gem_object_unreference(&work->old_fb_obj->base);
  	drm_gem_object_unreference(&obj->base);
-diff -urNp linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h
---- linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/mga/mga_drv.h linux-3.1.1/drivers/gpu/drm/mga/mga_drv.h
+--- linux-3.1.1/drivers/gpu/drm/mga/mga_drv.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/mga/mga_drv.h	2011-11-16 18:39:07.000000000 -0500
 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
  	u32 clear_cmd;
  	u32 maccess;
@@ -26827,9 +26803,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h linux-3.0.9/drivers/gpu/drm
  	u32 next_fence_to_post;
  
  	unsigned int fb_cpp;
-diff -urNp linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c
---- linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/mga/mga_irq.c linux-3.1.1/drivers/gpu/drm/mga/mga_irq.c
+--- linux-3.1.1/drivers/gpu/drm/mga/mga_irq.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/mga/mga_irq.c	2011-11-16 18:39:07.000000000 -0500
 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
  	if (crtc != 0)
  		return 0;
@@ -26866,10 +26842,10 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c linux-3.0.9/drivers/gpu/drm
  		      - *sequence) <= (1 << 23)));
  
  	*sequence = cur_fence;
-diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c
---- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-11-15 20:02:59.000000000 -0500
-@@ -200,7 +200,7 @@ struct methods {
+diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_bios.c
+--- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-11-16 18:39:07.000000000 -0500
+@@ -201,7 +201,7 @@ struct methods {
  	const char desc[8];
  	void (*loadbios)(struct drm_device *, uint8_t *);
  	const bool rw;
@@ -26878,7 +26854,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.9/driver
  
  static struct methods shadow_methods[] = {
  	{ "PRAMIN", load_vbios_pramin, true },
-@@ -5488,7 +5488,7 @@ parse_bit_displayport_tbl_entry(struct d
+@@ -5489,7 +5489,7 @@ parse_bit_displayport_tbl_entry(struct d
  struct bit_table {
  	const char id;
  	int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
@@ -26887,19 +26863,19 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.9/driver
  
  #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
  
-diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h
---- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-11-15 20:02:59.000000000 -0500
-@@ -227,7 +227,7 @@ struct nouveau_channel {
+diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_drv.h
+--- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-11-16 18:39:07.000000000 -0500
+@@ -238,7 +238,7 @@ struct nouveau_channel {
  		struct list_head pending;
  		uint32_t sequence;
  		uint32_t sequence_ack;
 -		atomic_t last_sequence_irq;
 +		atomic_unchecked_t last_sequence_irq;
+ 		struct nouveau_vma vma;
  	} fence;
  
- 	/* DMA push buffer */
-@@ -304,7 +304,7 @@ struct nouveau_exec_engine {
+@@ -319,7 +319,7 @@ struct nouveau_exec_engine {
  			   u32 handle, u16 class);
  	void (*set_tile_region)(struct drm_device *dev, int i);
  	void (*tlb_flush)(struct drm_device *, int engine);
@@ -26908,7 +26884,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.9/drivers
  
  struct nouveau_instmem_engine {
  	void	*priv;
-@@ -325,13 +325,13 @@ struct nouveau_instmem_engine {
+@@ -341,13 +341,13 @@ struct nouveau_instmem_engine {
  struct nouveau_mc_engine {
  	int  (*init)(struct drm_device *dev);
  	void (*takedown)(struct drm_device *dev);
@@ -26924,7 +26900,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.9/drivers
  
  struct nouveau_fb_engine {
  	int num_tiles;
-@@ -494,7 +494,7 @@ struct nouveau_vram_engine {
+@@ -513,7 +513,7 @@ struct nouveau_vram_engine {
  	void (*put)(struct drm_device *, struct nouveau_mem **);
  
  	bool (*flags_valid)(struct drm_device *, u32 tile_flags);
@@ -26933,7 +26909,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.9/drivers
  
  struct nouveau_engine {
  	struct nouveau_instmem_engine instmem;
-@@ -640,7 +640,7 @@ struct drm_nouveau_private {
+@@ -660,7 +660,7 @@ struct drm_nouveau_private {
  		struct drm_global_reference mem_global_ref;
  		struct ttm_bo_global_ref bo_global_ref;
  		struct ttm_bo_device bdev;
@@ -26942,9 +26918,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.9/drivers
  	} ttm;
  
  	struct {
-diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c
---- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_fence.c
+--- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-11-16 18:39:07.000000000 -0500
 @@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan
  		if (USE_REFCNT(dev))
  			sequence = nvchan_rd32(chan, 0x48);
@@ -26954,7 +26930,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.9/drive
  
  		if (chan->fence.sequence_ack == sequence)
  			goto out;
-@@ -544,7 +544,7 @@ nouveau_fence_channel_init(struct nouvea
+@@ -541,7 +541,7 @@ nouveau_fence_channel_init(struct nouvea
  
  	INIT_LIST_HEAD(&chan->fence.pending);
  	spin_lock_init(&chan->fence.lock);
@@ -26963,10 +26939,10 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.9/drive
  	return 0;
  }
  
-diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c
---- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-11-15 20:02:59.000000000 -0500
-@@ -249,7 +249,7 @@ validate_init(struct nouveau_channel *ch
+diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_gem.c
+--- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-11-16 18:39:07.000000000 -0500
+@@ -314,7 +314,7 @@ validate_init(struct nouveau_channel *ch
  	int trycnt = 0;
  	int ret, i;
  
@@ -26975,10 +26951,10 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.9/drivers
  retry:
  	if (++trycnt > 100000) {
  		NV_ERROR(dev, "%s failed and gave up.\n", __func__);
-diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c	2011-11-15 20:02:59.000000000 -0500
-@@ -488,7 +488,7 @@ static bool nouveau_switcheroo_can_switc
+diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_state.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_state.c	2011-11-16 18:39:07.000000000 -0500
+@@ -496,7 +496,7 @@ static bool nouveau_switcheroo_can_switc
  	bool can_switch;
  
  	spin_lock(&dev->count_lock);
@@ -26987,10 +26963,10 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.9/drive
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c
---- linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c	2011-11-15 20:02:59.000000000 -0500
-@@ -560,7 +560,7 @@ static int
+diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.1.1/drivers/gpu/drm/nouveau/nv04_graph.c
+--- linux-3.1.1/drivers/gpu/drm/nouveau/nv04_graph.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/nouveau/nv04_graph.c	2011-11-16 18:39:07.000000000 -0500
+@@ -554,7 +554,7 @@ static int
  nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
  			u32 class, u32 mthd, u32 data)
  {
@@ -26999,9 +26975,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.9/drivers/
  	return 0;
  }
  
-diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c
---- linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/r128/r128_cce.c linux-3.1.1/drivers/gpu/drm/r128/r128_cce.c
+--- linux-3.1.1/drivers/gpu/drm/r128/r128_cce.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/r128/r128_cce.c	2011-11-16 18:39:07.000000000 -0500
 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
  
  	/* GH: Simple idle check.
@@ -27011,9 +26987,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c linux-3.0.9/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.9/drivers/gpu/drm/r128/r128_drv.h linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h
---- linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/r128/r128_drv.h linux-3.1.1/drivers/gpu/drm/r128/r128_drv.h
+--- linux-3.1.1/drivers/gpu/drm/r128/r128_drv.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/r128/r128_drv.h	2011-11-16 18:39:07.000000000 -0500
 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
  	int is_pci;
  	unsigned long cce_buffers_offset;
@@ -27031,9 +27007,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h linux-3.0.9/drivers/gpu/d
  
  	u32 color_fmt;
  	unsigned int front_offset;
-diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c
---- linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/r128/r128_irq.c linux-3.1.1/drivers/gpu/drm/r128/r128_irq.c
+--- linux-3.1.1/drivers/gpu/drm/r128/r128_irq.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/r128/r128_irq.c	2011-11-16 18:39:07.000000000 -0500
 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
  	if (crtc != 0)
  		return 0;
@@ -27052,9 +27028,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c linux-3.0.9/drivers/gpu/d
  		drm_handle_vblank(dev, 0);
  		return IRQ_HANDLED;
  	}
-diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_state.c linux-3.0.9/drivers/gpu/drm/r128/r128_state.c
---- linux-3.0.9/drivers/gpu/drm/r128/r128_state.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/r128/r128_state.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/r128/r128_state.c linux-3.1.1/drivers/gpu/drm/r128/r128_state.c
+--- linux-3.1.1/drivers/gpu/drm/r128/r128_state.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/r128/r128_state.c	2011-11-16 18:39:07.000000000 -0500
 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv
  
  static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
@@ -27068,21 +27044,21 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_state.c linux-3.0.9/drivers/gpu
  }
  
  #endif
-diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/atom.c linux-3.0.9/drivers/gpu/drm/radeon/atom.c
---- linux-3.0.9/drivers/gpu/drm/radeon/atom.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/atom.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/atom.c linux-3.1.1/drivers/gpu/drm/radeon/atom.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/atom.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/atom.c	2011-11-16 19:09:42.000000000 -0500
 @@ -1254,6 +1254,8 @@ struct atom_context *atom_parse(struct c
  	char name[512];
  	int i;
  
 +	pax_track_stack();
 +
- 	ctx->card = card;
- 	ctx->bios = bios;
+ 	if (!ctx)
+ 		return NULL;
  
-diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c
---- linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/mkregtable.c linux-3.1.1/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/mkregtable.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/mkregtable.c	2011-11-16 18:39:07.000000000 -0500
 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 
  	regex_t mask_rex;
  	regmatch_t match[4];
@@ -27100,9 +27076,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.9/drivers/g
  
  	if (regcomp
  	    (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_atombios.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_atombios.c	2011-11-16 18:40:10.000000000 -0500
 @@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from
  	struct radeon_gpio_rec gpio;
  	struct radeon_hpd hpd;
@@ -27112,10 +27088,10 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.9/driv
  	if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset))
  		return false;
  
-diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c
---- linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c	2011-11-15 20:02:59.000000000 -0500
-@@ -678,7 +678,7 @@ static bool radeon_switcheroo_can_switch
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_device.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_device.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_device.c	2011-11-16 18:39:07.000000000 -0500
+@@ -684,7 +684,7 @@ static bool radeon_switcheroo_can_switch
  	bool can_switch;
  
  	spin_lock(&dev->count_lock);
@@ -27124,10 +27100,10 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.9/driver
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c
---- linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c	2011-11-15 20:02:59.000000000 -0500
-@@ -946,6 +946,8 @@ void radeon_compute_pll_legacy(struct ra
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_display.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_display.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_display.c	2011-11-16 18:40:10.000000000 -0500
+@@ -925,6 +925,8 @@ void radeon_compute_pll_legacy(struct ra
  	uint32_t post_div;
  	u32 pll_out_min, pll_out_max;
  
@@ -27136,9 +27112,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.9/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.9/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h
---- linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_drv.h linux-3.1.1/drivers/gpu/drm/radeon/radeon_drv.h
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_drv.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_drv.h	2011-11-16 18:39:07.000000000 -0500
 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
  
  	/* SW interrupt */
@@ -27148,9 +27124,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.9/drivers/g
  	int vblank_crtc;
  	uint32_t irq_enable_reg;
  	uint32_t r500_disp_irq_reg;
-diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c
---- linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_fence.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_fence.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_fence.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_fence.c	2011-11-16 18:39:07.000000000 -0500
 @@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_devi
  		write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
  		return 0;
@@ -27169,9 +27145,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.9/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.9/drivers/gpu/drm/radeon/radeon.h linux-3.0.9/drivers/gpu/drm/radeon/radeon.h
---- linux-3.0.9/drivers/gpu/drm/radeon/radeon.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon.h linux-3.1.1/drivers/gpu/drm/radeon/radeon.h
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon.h	2011-11-16 18:39:07.000000000 -0500
 @@ -192,7 +192,7 @@ extern int sumo_get_temp(struct radeon_d
   */
  struct radeon_fence_driver {
@@ -27190,9 +27166,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon.h linux-3.0.9/drivers/gpu/d
  
  /*
   * Asic structures
-diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c
---- linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_ioc32.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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))
@@ -27202,9 +27178,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.9/drivers
  			  &request->value))
  		return -EFAULT;
  
-diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c
---- linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_irq.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_irq.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_irq.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_irq.c	2011-11-16 18:39:07.000000000 -0500
 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
  	unsigned int ret;
  	RING_LOCALS;
@@ -27225,9 +27201,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.9/drivers/g
  	DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
  
  	dev->max_vblank_count = 0x001fffff;
-diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c
---- linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_state.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_state.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_state.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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;
@@ -27246,10 +27222,10 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.9/drivers
  
  	DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c	2011-11-15 20:02:59.000000000 -0500
-@@ -649,8 +649,10 @@ int radeon_mmap(struct file *filp, struc
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_ttm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_ttm.c	2011-11-16 18:39:07.000000000 -0500
+@@ -672,8 +672,10 @@ int radeon_mmap(struct file *filp, struc
  	}
  	if (unlikely(ttm_vm_ops == NULL)) {
  		ttm_vm_ops = vma->vm_ops;
@@ -27262,9 +27238,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.9/drivers/g
  	}
  	vma->vm_ops = &radeon_ttm_vm_ops;
  	return 0;
-diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/rs690.c linux-3.0.9/drivers/gpu/drm/radeon/rs690.c
---- linux-3.0.9/drivers/gpu/drm/radeon/rs690.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/rs690.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/rs690.c linux-3.1.1/drivers/gpu/drm/radeon/rs690.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/rs690.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/rs690.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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)
@@ -27278,9 +27254,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/rs690.c linux-3.0.9/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.9/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c
---- linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.1.1/drivers/gpu/drm/ttm/ttm_page_alloc.c
+--- linux-3.1.1/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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)
@@ -27293,9 +27269,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.9/drivers/
  	struct ttm_page_pool *pool;
  	int shrink_pages = sc->nr_to_scan;
  
-diff -urNp linux-3.0.9/drivers/gpu/drm/via/via_drv.h linux-3.0.9/drivers/gpu/drm/via/via_drv.h
---- linux-3.0.9/drivers/gpu/drm/via/via_drv.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/via/via_drv.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/via/via_drv.h linux-3.1.1/drivers/gpu/drm/via/via_drv.h
+--- linux-3.1.1/drivers/gpu/drm/via/via_drv.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/via/via_drv.h	2011-11-16 18:39:07.000000000 -0500
 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
  typedef uint32_t maskarray_t[5];
  
@@ -27314,9 +27290,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/via/via_drv.h linux-3.0.9/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.9/drivers/gpu/drm/via/via_irq.c linux-3.0.9/drivers/gpu/drm/via/via_irq.c
---- linux-3.0.9/drivers/gpu/drm/via/via_irq.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/via/via_irq.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/via/via_irq.c linux-3.1.1/drivers/gpu/drm/via/via_irq.c
+--- linux-3.1.1/drivers/gpu/drm/via/via_irq.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/via/via_irq.c	2011-11-16 18:39:07.000000000 -0500
 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
  	if (crtc != 0)
  		return 0;
@@ -27387,9 +27363,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/via/via_irq.c linux-3.0.9/drivers/gpu/drm
  		irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
  	case VIA_IRQ_ABSOLUTE:
  		break;
-diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
---- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+--- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-11-16 18:39:07.000000000 -0500
 @@ -240,7 +240,7 @@ struct vmw_private {
  	 * Fencing and IRQs.
  	 */
@@ -27399,9 +27375,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.9/drivers/g
  	wait_queue_head_t fence_queue;
  	wait_queue_head_t fifo_queue;
  	atomic_t fence_queue_waiters;
-diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
---- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+--- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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;
@@ -27411,9 +27387,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.9/drive
  	void *cmd;
  	uint32_t sequence;
  	struct vmw_sw_context *sw_context = &dev_priv->ctx;
-diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
---- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+--- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-11-16 18:39:07.000000000 -0500
 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev
  	while (!vmw_lag_lt(queue, us)) {
  		spin_lock(&queue->lock);
@@ -27423,9 +27399,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.9/drivers
  		else {
  			fence = list_first_entry(&queue->head,
  						 struct vmw_fence, head);
-diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
---- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+--- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-11-16 18:39:07.000000000 -0500
 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de
  		 (unsigned int) min,
  		 (unsigned int) fifo->capabilities);
@@ -27462,9 +27438,9 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.9/drivers/
  	} while (*sequence == 0);
  
  	if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
-diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
---- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+--- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-11-16 18:39:07.000000000 -0500
 @@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva
  	 * emitted. Then the fence is stale and signaled.
  	 */
@@ -27483,10 +27459,10 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.9/drivers/g
  	ret = 0;
  
  	for (;;) {
-diff -urNp linux-3.0.9/drivers/hid/hid-core.c linux-3.0.9/drivers/hid/hid-core.c
---- linux-3.0.9/drivers/hid/hid-core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/hid/hid-core.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1940,7 +1940,7 @@ static bool hid_ignore(struct hid_device
+diff -urNp linux-3.1.1/drivers/hid/hid-core.c linux-3.1.1/drivers/hid/hid-core.c
+--- linux-3.1.1/drivers/hid/hid-core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/hid/hid-core.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1951,7 +1951,7 @@ static bool hid_ignore(struct hid_device
  
  int hid_add_device(struct hid_device *hdev)
  {
@@ -27495,7 +27471,7 @@ diff -urNp linux-3.0.9/drivers/hid/hid-core.c linux-3.0.9/drivers/hid/hid-core.c
  	int ret;
  
  	if (WARN_ON(hdev->status & HID_STAT_ADDED))
-@@ -1955,7 +1955,7 @@ int hid_add_device(struct hid_device *hd
+@@ -1966,7 +1966,7 @@ int hid_add_device(struct hid_device *hd
  	/* XXX hack, any other cleaner solution after the driver core
  	 * is converted to allow more than 20 bytes as the device name? */
  	dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
@@ -27504,9 +27480,9 @@ diff -urNp linux-3.0.9/drivers/hid/hid-core.c linux-3.0.9/drivers/hid/hid-core.c
  
  	hid_debug_register(hdev, dev_name(&hdev->dev));
  	ret = device_add(&hdev->dev);
-diff -urNp linux-3.0.9/drivers/hid/usbhid/hiddev.c linux-3.0.9/drivers/hid/usbhid/hiddev.c
---- linux-3.0.9/drivers/hid/usbhid/hiddev.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/hid/usbhid/hiddev.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/hid/usbhid/hiddev.c linux-3.1.1/drivers/hid/usbhid/hiddev.c
+--- linux-3.1.1/drivers/hid/usbhid/hiddev.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/hid/usbhid/hiddev.c	2011-11-16 18:39:07.000000000 -0500
 @@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *fi
  		break;
  
@@ -27516,9 +27492,9 @@ diff -urNp linux-3.0.9/drivers/hid/usbhid/hiddev.c linux-3.0.9/drivers/hid/usbhi
  			break;
  
  		for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-3.0.9/drivers/hwmon/acpi_power_meter.c linux-3.0.9/drivers/hwmon/acpi_power_meter.c
---- linux-3.0.9/drivers/hwmon/acpi_power_meter.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/hwmon/acpi_power_meter.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/hwmon/acpi_power_meter.c linux-3.1.1/drivers/hwmon/acpi_power_meter.c
+--- linux-3.1.1/drivers/hwmon/acpi_power_meter.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/hwmon/acpi_power_meter.c	2011-11-16 18:39:07.000000000 -0500
 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
  		return res;
  
@@ -27528,9 +27504,9 @@ diff -urNp linux-3.0.9/drivers/hwmon/acpi_power_meter.c linux-3.0.9/drivers/hwmo
  
  	mutex_lock(&resource->lock);
  	resource->trip[attr->index - 7] = temp;
-diff -urNp linux-3.0.9/drivers/hwmon/sht15.c linux-3.0.9/drivers/hwmon/sht15.c
---- linux-3.0.9/drivers/hwmon/sht15.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/hwmon/sht15.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/hwmon/sht15.c linux-3.1.1/drivers/hwmon/sht15.c
+--- linux-3.1.1/drivers/hwmon/sht15.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/hwmon/sht15.c	2011-11-16 18:39:07.000000000 -0500
 @@ -166,7 +166,7 @@ struct sht15_data {
  	int				supply_uV;
  	bool				supply_uV_valid;
@@ -27579,23 +27555,9 @@ diff -urNp linux-3.0.9/drivers/hwmon/sht15.c linux-3.0.9/drivers/hwmon/sht15.c
  			return;
  	}
  
-diff -urNp linux-3.0.9/drivers/hwmon/w83791d.c linux-3.0.9/drivers/hwmon/w83791d.c
---- linux-3.0.9/drivers/hwmon/w83791d.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/hwmon/w83791d.c	2011-11-15 20:02:59.000000000 -0500
-@@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
- 			  struct i2c_board_info *info);
- static int w83791d_remove(struct i2c_client *client);
- 
--static int w83791d_read(struct i2c_client *client, u8 register);
--static int w83791d_write(struct i2c_client *client, u8 register, u8 value);
-+static int w83791d_read(struct i2c_client *client, u8 reg);
-+static int w83791d_write(struct i2c_client *client, u8 reg, u8 value);
- static struct w83791d_data *w83791d_update_device(struct device *dev);
- 
- #ifdef DEBUG
-diff -urNp linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c
---- linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.1.1/drivers/i2c/busses/i2c-amd756-s4882.c
+--- linux-3.1.1/drivers/i2c/busses/i2c-amd756-s4882.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/i2c/busses/i2c-amd756-s4882.c	2011-11-16 18:39:07.000000000 -0500
 @@ -43,7 +43,7 @@
  extern struct i2c_adapter amd756_smbus;
  
@@ -27605,9 +27567,9 @@ diff -urNp linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.9/drivers
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(amd756_lock);
-diff -urNp linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c
---- linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.1.1/drivers/i2c/busses/i2c-nforce2-s4985.c
+--- linux-3.1.1/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-11-16 18:39:07.000000000 -0500
 @@ -41,7 +41,7 @@
  extern struct i2c_adapter *nforce2_smbus;
  
@@ -27617,9 +27579,9 @@ diff -urNp linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.9/driver
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(nforce2_lock);
-diff -urNp linux-3.0.9/drivers/i2c/i2c-mux.c linux-3.0.9/drivers/i2c/i2c-mux.c
---- linux-3.0.9/drivers/i2c/i2c-mux.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/i2c/i2c-mux.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/i2c/i2c-mux.c linux-3.1.1/drivers/i2c/i2c-mux.c
+--- linux-3.1.1/drivers/i2c/i2c-mux.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/i2c/i2c-mux.c	2011-11-16 18:39:07.000000000 -0500
 @@ -28,7 +28,7 @@
  /* multiplexer per channel data */
  struct i2c_mux_priv {
@@ -27629,9 +27591,9 @@ diff -urNp linux-3.0.9/drivers/i2c/i2c-mux.c linux-3.0.9/drivers/i2c/i2c-mux.c
  
  	struct i2c_adapter *parent;
  	void *mux_dev;	/* the mux chip/device */
-diff -urNp linux-3.0.9/drivers/ide/aec62xx.c linux-3.0.9/drivers/ide/aec62xx.c
---- linux-3.0.9/drivers/ide/aec62xx.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/aec62xx.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/aec62xx.c linux-3.1.1/drivers/ide/aec62xx.c
+--- linux-3.1.1/drivers/ide/aec62xx.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/aec62xx.c	2011-11-16 18:39:07.000000000 -0500
 @@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_
  	.cable_detect		= atp86x_cable_detect,
  };
@@ -27641,9 +27603,9 @@ diff -urNp linux-3.0.9/drivers/ide/aec62xx.c linux-3.0.9/drivers/ide/aec62xx.c
  	{	/* 0: AEC6210 */
  		.name		= DRV_NAME,
  		.init_chipset	= init_chipset_aec62xx,
-diff -urNp linux-3.0.9/drivers/ide/alim15x3.c linux-3.0.9/drivers/ide/alim15x3.c
---- linux-3.0.9/drivers/ide/alim15x3.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/alim15x3.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/alim15x3.c linux-3.1.1/drivers/ide/alim15x3.c
+--- linux-3.1.1/drivers/ide/alim15x3.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/alim15x3.c	2011-11-16 18:39:07.000000000 -0500
 @@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_
  	.dma_sff_read_status	= ide_dma_sff_read_status,
  };
@@ -27653,9 +27615,9 @@ diff -urNp linux-3.0.9/drivers/ide/alim15x3.c linux-3.0.9/drivers/ide/alim15x3.c
  	.name		= DRV_NAME,
  	.init_chipset	= init_chipset_ali15x3,
  	.init_hwif	= init_hwif_ali15x3,
-diff -urNp linux-3.0.9/drivers/ide/amd74xx.c linux-3.0.9/drivers/ide/amd74xx.c
---- linux-3.0.9/drivers/ide/amd74xx.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/amd74xx.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/amd74xx.c linux-3.1.1/drivers/ide/amd74xx.c
+--- linux-3.1.1/drivers/ide/amd74xx.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/amd74xx.c	2011-11-16 18:39:07.000000000 -0500
 @@ -223,7 +223,7 @@ static const struct ide_port_ops amd_por
  		.udma_mask	= udma,					\
  	}
@@ -27665,9 +27627,9 @@ diff -urNp linux-3.0.9/drivers/ide/amd74xx.c linux-3.0.9/drivers/ide/amd74xx.c
  	/* 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.9/drivers/ide/atiixp.c linux-3.0.9/drivers/ide/atiixp.c
---- linux-3.0.9/drivers/ide/atiixp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/atiixp.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/atiixp.c linux-3.1.1/drivers/ide/atiixp.c
+--- linux-3.1.1/drivers/ide/atiixp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/atiixp.c	2011-11-16 18:39:07.000000000 -0500
 @@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_
  	.cable_detect		= atiixp_cable_detect,
  };
@@ -27677,9 +27639,9 @@ diff -urNp linux-3.0.9/drivers/ide/atiixp.c linux-3.0.9/drivers/ide/atiixp.c
  	{	/* 0: IXP200/300/400/700 */
  		.name		= DRV_NAME,
  		.enablebits	= {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
-diff -urNp linux-3.0.9/drivers/ide/cmd64x.c linux-3.0.9/drivers/ide/cmd64x.c
---- linux-3.0.9/drivers/ide/cmd64x.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/cmd64x.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/cmd64x.c linux-3.1.1/drivers/ide/cmd64x.c
+--- linux-3.1.1/drivers/ide/cmd64x.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/cmd64x.c	2011-11-16 18:39:07.000000000 -0500
 @@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_r
  	.dma_sff_read_status	= ide_dma_sff_read_status,
  };
@@ -27689,9 +27651,9 @@ diff -urNp linux-3.0.9/drivers/ide/cmd64x.c linux-3.0.9/drivers/ide/cmd64x.c
  	{	/* 0: CMD643 */
  		.name		= DRV_NAME,
  		.init_chipset	= init_chipset_cmd64x,
-diff -urNp linux-3.0.9/drivers/ide/cs5520.c linux-3.0.9/drivers/ide/cs5520.c
---- linux-3.0.9/drivers/ide/cs5520.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/cs5520.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/cs5520.c linux-3.1.1/drivers/ide/cs5520.c
+--- linux-3.1.1/drivers/ide/cs5520.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/cs5520.c	2011-11-16 18:39:07.000000000 -0500
 @@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_
  	.set_dma_mode		= cs5520_set_dma_mode,
  };
@@ -27701,9 +27663,9 @@ diff -urNp linux-3.0.9/drivers/ide/cs5520.c linux-3.0.9/drivers/ide/cs5520.c
  	.name		= DRV_NAME,
  	.enablebits	= { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
  	.port_ops	= &cs5520_port_ops,
-diff -urNp linux-3.0.9/drivers/ide/cs5530.c linux-3.0.9/drivers/ide/cs5530.c
---- linux-3.0.9/drivers/ide/cs5530.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/cs5530.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/cs5530.c linux-3.1.1/drivers/ide/cs5530.c
+--- linux-3.1.1/drivers/ide/cs5530.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/cs5530.c	2011-11-16 18:39:07.000000000 -0500
 @@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_
  	.udma_filter		= cs5530_udma_filter,
  };
@@ -27713,9 +27675,9 @@ diff -urNp linux-3.0.9/drivers/ide/cs5530.c linux-3.0.9/drivers/ide/cs5530.c
  	.name		= DRV_NAME,
  	.init_chipset	= init_chipset_cs5530,
  	.init_hwif	= init_hwif_cs5530,
-diff -urNp linux-3.0.9/drivers/ide/cs5535.c linux-3.0.9/drivers/ide/cs5535.c
---- linux-3.0.9/drivers/ide/cs5535.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/cs5535.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/cs5535.c linux-3.1.1/drivers/ide/cs5535.c
+--- linux-3.1.1/drivers/ide/cs5535.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/cs5535.c	2011-11-16 18:39:07.000000000 -0500
 @@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_
  	.cable_detect		= cs5535_cable_detect,
  };
@@ -27725,10 +27687,10 @@ diff -urNp linux-3.0.9/drivers/ide/cs5535.c linux-3.0.9/drivers/ide/cs5535.c
  	.name		= DRV_NAME,
  	.port_ops	= &cs5535_port_ops,
  	.host_flags	= IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
-diff -urNp linux-3.0.9/drivers/ide/cy82c693.c linux-3.0.9/drivers/ide/cy82c693.c
---- linux-3.0.9/drivers/ide/cy82c693.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/cy82c693.c	2011-11-15 20:02:59.000000000 -0500
-@@ -161,7 +161,7 @@ static const struct ide_port_ops cy82c69
+diff -urNp linux-3.1.1/drivers/ide/cy82c693.c linux-3.1.1/drivers/ide/cy82c693.c
+--- linux-3.1.1/drivers/ide/cy82c693.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/cy82c693.c	2011-11-16 18:39:07.000000000 -0500
+@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c69
  	.set_dma_mode		= cy82c693_set_dma_mode,
  };
  
@@ -27737,9 +27699,9 @@ diff -urNp linux-3.0.9/drivers/ide/cy82c693.c linux-3.0.9/drivers/ide/cy82c693.c
  	.name		= DRV_NAME,
  	.init_iops	= init_iops_cy82c693,
  	.port_ops	= &cy82c693_port_ops,
-diff -urNp linux-3.0.9/drivers/ide/hpt366.c linux-3.0.9/drivers/ide/hpt366.c
---- linux-3.0.9/drivers/ide/hpt366.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/hpt366.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/hpt366.c linux-3.1.1/drivers/ide/hpt366.c
+--- linux-3.1.1/drivers/ide/hpt366.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/hpt366.c	2011-11-16 18:39:07.000000000 -0500
 @@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings
  	}
  };
@@ -27848,9 +27810,9 @@ diff -urNp linux-3.0.9/drivers/ide/hpt366.c linux-3.0.9/drivers/ide/hpt366.c
  	{	/* 0: HPT36x */
  		.name		= DRV_NAME,
  		.init_chipset	= init_chipset_hpt366,
-diff -urNp linux-3.0.9/drivers/ide/ide-cd.c linux-3.0.9/drivers/ide/ide-cd.c
---- linux-3.0.9/drivers/ide/ide-cd.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/ide-cd.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/ide-cd.c linux-3.1.1/drivers/ide/ide-cd.c
+--- linux-3.1.1/drivers/ide/ide-cd.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/ide-cd.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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
@@ -27860,9 +27822,9 @@ diff -urNp linux-3.0.9/drivers/ide/ide-cd.c linux-3.0.9/drivers/ide/ide-cd.c
  			drive->dma = 0;
  	}
  }
-diff -urNp linux-3.0.9/drivers/ide/ide-floppy.c linux-3.0.9/drivers/ide/ide-floppy.c
---- linux-3.0.9/drivers/ide/ide-floppy.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/ide-floppy.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/ide-floppy.c linux-3.1.1/drivers/ide/ide-floppy.c
+--- linux-3.1.1/drivers/ide/ide-floppy.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/ide-floppy.c	2011-11-16 18:40:10.000000000 -0500
 @@ -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;
@@ -27872,9 +27834,9 @@ diff -urNp linux-3.0.9/drivers/ide/ide-floppy.c linux-3.0.9/drivers/ide/ide-flop
  	ide_debug_log(IDE_DBG_FUNC, "enter");
  
  	drive->bios_cyl = 0;
-diff -urNp linux-3.0.9/drivers/ide/ide-pci-generic.c linux-3.0.9/drivers/ide/ide-pci-generic.c
---- linux-3.0.9/drivers/ide/ide-pci-generic.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/ide-pci-generic.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/ide-pci-generic.c linux-3.1.1/drivers/ide/ide-pci-generic.c
+--- linux-3.1.1/drivers/ide/ide-pci-generic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/ide-pci-generic.c	2011-11-16 18:39:07.000000000 -0500
 @@ -53,7 +53,7 @@ static const struct ide_port_ops netcell
  		.udma_mask	= ATA_UDMA6, \
  	}
@@ -27884,9 +27846,9 @@ diff -urNp linux-3.0.9/drivers/ide/ide-pci-generic.c linux-3.0.9/drivers/ide/ide
  	/*  0: Unknown */
  	DECLARE_GENERIC_PCI_DEV(0),
  
-diff -urNp linux-3.0.9/drivers/ide/it8172.c linux-3.0.9/drivers/ide/it8172.c
---- linux-3.0.9/drivers/ide/it8172.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/it8172.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/it8172.c linux-3.1.1/drivers/ide/it8172.c
+--- linux-3.1.1/drivers/ide/it8172.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/it8172.c	2011-11-16 18:39:07.000000000 -0500
 @@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_
  	.set_dma_mode	= it8172_set_dma_mode,
  };
@@ -27896,9 +27858,9 @@ diff -urNp linux-3.0.9/drivers/ide/it8172.c linux-3.0.9/drivers/ide/it8172.c
  	.name		= DRV_NAME,
  	.port_ops	= &it8172_port_ops,
  	.enablebits	= { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
-diff -urNp linux-3.0.9/drivers/ide/it8213.c linux-3.0.9/drivers/ide/it8213.c
---- linux-3.0.9/drivers/ide/it8213.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/it8213.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/it8213.c linux-3.1.1/drivers/ide/it8213.c
+--- linux-3.1.1/drivers/ide/it8213.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/it8213.c	2011-11-16 18:39:07.000000000 -0500
 @@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_
  	.cable_detect		= it8213_cable_detect,
  };
@@ -27908,9 +27870,9 @@ diff -urNp linux-3.0.9/drivers/ide/it8213.c linux-3.0.9/drivers/ide/it8213.c
  	.name		= DRV_NAME,
  	.enablebits	= { {0x41, 0x80, 0x80} },
  	.port_ops	= &it8213_port_ops,
-diff -urNp linux-3.0.9/drivers/ide/it821x.c linux-3.0.9/drivers/ide/it821x.c
---- linux-3.0.9/drivers/ide/it821x.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/it821x.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/it821x.c linux-3.1.1/drivers/ide/it821x.c
+--- linux-3.1.1/drivers/ide/it821x.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/it821x.c	2011-11-16 18:39:07.000000000 -0500
 @@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_
  	.cable_detect		= it821x_cable_detect,
  };
@@ -27920,9 +27882,9 @@ diff -urNp linux-3.0.9/drivers/ide/it821x.c linux-3.0.9/drivers/ide/it821x.c
  	.name		= DRV_NAME,
  	.init_chipset	= init_chipset_it821x,
  	.init_hwif	= init_hwif_it821x,
-diff -urNp linux-3.0.9/drivers/ide/jmicron.c linux-3.0.9/drivers/ide/jmicron.c
---- linux-3.0.9/drivers/ide/jmicron.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/jmicron.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/jmicron.c linux-3.1.1/drivers/ide/jmicron.c
+--- linux-3.1.1/drivers/ide/jmicron.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/jmicron.c	2011-11-16 18:39:07.000000000 -0500
 @@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron
  	.cable_detect		= jmicron_cable_detect,
  };
@@ -27932,9 +27894,9 @@ diff -urNp linux-3.0.9/drivers/ide/jmicron.c linux-3.0.9/drivers/ide/jmicron.c
  	.name		= DRV_NAME,
  	.enablebits	= { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
  	.port_ops	= &jmicron_port_ops,
-diff -urNp linux-3.0.9/drivers/ide/ns87415.c linux-3.0.9/drivers/ide/ns87415.c
---- linux-3.0.9/drivers/ide/ns87415.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/ns87415.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/ns87415.c linux-3.1.1/drivers/ide/ns87415.c
+--- linux-3.1.1/drivers/ide/ns87415.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/ns87415.c	2011-11-16 18:39:07.000000000 -0500
 @@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_
  	.dma_sff_read_status	= superio_dma_sff_read_status,
  };
@@ -27944,9 +27906,9 @@ diff -urNp linux-3.0.9/drivers/ide/ns87415.c linux-3.0.9/drivers/ide/ns87415.c
  	.name		= DRV_NAME,
  	.init_hwif	= init_hwif_ns87415,
  	.tp_ops 	= &ns87415_tp_ops,
-diff -urNp linux-3.0.9/drivers/ide/opti621.c linux-3.0.9/drivers/ide/opti621.c
---- linux-3.0.9/drivers/ide/opti621.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/opti621.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/opti621.c linux-3.1.1/drivers/ide/opti621.c
+--- linux-3.1.1/drivers/ide/opti621.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/opti621.c	2011-11-16 18:39:07.000000000 -0500
 @@ -131,7 +131,7 @@ static const struct ide_port_ops opti621
  	.set_pio_mode		= opti621_set_pio_mode,
  };
@@ -27956,9 +27918,9 @@ diff -urNp linux-3.0.9/drivers/ide/opti621.c linux-3.0.9/drivers/ide/opti621.c
  	.name		= DRV_NAME,
  	.enablebits	= { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
  	.port_ops	= &opti621_port_ops,
-diff -urNp linux-3.0.9/drivers/ide/pdc202xx_new.c linux-3.0.9/drivers/ide/pdc202xx_new.c
---- linux-3.0.9/drivers/ide/pdc202xx_new.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/pdc202xx_new.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/pdc202xx_new.c linux-3.1.1/drivers/ide/pdc202xx_new.c
+--- linux-3.1.1/drivers/ide/pdc202xx_new.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/pdc202xx_new.c	2011-11-16 18:39:07.000000000 -0500
 @@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_
  		.udma_mask	= udma, \
  	}
@@ -27968,9 +27930,9 @@ diff -urNp linux-3.0.9/drivers/ide/pdc202xx_new.c linux-3.0.9/drivers/ide/pdc202
  	/* 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.9/drivers/ide/pdc202xx_old.c linux-3.0.9/drivers/ide/pdc202xx_old.c
---- linux-3.0.9/drivers/ide/pdc202xx_old.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/pdc202xx_old.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/pdc202xx_old.c linux-3.1.1/drivers/ide/pdc202xx_old.c
+--- linux-3.1.1/drivers/ide/pdc202xx_old.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/pdc202xx_old.c	2011-11-16 18:39:07.000000000 -0500
 @@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x
  		.max_sectors	= sectors, \
  	}
@@ -27980,9 +27942,9 @@ diff -urNp linux-3.0.9/drivers/ide/pdc202xx_old.c linux-3.0.9/drivers/ide/pdc202
  	{	/* 0: PDC20246 */
  		.name		= DRV_NAME,
  		.init_chipset	= init_chipset_pdc202xx,
-diff -urNp linux-3.0.9/drivers/ide/piix.c linux-3.0.9/drivers/ide/piix.c
---- linux-3.0.9/drivers/ide/piix.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/piix.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/piix.c linux-3.1.1/drivers/ide/piix.c
+--- linux-3.1.1/drivers/ide/piix.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/piix.c	2011-11-16 18:39:07.000000000 -0500
 @@ -344,7 +344,7 @@ static const struct ide_port_ops ich_por
  		.udma_mask	= udma, \
  	}
@@ -27992,9 +27954,9 @@ diff -urNp linux-3.0.9/drivers/ide/piix.c linux-3.0.9/drivers/ide/piix.c
  	/* 0: MPIIX */
  	{	/*
  		 * MPIIX actually has only a single IDE channel mapped to
-diff -urNp linux-3.0.9/drivers/ide/rz1000.c linux-3.0.9/drivers/ide/rz1000.c
---- linux-3.0.9/drivers/ide/rz1000.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/rz1000.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/rz1000.c linux-3.1.1/drivers/ide/rz1000.c
+--- linux-3.1.1/drivers/ide/rz1000.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/rz1000.c	2011-11-16 18:39:07.000000000 -0500
 @@ -38,7 +38,7 @@ static int __devinit rz1000_disable_read
  	}
  }
@@ -28004,9 +27966,9 @@ diff -urNp linux-3.0.9/drivers/ide/rz1000.c linux-3.0.9/drivers/ide/rz1000.c
  	.name		= DRV_NAME,
  	.host_flags	= IDE_HFLAG_NO_DMA,
  };
-diff -urNp linux-3.0.9/drivers/ide/sc1200.c linux-3.0.9/drivers/ide/sc1200.c
---- linux-3.0.9/drivers/ide/sc1200.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/sc1200.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/sc1200.c linux-3.1.1/drivers/ide/sc1200.c
+--- linux-3.1.1/drivers/ide/sc1200.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/sc1200.c	2011-11-16 18:39:07.000000000 -0500
 @@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_d
  	.dma_sff_read_status	= ide_dma_sff_read_status,
  };
@@ -28016,9 +27978,9 @@ diff -urNp linux-3.0.9/drivers/ide/sc1200.c linux-3.0.9/drivers/ide/sc1200.c
  	.name		= DRV_NAME,
  	.port_ops	= &sc1200_port_ops,
  	.dma_ops	= &sc1200_dma_ops,
-diff -urNp linux-3.0.9/drivers/ide/scc_pata.c linux-3.0.9/drivers/ide/scc_pata.c
---- linux-3.0.9/drivers/ide/scc_pata.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/scc_pata.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/scc_pata.c linux-3.1.1/drivers/ide/scc_pata.c
+--- linux-3.1.1/drivers/ide/scc_pata.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/scc_pata.c	2011-11-16 18:39:07.000000000 -0500
 @@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_
  	.dma_sff_read_status	= scc_dma_sff_read_status,
  };
@@ -28028,9 +27990,9 @@ diff -urNp linux-3.0.9/drivers/ide/scc_pata.c linux-3.0.9/drivers/ide/scc_pata.c
  	.name		= "sccIDE",
  	.init_iops	= init_iops_scc,
  	.init_dma	= scc_init_dma,
-diff -urNp linux-3.0.9/drivers/ide/serverworks.c linux-3.0.9/drivers/ide/serverworks.c
---- linux-3.0.9/drivers/ide/serverworks.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/serverworks.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/serverworks.c linux-3.1.1/drivers/ide/serverworks.c
+--- linux-3.1.1/drivers/ide/serverworks.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/serverworks.c	2011-11-16 18:39:07.000000000 -0500
 @@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_p
  	.cable_detect		= svwks_cable_detect,
  };
@@ -28040,9 +28002,9 @@ diff -urNp linux-3.0.9/drivers/ide/serverworks.c linux-3.0.9/drivers/ide/serverw
  	{	/* 0: OSB4 */
  		.name		= DRV_NAME,
  		.init_chipset	= init_chipset_svwks,
-diff -urNp linux-3.0.9/drivers/ide/setup-pci.c linux-3.0.9/drivers/ide/setup-pci.c
---- linux-3.0.9/drivers/ide/setup-pci.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/setup-pci.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/setup-pci.c linux-3.1.1/drivers/ide/setup-pci.c
+--- linux-3.1.1/drivers/ide/setup-pci.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/setup-pci.c	2011-11-16 18:40:10.000000000 -0500
 @@ -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 };
@@ -28052,9 +28014,9 @@ diff -urNp linux-3.0.9/drivers/ide/setup-pci.c linux-3.0.9/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.9/drivers/ide/siimage.c linux-3.0.9/drivers/ide/siimage.c
---- linux-3.0.9/drivers/ide/siimage.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/siimage.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/siimage.c linux-3.1.1/drivers/ide/siimage.c
+--- linux-3.1.1/drivers/ide/siimage.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/siimage.c	2011-11-16 18:39:07.000000000 -0500
 @@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_
  		.udma_mask	= ATA_UDMA6,		\
  	}
@@ -28064,9 +28026,9 @@ diff -urNp linux-3.0.9/drivers/ide/siimage.c linux-3.0.9/drivers/ide/siimage.c
  	/* 0: SiI680 */  DECLARE_SII_DEV(&sil_pata_port_ops),
  	/* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
  };
-diff -urNp linux-3.0.9/drivers/ide/sis5513.c linux-3.0.9/drivers/ide/sis5513.c
---- linux-3.0.9/drivers/ide/sis5513.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/sis5513.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/sis5513.c linux-3.1.1/drivers/ide/sis5513.c
+--- linux-3.1.1/drivers/ide/sis5513.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/sis5513.c	2011-11-16 18:39:07.000000000 -0500
 @@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata
  	.cable_detect		= sis_cable_detect,
  };
@@ -28076,9 +28038,9 @@ diff -urNp linux-3.0.9/drivers/ide/sis5513.c linux-3.0.9/drivers/ide/sis5513.c
  	.name		= DRV_NAME,
  	.init_chipset	= init_chipset_sis5513,
  	.enablebits	= { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
-diff -urNp linux-3.0.9/drivers/ide/sl82c105.c linux-3.0.9/drivers/ide/sl82c105.c
---- linux-3.0.9/drivers/ide/sl82c105.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/sl82c105.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/sl82c105.c linux-3.1.1/drivers/ide/sl82c105.c
+--- linux-3.1.1/drivers/ide/sl82c105.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/sl82c105.c	2011-11-16 18:39:07.000000000 -0500
 @@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105
  	.dma_sff_read_status	= ide_dma_sff_read_status,
  };
@@ -28088,9 +28050,9 @@ diff -urNp linux-3.0.9/drivers/ide/sl82c105.c linux-3.0.9/drivers/ide/sl82c105.c
  	.name		= DRV_NAME,
  	.init_chipset	= init_chipset_sl82c105,
  	.enablebits	= {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
-diff -urNp linux-3.0.9/drivers/ide/slc90e66.c linux-3.0.9/drivers/ide/slc90e66.c
---- linux-3.0.9/drivers/ide/slc90e66.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/slc90e66.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/slc90e66.c linux-3.1.1/drivers/ide/slc90e66.c
+--- linux-3.1.1/drivers/ide/slc90e66.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/slc90e66.c	2011-11-16 18:39:07.000000000 -0500
 @@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e6
  	.cable_detect		= slc90e66_cable_detect,
  };
@@ -28100,9 +28062,9 @@ diff -urNp linux-3.0.9/drivers/ide/slc90e66.c linux-3.0.9/drivers/ide/slc90e66.c
  	.name		= DRV_NAME,
  	.enablebits	= { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
  	.port_ops	= &slc90e66_port_ops,
-diff -urNp linux-3.0.9/drivers/ide/tc86c001.c linux-3.0.9/drivers/ide/tc86c001.c
---- linux-3.0.9/drivers/ide/tc86c001.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/tc86c001.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/tc86c001.c linux-3.1.1/drivers/ide/tc86c001.c
+--- linux-3.1.1/drivers/ide/tc86c001.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/tc86c001.c	2011-11-16 18:39:07.000000000 -0500
 @@ -191,7 +191,7 @@ static const struct ide_dma_ops tc86c001
  	.dma_sff_read_status	= ide_dma_sff_read_status,
  };
@@ -28112,9 +28074,9 @@ diff -urNp linux-3.0.9/drivers/ide/tc86c001.c linux-3.0.9/drivers/ide/tc86c001.c
  	.name		= DRV_NAME,
  	.init_hwif	= init_hwif_tc86c001,
  	.port_ops	= &tc86c001_port_ops,
-diff -urNp linux-3.0.9/drivers/ide/triflex.c linux-3.0.9/drivers/ide/triflex.c
---- linux-3.0.9/drivers/ide/triflex.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/triflex.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/triflex.c linux-3.1.1/drivers/ide/triflex.c
+--- linux-3.1.1/drivers/ide/triflex.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/triflex.c	2011-11-16 18:39:07.000000000 -0500
 @@ -92,7 +92,7 @@ static const struct ide_port_ops triflex
  	.set_dma_mode		= triflex_set_mode,
  };
@@ -28124,9 +28086,9 @@ diff -urNp linux-3.0.9/drivers/ide/triflex.c linux-3.0.9/drivers/ide/triflex.c
  	.name		= DRV_NAME,
  	.enablebits	= {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
  	.port_ops	= &triflex_port_ops,
-diff -urNp linux-3.0.9/drivers/ide/trm290.c linux-3.0.9/drivers/ide/trm290.c
---- linux-3.0.9/drivers/ide/trm290.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/trm290.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/trm290.c linux-3.1.1/drivers/ide/trm290.c
+--- linux-3.1.1/drivers/ide/trm290.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/trm290.c	2011-11-16 18:39:07.000000000 -0500
 @@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops
  	.dma_check		= trm290_dma_check,
  };
@@ -28136,9 +28098,9 @@ diff -urNp linux-3.0.9/drivers/ide/trm290.c linux-3.0.9/drivers/ide/trm290.c
  	.name		= DRV_NAME,
  	.init_hwif	= init_hwif_trm290,
  	.tp_ops 	= &trm290_tp_ops,
-diff -urNp linux-3.0.9/drivers/ide/via82cxxx.c linux-3.0.9/drivers/ide/via82cxxx.c
---- linux-3.0.9/drivers/ide/via82cxxx.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/via82cxxx.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/ide/via82cxxx.c linux-3.1.1/drivers/ide/via82cxxx.c
+--- linux-3.1.1/drivers/ide/via82cxxx.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/via82cxxx.c	2011-11-16 18:39:07.000000000 -0500
 @@ -403,7 +403,7 @@ static const struct ide_port_ops via_por
  	.cable_detect		= via82cxxx_cable_detect,
  };
@@ -28148,9 +28110,9 @@ diff -urNp linux-3.0.9/drivers/ide/via82cxxx.c linux-3.0.9/drivers/ide/via82cxxx
  	.name		= DRV_NAME,
  	.init_chipset	= init_chipset_via82cxxx,
  	.enablebits	= { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
-diff -urNp linux-3.0.9/drivers/infiniband/core/cm.c linux-3.0.9/drivers/infiniband/core/cm.c
---- linux-3.0.9/drivers/infiniband/core/cm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/core/cm.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/infiniband/core/cm.c linux-3.1.1/drivers/infiniband/core/cm.c
+--- linux-3.1.1/drivers/infiniband/core/cm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/core/cm.c	2011-11-16 18:39:07.000000000 -0500
 @@ -113,7 +113,7 @@ static char const counter_group_names[CM
  
  struct cm_counter_group {
@@ -28290,9 +28252,9 @@ diff -urNp linux-3.0.9/drivers/infiniband/core/cm.c linux-3.0.9/drivers/infiniba
  }
  
  static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-3.0.9/drivers/infiniband/core/fmr_pool.c linux-3.0.9/drivers/infiniband/core/fmr_pool.c
---- linux-3.0.9/drivers/infiniband/core/fmr_pool.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/core/fmr_pool.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/infiniband/core/fmr_pool.c linux-3.1.1/drivers/infiniband/core/fmr_pool.c
+--- linux-3.1.1/drivers/infiniband/core/fmr_pool.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/core/fmr_pool.c	2011-11-16 18:39:07.000000000 -0500
 @@ -97,8 +97,8 @@ struct ib_fmr_pool {
  
  	struct task_struct       *thread;
@@ -28360,9 +28322,9 @@ diff -urNp linux-3.0.9/drivers/infiniband/core/fmr_pool.c linux-3.0.9/drivers/in
  				wake_up_process(pool->thread);
  			}
  		}
-diff -urNp linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c
---- linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/infiniband/hw/cxgb4/mem.c linux-3.1.1/drivers/infiniband/hw/cxgb4/mem.c
+--- linux-3.1.1/drivers/infiniband/hw/cxgb4/mem.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/cxgb4/mem.c	2011-11-16 18:39:07.000000000 -0500
 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r
  	int err;
  	struct fw_ri_tpte tpt;
@@ -28381,9 +28343,9 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.9/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.9/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c
---- linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.1.1/drivers/infiniband/hw/ipath/ipath_fs.c
+--- linux-3.1.1/drivers/infiniband/hw/ipath/ipath_fs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/ipath/ipath_fs.c	2011-11-16 18:40:10.000000000 -0500
 @@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru
  	struct infinipath_counters counters;
  	struct ipath_devdata *dd;
@@ -28393,9 +28355,9 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.9/driver
  	dd = file->f_path.dentry->d_inode->i_private;
  	dd->ipath_f_read_counters(dd, &counters);
  
-diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c
---- linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.1.1/drivers/infiniband/hw/ipath/ipath_rc.c
+--- linux-3.1.1/drivers/infiniband/hw/ipath/ipath_rc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/ipath/ipath_rc.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de
  		struct ib_atomic_eth *ateth;
  		struct ipath_ack_entry *e;
@@ -28419,9 +28381,9 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.9/driver
  			(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
  				      be64_to_cpu(ateth->compare_data),
  				      sdata);
-diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c
---- linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.1.1/drivers/infiniband/hw/ipath/ipath_ruc.c
+--- linux-3.1.1/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-11-16 18:39:07.000000000 -0500
 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip
  	unsigned long flags;
  	struct ib_wc wc;
@@ -28445,9 +28407,9 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.9/drive
  			(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
  				      sdata, wqe->wr.wr.atomic.swap);
  		goto send_comp;
-diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes.c linux-3.0.9/drivers/infiniband/hw/nes/nes.c
---- linux-3.0.9/drivers/infiniband/hw/nes/nes.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/nes/nes.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes.c linux-3.1.1/drivers/infiniband/hw/nes/nes.c
+--- linux-3.1.1/drivers/infiniband/hw/nes/nes.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/nes/nes.c	2011-11-16 18:39:07.000000000 -0500
 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
  LIST_HEAD(nes_adapter_list);
  static LIST_HEAD(nes_dev_list);
@@ -28466,9 +28428,9 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes.c linux-3.0.9/drivers/infin
  
  	/* Free the control structures */
  
-diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c
---- linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes_cm.c linux-3.1.1/drivers/infiniband/hw/nes/nes_cm.c
+--- linux-3.1.1/drivers/infiniband/hw/nes/nes_cm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/nes/nes_cm.c	2011-11-16 18:39:07.000000000 -0500
 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
  u32 cm_packets_retrans;
  u32 cm_packets_created;
@@ -28665,9 +28627,9 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.9/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.9/drivers/infiniband/hw/nes/nes.h linux-3.0.9/drivers/infiniband/hw/nes/nes.h
---- linux-3.0.9/drivers/infiniband/hw/nes/nes.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/nes/nes.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes.h linux-3.1.1/drivers/infiniband/hw/nes/nes.h
+--- linux-3.1.1/drivers/infiniband/hw/nes/nes.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/nes/nes.h	2011-11-16 18:39:07.000000000 -0500
 @@ -175,17 +175,17 @@ extern unsigned int nes_debug_level;
  extern unsigned int wqm_quanta;
  extern struct list_head nes_adapter_list;
@@ -28719,9 +28681,9 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes.h linux-3.0.9/drivers/infin
  
  extern u32 int_mod_timer_init;
  extern u32 int_mod_cq_depth_256;
-diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c
---- linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes_nic.c linux-3.1.1/drivers/infiniband/hw/nes/nes_nic.c
+--- linux-3.1.1/drivers/infiniband/hw/nes/nes_nic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/nes/nes_nic.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1274,31 +1274,31 @@ static void nes_netdev_get_ethtool_stats
  	target_stat_values[++index] = mh_detected;
  	target_stat_values[++index] = mh_pauses_sent;
@@ -28772,9 +28734,9 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.9/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.9/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c
---- linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes_verbs.c linux-3.1.1/drivers/infiniband/hw/nes/nes_verbs.c
+--- linux-3.1.1/drivers/infiniband/hw/nes/nes_verbs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/nes/nes_verbs.c	2011-11-16 18:39:07.000000000 -0500
 @@ -46,9 +46,9 @@
  
  #include <rdma/ib_umem.h>
@@ -28788,7 +28750,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.9/drivers
  
  static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
  
-@@ -1141,7 +1141,7 @@ static struct ib_qp *nes_create_qp(struc
+@@ -1131,7 +1131,7 @@ static struct ib_qp *nes_create_qp(struc
  	if (init_attr->create_flags)
  		return ERR_PTR(-EINVAL);
  
@@ -28797,7 +28759,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.9/drivers
  	switch (init_attr->qp_type) {
  		case IB_QPT_RC:
  			if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
-@@ -1470,7 +1470,7 @@ static int nes_destroy_qp(struct ib_qp *
+@@ -1460,7 +1460,7 @@ static int nes_destroy_qp(struct ib_qp *
  	struct iw_cm_event cm_event;
  	int ret;
  
@@ -28806,9 +28768,9 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.9/drivers
  	nesqp->destroyed = 1;
  
  	/* Blow away the connection if it exists. */
-diff -urNp linux-3.0.9/drivers/infiniband/hw/qib/qib.h linux-3.0.9/drivers/infiniband/hw/qib/qib.h
---- linux-3.0.9/drivers/infiniband/hw/qib/qib.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/qib/qib.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/infiniband/hw/qib/qib.h linux-3.1.1/drivers/infiniband/hw/qib/qib.h
+--- linux-3.1.1/drivers/infiniband/hw/qib/qib.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/qib/qib.h	2011-11-16 18:39:07.000000000 -0500
 @@ -51,6 +51,7 @@
  #include <linux/completion.h>
  #include <linux/kref.h>
@@ -28817,9 +28779,9 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/qib/qib.h linux-3.0.9/drivers/infin
  
  #include "qib_common.h"
  #include "qib_verbs.h"
-diff -urNp linux-3.0.9/drivers/input/gameport/gameport.c linux-3.0.9/drivers/input/gameport/gameport.c
---- linux-3.0.9/drivers/input/gameport/gameport.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/input/gameport/gameport.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/input/gameport/gameport.c linux-3.1.1/drivers/input/gameport/gameport.c
+--- linux-3.1.1/drivers/input/gameport/gameport.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/input/gameport/gameport.c	2011-11-16 18:39:07.000000000 -0500
 @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
   */
  static void gameport_init_port(struct gameport *gameport)
@@ -28837,9 +28799,9 @@ diff -urNp linux-3.0.9/drivers/input/gameport/gameport.c linux-3.0.9/drivers/inp
  	gameport->dev.bus = &gameport_bus;
  	gameport->dev.release = gameport_release_port;
  	if (gameport->parent)
-diff -urNp linux-3.0.9/drivers/input/input.c linux-3.0.9/drivers/input/input.c
---- linux-3.0.9/drivers/input/input.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/input/input.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/input/input.c linux-3.1.1/drivers/input/input.c
+--- linux-3.1.1/drivers/input/input.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/input/input.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struc
   */
  int input_register_device(struct input_dev *dev)
@@ -28858,9 +28820,9 @@ diff -urNp linux-3.0.9/drivers/input/input.c linux-3.0.9/drivers/input/input.c
  
  	error = device_add(&dev->dev);
  	if (error)
-diff -urNp linux-3.0.9/drivers/input/joystick/sidewinder.c linux-3.0.9/drivers/input/joystick/sidewinder.c
---- linux-3.0.9/drivers/input/joystick/sidewinder.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/input/joystick/sidewinder.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/input/joystick/sidewinder.c linux-3.1.1/drivers/input/joystick/sidewinder.c
+--- linux-3.1.1/drivers/input/joystick/sidewinder.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/input/joystick/sidewinder.c	2011-11-16 18:40:10.000000000 -0500
 @@ -30,6 +30,7 @@
  #include <linux/kernel.h>
  #include <linux/module.h>
@@ -28878,10 +28840,10 @@ diff -urNp linux-3.0.9/drivers/input/joystick/sidewinder.c linux-3.0.9/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.9/drivers/input/joystick/xpad.c linux-3.0.9/drivers/input/joystick/xpad.c
---- linux-3.0.9/drivers/input/joystick/xpad.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/input/joystick/xpad.c	2011-11-15 20:02:59.000000000 -0500
-@@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas
+diff -urNp linux-3.1.1/drivers/input/joystick/xpad.c linux-3.1.1/drivers/input/joystick/xpad.c
+--- linux-3.1.1/drivers/input/joystick/xpad.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/input/joystick/xpad.c	2011-11-16 18:39:07.000000000 -0500
+@@ -710,7 +710,7 @@ static void xpad_led_set(struct led_clas
  
  static int xpad_led_probe(struct usb_xpad *xpad)
  {
@@ -28890,7 +28852,7 @@ diff -urNp linux-3.0.9/drivers/input/joystick/xpad.c linux-3.0.9/drivers/input/j
  	long led_no;
  	struct xpad_led *led;
  	struct led_classdev *led_cdev;
-@@ -702,7 +702,7 @@ static int xpad_led_probe(struct usb_xpa
+@@ -723,7 +723,7 @@ static int xpad_led_probe(struct usb_xpa
  	if (!led)
  		return -ENOMEM;
  
@@ -28899,9 +28861,9 @@ diff -urNp linux-3.0.9/drivers/input/joystick/xpad.c linux-3.0.9/drivers/input/j
  
  	snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
  	led->xpad = xpad;
-diff -urNp linux-3.0.9/drivers/input/mousedev.c linux-3.0.9/drivers/input/mousedev.c
---- linux-3.0.9/drivers/input/mousedev.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/input/mousedev.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/input/mousedev.c linux-3.1.1/drivers/input/mousedev.c
+--- linux-3.1.1/drivers/input/mousedev.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/input/mousedev.c	2011-11-16 18:39:07.000000000 -0500
 @@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file
  
  	spin_unlock_irq(&client->packet_lock);
@@ -28911,9 +28873,9 @@ diff -urNp linux-3.0.9/drivers/input/mousedev.c linux-3.0.9/drivers/input/moused
  		return -EFAULT;
  
  	return count;
-diff -urNp linux-3.0.9/drivers/input/serio/serio.c linux-3.0.9/drivers/input/serio/serio.c
---- linux-3.0.9/drivers/input/serio/serio.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/input/serio/serio.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/input/serio/serio.c linux-3.1.1/drivers/input/serio/serio.c
+--- linux-3.1.1/drivers/input/serio/serio.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/input/serio/serio.c	2011-11-16 18:39:07.000000000 -0500
 @@ -497,7 +497,7 @@ static void serio_release_port(struct de
   */
  static void serio_init_port(struct serio *serio)
@@ -28932,9 +28894,9 @@ diff -urNp linux-3.0.9/drivers/input/serio/serio.c linux-3.0.9/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.9/drivers/isdn/capi/capi.c linux-3.0.9/drivers/isdn/capi/capi.c
---- linux-3.0.9/drivers/isdn/capi/capi.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/capi/capi.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/capi/capi.c linux-3.1.1/drivers/isdn/capi/capi.c
+--- linux-3.1.1/drivers/isdn/capi/capi.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/capi/capi.c	2011-11-16 18:39:07.000000000 -0500
 @@ -83,8 +83,8 @@ struct capiminor {
  
  	struct capi20_appl	*ap;
@@ -28972,9 +28934,9 @@ diff -urNp linux-3.0.9/drivers/isdn/capi/capi.c linux-3.0.9/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.9/drivers/isdn/gigaset/common.c linux-3.0.9/drivers/isdn/gigaset/common.c
---- linux-3.0.9/drivers/isdn/gigaset/common.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/gigaset/common.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/gigaset/common.c linux-3.1.1/drivers/isdn/gigaset/common.c
+--- linux-3.1.1/drivers/isdn/gigaset/common.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/gigaset/common.c	2011-11-16 18:39:07.000000000 -0500
 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct 
  	cs->commands_pending = 0;
  	cs->cur_at_seq = 0;
@@ -28984,13 +28946,13 @@ diff -urNp linux-3.0.9/drivers/isdn/gigaset/common.c linux-3.0.9/drivers/isdn/gi
  	cs->dev = NULL;
  	cs->tty = NULL;
  	cs->tty_dev = NULL;
-diff -urNp linux-3.0.9/drivers/isdn/gigaset/gigaset.h linux-3.0.9/drivers/isdn/gigaset/gigaset.h
---- linux-3.0.9/drivers/isdn/gigaset/gigaset.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/gigaset/gigaset.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/gigaset/gigaset.h linux-3.1.1/drivers/isdn/gigaset/gigaset.h
+--- linux-3.1.1/drivers/isdn/gigaset/gigaset.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/gigaset/gigaset.h	2011-11-16 18:39:07.000000000 -0500
 @@ -35,6 +35,7 @@
  #include <linux/tty_driver.h>
  #include <linux/list.h>
- #include <asm/atomic.h>
+ #include <linux/atomic.h>
 +#include <asm/local.h>
  
  #define GIG_VERSION {0, 5, 0, 0}
@@ -29004,9 +28966,9 @@ diff -urNp linux-3.0.9/drivers/isdn/gigaset/gigaset.h linux-3.0.9/drivers/isdn/g
  	struct tty_struct *tty;
  	struct tasklet_struct if_wake_tasklet;
  	unsigned control_state;
-diff -urNp linux-3.0.9/drivers/isdn/gigaset/interface.c linux-3.0.9/drivers/isdn/gigaset/interface.c
---- linux-3.0.9/drivers/isdn/gigaset/interface.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/gigaset/interface.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/gigaset/interface.c linux-3.1.1/drivers/isdn/gigaset/interface.c
+--- linux-3.1.1/drivers/isdn/gigaset/interface.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/gigaset/interface.c	2011-11-16 18:39:07.000000000 -0500
 @@ -162,9 +162,7 @@ static int if_open(struct tty_struct *tt
  	}
  	tty->driver_data = cs;
@@ -29094,9 +29056,9 @@ diff -urNp linux-3.0.9/drivers/isdn/gigaset/interface.c linux-3.0.9/drivers/isdn
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  		goto out;
  	}
-diff -urNp linux-3.0.9/drivers/isdn/hardware/avm/b1.c linux-3.0.9/drivers/isdn/hardware/avm/b1.c
---- linux-3.0.9/drivers/isdn/hardware/avm/b1.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/avm/b1.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/hardware/avm/b1.c linux-3.1.1/drivers/isdn/hardware/avm/b1.c
+--- linux-3.1.1/drivers/isdn/hardware/avm/b1.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/avm/b1.c	2011-11-16 18:39:07.000000000 -0500
 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
  	}
  	if (left) {
@@ -29115,9 +29077,9 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/avm/b1.c linux-3.0.9/drivers/isdn/h
  				return -EFAULT;
  		} else {
  			memcpy(buf, dp, left);
-diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c
---- linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/capidtmf.c linux-3.1.1/drivers/isdn/hardware/eicon/capidtmf.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/capidtmf.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/capidtmf.c	2011-11-16 18:40:10.000000000 -0500
 @@ -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];
@@ -29126,9 +29088,9 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.9/driver
  
    if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
    {
-diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c
---- linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/capifunc.c linux-3.1.1/drivers/isdn/hardware/eicon/capifunc.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/capifunc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/capifunc.c	2011-11-16 18:40:10.000000000 -0500
 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -29138,9 +29100,9 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.9/driver
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c
---- linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/diddfunc.c linux-3.1.1/drivers/isdn/hardware/eicon/diddfunc.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/diddfunc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/diddfunc.c	2011-11-16 18:40:10.000000000 -0500
 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -29150,9 +29112,9 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.9/driver
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c
---- linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/divasfunc.c linux-3.1.1/drivers/isdn/hardware/eicon/divasfunc.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/divasfunc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/divasfunc.c	2011-11-16 18:40:10.000000000 -0500
 @@ -160,6 +160,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -29162,9 +29124,9 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.9/drive
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h
---- linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/divasync.h linux-3.1.1/drivers/isdn/hardware/eicon/divasync.h
+--- linux-3.1.1/drivers/isdn/hardware/eicon/divasync.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/divasync.h	2011-11-16 18:39:07.000000000 -0500
 @@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
  } diva_didd_add_adapter_t;
  typedef struct _diva_didd_remove_adapter {
@@ -29174,9 +29136,9 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h linux-3.0.9/driver
  typedef struct _diva_didd_read_adapter_array {
   void   * buffer;
   dword length;
-diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c
---- linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/idifunc.c linux-3.1.1/drivers/isdn/hardware/eicon/idifunc.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/idifunc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/idifunc.c	2011-11-16 18:40:10.000000000 -0500
 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -29186,9 +29148,9 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.9/drivers
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/message.c linux-3.0.9/drivers/isdn/hardware/eicon/message.c
---- linux-3.0.9/drivers/isdn/hardware/eicon/message.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/message.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/message.c linux-3.1.1/drivers/isdn/hardware/eicon/message.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/message.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/message.c	2011-11-16 18:40:10.000000000 -0500
 @@ -4886,6 +4886,8 @@ static void sig_ind(PLCI *plci)
    dword d;
    word w;
@@ -29225,9 +29187,9 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/message.c linux-3.0.9/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.9/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c
---- linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/mntfunc.c linux-3.1.1/drivers/isdn/hardware/eicon/mntfunc.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/mntfunc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/mntfunc.c	2011-11-16 18:40:10.000000000 -0500
 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -29237,9 +29199,9 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.9/drivers
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h
---- linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.1.1/drivers/isdn/hardware/eicon/xdi_adapter.h
+--- linux-3.1.1/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-11-16 18:39:07.000000000 -0500
 @@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
  typedef struct _diva_os_idi_adapter_interface {
  	diva_init_card_proc_t cleanup_adapter_proc;
@@ -29249,9 +29211,9 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.9/dri
  
  typedef struct _diva_os_xdi_adapter {
  	struct list_head link;
-diff -urNp linux-3.0.9/drivers/isdn/i4l/isdn_common.c linux-3.0.9/drivers/isdn/i4l/isdn_common.c
---- linux-3.0.9/drivers/isdn/i4l/isdn_common.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/i4l/isdn_common.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/i4l/isdn_common.c linux-3.1.1/drivers/isdn/i4l/isdn_common.c
+--- linux-3.1.1/drivers/isdn/i4l/isdn_common.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/i4l/isdn_common.c	2011-11-16 18:40:10.000000000 -0500
 @@ -1286,6 +1286,8 @@ isdn_ioctl(struct file *file, uint cmd, 
  	} iocpar;
  	void __user *argp = (void __user *)arg;
@@ -29261,9 +29223,9 @@ diff -urNp linux-3.0.9/drivers/isdn/i4l/isdn_common.c linux-3.0.9/drivers/isdn/i
  #define name  iocpar.name
  #define bname iocpar.bname
  #define iocts iocpar.iocts
-diff -urNp linux-3.0.9/drivers/isdn/icn/icn.c linux-3.0.9/drivers/isdn/icn/icn.c
---- linux-3.0.9/drivers/isdn/icn/icn.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/icn/icn.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/isdn/icn/icn.c linux-3.1.1/drivers/isdn/icn/icn.c
+--- linux-3.1.1/drivers/isdn/icn/icn.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/icn/icn.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
  		if (count > len)
  			count = len;
@@ -29273,9 +29235,9 @@ diff -urNp linux-3.0.9/drivers/isdn/icn/icn.c linux-3.0.9/drivers/isdn/icn/icn.c
  				return -EFAULT;
  		} else
  			memcpy(msg, buf, count);
-diff -urNp linux-3.0.9/drivers/lguest/core.c linux-3.0.9/drivers/lguest/core.c
---- linux-3.0.9/drivers/lguest/core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/lguest/core.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/lguest/core.c linux-3.1.1/drivers/lguest/core.c
+--- linux-3.1.1/drivers/lguest/core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/lguest/core.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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.
@@ -29296,16 +29258,16 @@ diff -urNp linux-3.0.9/drivers/lguest/core.c linux-3.0.9/drivers/lguest/core.c
  		printk("lguest: could not map switcher pages high\n");
 @@ -119,7 +127,7 @@ static __init int map_switcher(void)
  	 * Now the Switcher is mapped at the right address, we can't fail!
- 	 * Copy in the compiled-in Switcher code (from <arch>_switcher.S).
+ 	 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
  	 */
 -	memcpy(switcher_vma->addr, start_switcher_text,
 +	memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
  	       end_switcher_text - start_switcher_text);
  
  	printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff -urNp linux-3.0.9/drivers/lguest/x86/core.c linux-3.0.9/drivers/lguest/x86/core.c
---- linux-3.0.9/drivers/lguest/x86/core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/lguest/x86/core.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/lguest/x86/core.c linux-3.1.1/drivers/lguest/x86/core.c
+--- linux-3.1.1/drivers/lguest/x86/core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/lguest/x86/core.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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)
@@ -29329,7 +29291,7 @@ diff -urNp linux-3.0.9/drivers/lguest/x86/core.c linux-3.0.9/drivers/lguest/x86/
  	/*
  	 * Set up the Guest's page tables to see this CPU's pages (and no
  	 * other CPU's pages).
-@@ -547,7 +553,7 @@ void __init lguest_arch_host_init(void)
+@@ -472,7 +478,7 @@ void __init lguest_arch_host_init(void)
  	 * compiled-in switcher code and the high-mapped copy we just made.
  	 */
  	for (i = 0; i < IDT_ENTRIES; i++)
@@ -29338,7 +29300,7 @@ diff -urNp linux-3.0.9/drivers/lguest/x86/core.c linux-3.0.9/drivers/lguest/x86/
  
  	/*
  	 * Set up the Switcher's per-cpu areas.
-@@ -630,7 +636,7 @@ void __init lguest_arch_host_init(void)
+@@ -555,7 +561,7 @@ void __init lguest_arch_host_init(void)
  	 * it will be undisturbed when we switch.  To change %cs and jump we
  	 * need this structure to feed to Intel's "lcall" instruction.
  	 */
@@ -29347,9 +29309,9 @@ diff -urNp linux-3.0.9/drivers/lguest/x86/core.c linux-3.0.9/drivers/lguest/x86/
  	lguest_entry.segment = LGUEST_CS;
  
  	/*
-diff -urNp linux-3.0.9/drivers/lguest/x86/switcher_32.S linux-3.0.9/drivers/lguest/x86/switcher_32.S
---- linux-3.0.9/drivers/lguest/x86/switcher_32.S	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/lguest/x86/switcher_32.S	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/lguest/x86/switcher_32.S linux-3.1.1/drivers/lguest/x86/switcher_32.S
+--- linux-3.1.1/drivers/lguest/x86/switcher_32.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/lguest/x86/switcher_32.S	2011-11-16 18:39:07.000000000 -0500
 @@ -87,6 +87,7 @@
  #include <asm/page.h>
  #include <asm/segment.h>
@@ -29408,9 +29370,9 @@ diff -urNp linux-3.0.9/drivers/lguest/x86/switcher_32.S linux-3.0.9/drivers/lgue
  
  // Every interrupt can come to us here
  // But we must truly tell each apart.
-diff -urNp linux-3.0.9/drivers/macintosh/macio_asic.c linux-3.0.9/drivers/macintosh/macio_asic.c
---- linux-3.0.9/drivers/macintosh/macio_asic.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/macintosh/macio_asic.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/macintosh/macio_asic.c linux-3.1.1/drivers/macintosh/macio_asic.c
+--- linux-3.1.1/drivers/macintosh/macio_asic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/macintosh/macio_asic.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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
@@ -29420,10 +29382,10 @@ diff -urNp linux-3.0.9/drivers/macintosh/macio_asic.c linux-3.0.9/drivers/macint
  	.vendor		= PCI_VENDOR_ID_APPLE,
  	.device		= PCI_ANY_ID,
  	.subvendor	= PCI_ANY_ID,
-diff -urNp linux-3.0.9/drivers/md/dm.c linux-3.0.9/drivers/md/dm.c
---- linux-3.0.9/drivers/md/dm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/dm.c	2011-11-15 20:02:59.000000000 -0500
-@@ -164,9 +164,9 @@ struct mapped_device {
+diff -urNp linux-3.1.1/drivers/md/dm.c linux-3.1.1/drivers/md/dm.c
+--- linux-3.1.1/drivers/md/dm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/dm.c	2011-11-16 18:39:07.000000000 -0500
+@@ -165,9 +165,9 @@ struct mapped_device {
  	/*
  	 * Event handling.
  	 */
@@ -29435,7 +29397,7 @@ diff -urNp linux-3.0.9/drivers/md/dm.c linux-3.0.9/drivers/md/dm.c
  	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
+@@ -1843,8 +1843,8 @@ static struct mapped_device *alloc_dev(i
  	rwlock_init(&md->map_lock);
  	atomic_set(&md->holders, 1);
  	atomic_set(&md->open_count, 0);
@@ -29446,7 +29408,7 @@ diff -urNp linux-3.0.9/drivers/md/dm.c linux-3.0.9/drivers/md/dm.c
  	INIT_LIST_HEAD(&md->uevent_list);
  	spin_lock_init(&md->uevent_lock);
  
-@@ -1977,7 +1977,7 @@ static void event_callback(void *context
+@@ -1978,7 +1978,7 @@ static void event_callback(void *context
  
  	dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
  
@@ -29455,7 +29417,7 @@ diff -urNp linux-3.0.9/drivers/md/dm.c linux-3.0.9/drivers/md/dm.c
  	wake_up(&md->eventq);
  }
  
-@@ -2553,18 +2553,18 @@ int dm_kobject_uevent(struct mapped_devi
+@@ -2614,18 +2614,18 @@ int dm_kobject_uevent(struct mapped_devi
  
  uint32_t dm_next_uevent_seq(struct mapped_device *md)
  {
@@ -29477,10 +29439,10 @@ diff -urNp linux-3.0.9/drivers/md/dm.c linux-3.0.9/drivers/md/dm.c
  }
  
  void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
-diff -urNp linux-3.0.9/drivers/md/dm-ioctl.c linux-3.0.9/drivers/md/dm-ioctl.c
---- linux-3.0.9/drivers/md/dm-ioctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/dm-ioctl.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1551,7 +1551,7 @@ static int validate_params(uint cmd, str
+diff -urNp linux-3.1.1/drivers/md/dm-ioctl.c linux-3.1.1/drivers/md/dm-ioctl.c
+--- linux-3.1.1/drivers/md/dm-ioctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/dm-ioctl.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1578,7 +1578,7 @@ static int validate_params(uint cmd, str
  	    cmd == DM_LIST_VERSIONS_CMD)
  		return 0;
  
@@ -29489,9 +29451,9 @@ diff -urNp linux-3.0.9/drivers/md/dm-ioctl.c linux-3.0.9/drivers/md/dm-ioctl.c
  		if (!*param->name) {
  			DMWARN("name not supplied when creating device");
  			return -EINVAL;
-diff -urNp linux-3.0.9/drivers/md/dm-raid1.c linux-3.0.9/drivers/md/dm-raid1.c
---- linux-3.0.9/drivers/md/dm-raid1.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/dm-raid1.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/md/dm-raid1.c linux-3.1.1/drivers/md/dm-raid1.c
+--- linux-3.1.1/drivers/md/dm-raid1.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/dm-raid1.c	2011-11-16 18:39:07.000000000 -0500
 @@ -40,7 +40,7 @@ enum dm_raid1_error {
  
  struct mirror {
@@ -29564,9 +29526,9 @@ diff -urNp linux-3.0.9/drivers/md/dm-raid1.c linux-3.0.9/drivers/md/dm-raid1.c
  		return 'A';
  
  	return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
-diff -urNp linux-3.0.9/drivers/md/dm-stripe.c linux-3.0.9/drivers/md/dm-stripe.c
---- linux-3.0.9/drivers/md/dm-stripe.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/dm-stripe.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/md/dm-stripe.c linux-3.1.1/drivers/md/dm-stripe.c
+--- linux-3.1.1/drivers/md/dm-stripe.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/dm-stripe.c	2011-11-16 18:39:07.000000000 -0500
 @@ -20,7 +20,7 @@ struct stripe {
  	struct dm_dev *dev;
  	sector_t physical_start;
@@ -29605,10 +29567,10 @@ diff -urNp linux-3.0.9/drivers/md/dm-stripe.c linux-3.0.9/drivers/md/dm-stripe.c
  			    DM_IO_ERROR_THRESHOLD)
  				schedule_work(&sc->trigger_event);
  		}
-diff -urNp linux-3.0.9/drivers/md/dm-table.c linux-3.0.9/drivers/md/dm-table.c
---- linux-3.0.9/drivers/md/dm-table.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/dm-table.c	2011-11-15 20:02:59.000000000 -0500
-@@ -390,7 +390,7 @@ static int device_area_is_invalid(struct
+diff -urNp linux-3.1.1/drivers/md/dm-table.c linux-3.1.1/drivers/md/dm-table.c
+--- linux-3.1.1/drivers/md/dm-table.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/dm-table.c	2011-11-16 18:39:07.000000000 -0500
+@@ -389,7 +389,7 @@ static int device_area_is_invalid(struct
  	if (!dev_size)
  		return 0;
  
@@ -29617,10 +29579,10 @@ diff -urNp linux-3.0.9/drivers/md/dm-table.c linux-3.0.9/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.9/drivers/md/md.c linux-3.0.9/drivers/md/md.c
---- linux-3.0.9/drivers/md/md.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/md.c	2011-11-15 20:02:59.000000000 -0500
-@@ -231,10 +231,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
+diff -urNp linux-3.1.1/drivers/md/md.c linux-3.1.1/drivers/md/md.c
+--- linux-3.1.1/drivers/md/md.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/md.c	2011-11-16 18:39:07.000000000 -0500
+@@ -280,10 +280,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
   *  start build, activate spare
   */
  static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
@@ -29633,7 +29595,7 @@ diff -urNp linux-3.0.9/drivers/md/md.c linux-3.0.9/drivers/md/md.c
  	wake_up(&md_event_waiters);
  }
  EXPORT_SYMBOL_GPL(md_new_event);
-@@ -244,7 +244,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
+@@ -293,7 +293,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
   */
  static void md_new_event_inintr(mddev_t *mddev)
  {
@@ -29642,7 +29604,7 @@ diff -urNp linux-3.0.9/drivers/md/md.c linux-3.0.9/drivers/md/md.c
  	wake_up(&md_event_waiters);
  }
  
-@@ -1475,7 +1475,7 @@ static int super_1_load(mdk_rdev_t *rdev
+@@ -1531,7 +1531,7 @@ static int super_1_load(mdk_rdev_t *rdev
  
  	rdev->preferred_minor = 0xffff;
  	rdev->data_offset = le64_to_cpu(sb->data_offset);
@@ -29651,7 +29613,7 @@ diff -urNp linux-3.0.9/drivers/md/md.c linux-3.0.9/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;
-@@ -1653,7 +1653,7 @@ static void super_1_sync(mddev_t *mddev,
+@@ -1748,7 +1748,7 @@ static void super_1_sync(mddev_t *mddev,
  	else
  		sb->resync_offset = cpu_to_le64(0);
  
@@ -29660,7 +29622,7 @@ diff -urNp linux-3.0.9/drivers/md/md.c linux-3.0.9/drivers/md/md.c
  
  	sb->raid_disks = cpu_to_le32(mddev->raid_disks);
  	sb->size = cpu_to_le64(mddev->dev_sectors);
-@@ -2446,7 +2446,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho
+@@ -2643,7 +2643,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho
  static ssize_t
  errors_show(mdk_rdev_t *rdev, char *page)
  {
@@ -29669,7 +29631,7 @@ diff -urNp linux-3.0.9/drivers/md/md.c linux-3.0.9/drivers/md/md.c
  }
  
  static ssize_t
-@@ -2455,7 +2455,7 @@ errors_store(mdk_rdev_t *rdev, const cha
+@@ -2652,7 +2652,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')) {
@@ -29678,9 +29640,9 @@ diff -urNp linux-3.0.9/drivers/md/md.c linux-3.0.9/drivers/md/md.c
  		return len;
  	}
  	return -EINVAL;
-@@ -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;
+@@ -3042,8 +3042,8 @@ int md_rdev_init(mdk_rdev_t *rdev)
+ 	rdev->sb_loaded = 0;
+ 	rdev->bb_page = NULL;
  	atomic_set(&rdev->nr_pending, 0);
 -	atomic_set(&rdev->read_errors, 0);
 -	atomic_set(&rdev->corrected_errors, 0);
@@ -29689,16 +29651,16 @@ diff -urNp linux-3.0.9/drivers/md/md.c linux-3.0.9/drivers/md/md.c
  
  	INIT_LIST_HEAD(&rdev->same_set);
  	init_waitqueue_head(&rdev->blocked_wait);
-@@ -6440,7 +6440,7 @@ static int md_seq_show(struct seq_file *
+@@ -6667,7 +6667,7 @@ static int md_seq_show(struct seq_file *
  
  		spin_unlock(&pers_lock);
  		seq_printf(seq, "\n");
--		mi->event = atomic_read(&md_event_count);
-+		mi->event = atomic_read_unchecked(&md_event_count);
+-		seq->poll_event = atomic_read(&md_event_count);
++		seq->poll_event = atomic_read_unchecked(&md_event_count);
  		return 0;
  	}
  	if (v == (void*)2) {
-@@ -6529,7 +6529,7 @@ static int md_seq_show(struct seq_file *
+@@ -6756,7 +6756,7 @@ static int md_seq_show(struct seq_file *
  				chunk_kb ? "KB" : "B");
  			if (bitmap->file) {
  				seq_printf(seq, ", file: ");
@@ -29707,25 +29669,25 @@ diff -urNp linux-3.0.9/drivers/md/md.c linux-3.0.9/drivers/md/md.c
  			}
  
  			seq_printf(seq, "\n");
-@@ -6563,7 +6563,7 @@ static int md_seq_open(struct inode *ino
- 	else {
- 		struct seq_file *p = file->private_data;
- 		p->private = mi;
--		mi->event = atomic_read(&md_event_count);
-+		mi->event = atomic_read_unchecked(&md_event_count);
- 	}
+@@ -6787,7 +6787,7 @@ static int md_seq_open(struct inode *ino
+ 		return error;
+ 
+ 	seq = file->private_data;
+-	seq->poll_event = atomic_read(&md_event_count);
++	seq->poll_event = atomic_read_unchecked(&md_event_count);
  	return error;
  }
-@@ -6579,7 +6579,7 @@ static unsigned int mdstat_poll(struct f
+ 
+@@ -6801,7 +6801,7 @@ static unsigned int mdstat_poll(struct f
  	/* always allow read */
  	mask = POLLIN | POLLRDNORM;
  
--	if (mi->event != atomic_read(&md_event_count))
-+	if (mi->event != atomic_read_unchecked(&md_event_count))
+-	if (seq->poll_event != atomic_read(&md_event_count))
++	if (seq->poll_event != atomic_read_unchecked(&md_event_count))
  		mask |= POLLERR | POLLPRI;
  	return mask;
  }
-@@ -6623,7 +6623,7 @@ static int is_mddev_idle(mddev_t *mddev,
+@@ -6845,7 +6845,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]) -
@@ -29734,10 +29696,10 @@ diff -urNp linux-3.0.9/drivers/md/md.c linux-3.0.9/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.9/drivers/md/md.h linux-3.0.9/drivers/md/md.h
---- linux-3.0.9/drivers/md/md.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/md.h	2011-11-15 20:02:59.000000000 -0500
-@@ -97,13 +97,13 @@ struct mdk_rdev_s
+diff -urNp linux-3.1.1/drivers/md/md.h linux-3.1.1/drivers/md/md.h
+--- linux-3.1.1/drivers/md/md.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/md.h	2011-11-16 18:39:07.000000000 -0500
+@@ -124,13 +124,13 @@ struct mdk_rdev_s
  					 * only maintained for arrays that
  					 * support hot removal
  					 */
@@ -29753,7 +29715,7 @@ diff -urNp linux-3.0.9/drivers/md/md.h linux-3.0.9/drivers/md/md.h
  					   * for reporting to userspace and storing
  					   * in superblock.
  					   */
-@@ -344,7 +344,7 @@ static inline void rdev_dec_pending(mdk_
+@@ -415,7 +415,7 @@ static inline void rdev_dec_pending(mdk_
  
  static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
  {
@@ -29762,19 +29724,19 @@ diff -urNp linux-3.0.9/drivers/md/md.h linux-3.0.9/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-3.0.9/drivers/md/raid10.c linux-3.0.9/drivers/md/raid10.c
---- linux-3.0.9/drivers/md/raid10.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/raid10.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1186,7 +1186,7 @@ static void end_sync_read(struct bio *bi
- 	if (test_bit(BIO_UPTODATE, &bio->bi_flags))
- 		set_bit(R10BIO_Uptodate, &r10_bio->state);
- 	else {
+diff -urNp linux-3.1.1/drivers/md/raid10.c linux-3.1.1/drivers/md/raid10.c
+--- linux-3.1.1/drivers/md/raid10.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/raid10.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1423,7 +1423,7 @@ static void end_sync_read(struct bio *bi
+ 		/* The write handler will notice the lack of
+ 		 * R10BIO_Uptodate and record any errors etc
+ 		 */
 -		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,
-@@ -1394,7 +1394,7 @@ static void check_decay_read_errors(mdde
+ 
+ 	/* for reconstruct, we always reschedule after a read.
+@@ -1723,7 +1723,7 @@ static void check_decay_read_errors(mdde
  {
  	struct timespec cur_time_mon;
  	unsigned long hours_since_last;
@@ -29783,7 +29745,7 @@ diff -urNp linux-3.0.9/drivers/md/raid10.c linux-3.0.9/drivers/md/raid10.c
  
  	ktime_get_ts(&cur_time_mon);
  
-@@ -1416,9 +1416,9 @@ static void check_decay_read_errors(mdde
+@@ -1745,9 +1745,9 @@ static void check_decay_read_errors(mdde
  	 * overflowing the shift of read_errors by hours_since_last.
  	 */
  	if (hours_since_last >= 8 * sizeof(read_errors))
@@ -29794,8 +29756,8 @@ diff -urNp linux-3.0.9/drivers/md/raid10.c linux-3.0.9/drivers/md/raid10.c
 +		atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
  }
  
- /*
-@@ -1448,8 +1448,8 @@ static void fix_read_error(conf_t *conf,
+ static int r10_sync_page_io(mdk_rdev_t *rdev, sector_t sector,
+@@ -1797,8 +1797,8 @@ static void fix_read_error(conf_t *conf,
  		return;
  
  	check_decay_read_errors(mddev, rdev);
@@ -29806,7 +29768,7 @@ diff -urNp linux-3.0.9/drivers/md/raid10.c linux-3.0.9/drivers/md/raid10.c
  		char b[BDEVNAME_SIZE];
  		bdevname(rdev->bdev, b);
  
-@@ -1457,7 +1457,7 @@ static void fix_read_error(conf_t *conf,
+@@ -1806,7 +1806,7 @@ static void fix_read_error(conf_t *conf,
  		       "md/raid10:%s: %s: Raid device exceeded "
  		       "read_error threshold [cur %d:max %d]\n",
  		       mdname(mddev), b,
@@ -29815,49 +29777,45 @@ diff -urNp linux-3.0.9/drivers/md/raid10.c linux-3.0.9/drivers/md/raid10.c
  		printk(KERN_NOTICE
  		       "md/raid10:%s: %s: Failing raid device\n",
  		       mdname(mddev), b);
-@@ -1520,7 +1520,7 @@ static void fix_read_error(conf_t *conf,
- 			    test_bit(In_sync, &rdev->flags)) {
- 				atomic_inc(&rdev->nr_pending);
- 				rcu_read_unlock();
+@@ -1951,7 +1951,7 @@ static void fix_read_error(conf_t *conf,
+ 				       (unsigned long long)(
+ 					       sect + rdev->data_offset),
+ 				       bdevname(rdev->bdev, b));
 -				atomic_add(s, &rdev->corrected_errors);
 +				atomic_add_unchecked(s, &rdev->corrected_errors);
- 				if (sync_page_io(rdev,
- 						 r10_bio->devs[sl].addr +
- 						 sect,
-diff -urNp linux-3.0.9/drivers/md/raid1.c linux-3.0.9/drivers/md/raid1.c
---- linux-3.0.9/drivers/md/raid1.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/raid1.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1263,7 +1263,7 @@ static int fix_sync_read_error(r1bio_t *
- 				rdev_dec_pending(rdev, mddev);
- 				md_error(mddev, rdev);
- 			} else
+ 			}
+ 
+ 			rdev_dec_pending(rdev, mddev);
+diff -urNp linux-3.1.1/drivers/md/raid1.c linux-3.1.1/drivers/md/raid1.c
+--- linux-3.1.1/drivers/md/raid1.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/raid1.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1541,7 +1541,7 @@ static int fix_sync_read_error(r1bio_t *
+ 			if (r1_sync_page_io(rdev, sect, s,
+ 					    bio->bi_io_vec[idx].bv_page,
+ 					    READ) != 0)
 -				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 {
+ 		sectors -= s;
+ 		sect += s;
+@@ -1754,7 +1754,7 @@ static void fix_read_error(conf_t *conf,
+ 			    test_bit(In_sync, &rdev->flags)) {
+ 				if (r1_sync_page_io(rdev, sect, s,
+ 						    conf->tmppage, READ)) {
 -					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.9/drivers/md/raid5.c linux-3.0.9/drivers/md/raid5.c
---- linux-3.0.9/drivers/md/raid5.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/raid5.c	2011-11-15 20:02:59.000000000 -0500
-@@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea
- 			bi->bi_next = NULL;
- 			if ((rw & WRITE) &&
- 			    test_bit(R5_ReWrite, &sh->dev[i].flags))
--				atomic_add(STRIPE_SECTORS,
-+				atomic_add_unchecked(STRIPE_SECTORS,
- 					&rdev->corrected_errors);
- 			generic_make_request(bi);
- 		} else {
-@@ -1596,15 +1596,15 @@ static void raid5_end_read_request(struc
+diff -urNp linux-3.1.1/drivers/md/raid5.c linux-3.1.1/drivers/md/raid5.c
+--- linux-3.1.1/drivers/md/raid5.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/raid5.c	2011-11-16 18:40:10.000000000 -0500
+@@ -1616,19 +1616,19 @@ static void raid5_end_read_request(struc
+ 				(unsigned long long)(sh->sector
+ 						     + rdev->data_offset),
+ 				bdevname(rdev->bdev, b));
+-			atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
++			atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
  			clear_bit(R5_ReadError, &sh->dev[i].flags);
  			clear_bit(R5_ReWrite, &sh->dev[i].flags);
  		}
@@ -29874,18 +29832,18 @@ diff -urNp linux-3.0.9/drivers/md/raid5.c linux-3.0.9/drivers/md/raid5.c
 -		atomic_inc(&rdev->read_errors);
 +		atomic_inc_unchecked(&rdev->read_errors);
  		if (conf->mddev->degraded >= conf->max_degraded)
- 			printk_rl(KERN_WARNING
- 				  "md/raid:%s: read error not correctable "
-@@ -1622,7 +1622,7 @@ static void raid5_end_read_request(struc
- 				  (unsigned long long)(sh->sector
- 						       + rdev->data_offset),
- 				  bdn);
+ 			printk_ratelimited(
+ 				KERN_WARNING
+@@ -1648,7 +1648,7 @@ static void raid5_end_read_request(struc
+ 				(unsigned long long)(sh->sector
+ 						     + rdev->data_offset),
+ 				bdn);
 -		else if (atomic_read(&rdev->read_errors)
 +		else if (atomic_read_unchecked(&rdev->read_errors)
  			 > conf->max_nr_stripes)
  			printk(KERN_WARNING
  			       "md/raid:%s: Too many read errors, failing device %s.\n",
-@@ -1945,6 +1945,7 @@ static sector_t compute_blocknr(struct s
+@@ -1978,6 +1978,7 @@ static sector_t compute_blocknr(struct s
  	sector_t r_sector;
  	struct stripe_head sh2;
  
@@ -29893,9 +29851,9 @@ diff -urNp linux-3.0.9/drivers/md/raid5.c linux-3.0.9/drivers/md/raid5.c
  
  	chunk_offset = sector_div(new_sector, sectors_per_chunk);
  	stripe = new_sector;
-diff -urNp linux-3.0.9/drivers/media/common/saa7146_hlp.c linux-3.0.9/drivers/media/common/saa7146_hlp.c
---- linux-3.0.9/drivers/media/common/saa7146_hlp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/common/saa7146_hlp.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/common/saa7146_hlp.c linux-3.1.1/drivers/media/common/saa7146_hlp.c
+--- linux-3.1.1/drivers/media/common/saa7146_hlp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/common/saa7146_hlp.c	2011-11-16 18:40:10.000000000 -0500
 @@ -353,6 +353,8 @@ static void calculate_clipping_registers
  
  	int x[32], y[32], w[32], h[32];
@@ -29905,9 +29863,21 @@ diff -urNp linux-3.0.9/drivers/media/common/saa7146_hlp.c linux-3.0.9/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.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
---- linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/dvb/ddbridge/ddbridge-core.c linux-3.1.1/drivers/media/dvb/ddbridge/ddbridge-core.c
+--- linux-3.1.1/drivers/media/dvb/ddbridge/ddbridge-core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/ddbridge/ddbridge-core.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1675,7 +1675,7 @@ static struct ddb_info ddb_v6 = {
+ 	.subvendor   = _subvend, .subdevice = _subdev, \
+ 	.driver_data = (unsigned long)&_driverdata }
+ 
+-static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
++static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
+ 	DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
+ 	DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
+ 	DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.1.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+--- linux-3.1.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-11-16 18:40:10.000000000 -0500
 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
  	u8 buf[HOST_LINK_BUF_SIZE];
  	int i;
@@ -29926,9 +29896,9 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.9/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.9/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h
---- linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.1.1/drivers/media/dvb/dvb-core/dvb_demux.h
+--- linux-3.1.1/drivers/media/dvb/dvb-core/dvb_demux.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-core/dvb_demux.h	2011-11-16 18:40:10.000000000 -0500
 @@ -68,12 +68,12 @@ struct dvb_demux_feed {
  	union {
  		struct dmx_ts_feed ts;
@@ -29944,9 +29914,9 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.9/driver
  
  	struct dvb_demux *demux;
  	void *priv;
-diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-core/dvbdev.c linux-3.1.1/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-3.1.1/drivers/media/dvb/dvb-core/dvbdev.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-core/dvbdev.c	2011-11-16 18:39:07.000000000 -0500
 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt
  			const struct dvb_device *template, void *priv, int type)
  {
@@ -29956,9 +29926,9 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.9/drivers/m
  	struct device *clsdev;
  	int minor;
  	int id;
-diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c
---- linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-usb/cxusb.c linux-3.1.1/drivers/media/dvb/dvb-usb/cxusb.c
+--- linux-3.1.1/drivers/media/dvb/dvb-usb/cxusb.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-usb/cxusb.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1059,7 +1059,7 @@ static struct dib0070_config dib7070p_di
  struct dib0700_adapter_state {
  	int (*set_param_save) (struct dvb_frontend *,
@@ -29968,9 +29938,9 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.9/drivers/med
  
  static int dib7070_set_param_override(struct dvb_frontend *fe,
  				      struct dvb_frontend_parameters *fep)
-diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c
---- linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.1.1/drivers/media/dvb/dvb-usb/dib0700_core.c
+--- linux-3.1.1/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-11-16 18:40:10.000000000 -0500
 @@ -478,6 +478,8 @@ int dib0700_download_firmware(struct usb
  	if (!buf)
  		return -ENOMEM;
@@ -29980,9 +29950,9 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.9/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.9/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h
---- linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-usb/dibusb.h linux-3.1.1/drivers/media/dvb/dvb-usb/dibusb.h
+--- linux-3.1.1/drivers/media/dvb/dvb-usb/dibusb.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-usb/dibusb.h	2011-11-16 18:40:10.000000000 -0500
 @@ -97,7 +97,7 @@
  #define DIBUSB_IOCTL_CMD_DISABLE_STREAM	0x02
  
@@ -29992,9 +29962,9 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.9/drivers/me
  	int mt2060_present;
  	u8 tuner_addr;
  };
-diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c
---- linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-usb/dw2102.c linux-3.1.1/drivers/media/dvb/dvb-usb/dw2102.c
+--- linux-3.1.1/drivers/media/dvb/dvb-usb/dw2102.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-usb/dw2102.c	2011-11-16 18:39:07.000000000 -0500
 @@ -95,7 +95,7 @@ struct su3000_state {
  
  struct s6x0_state {
@@ -30004,9 +29974,9 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.9/drivers/me
  
  /* debug */
  static int dvb_usb_dw2102_debug;
-diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c
---- linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.1.1/drivers/media/dvb/dvb-usb/lmedm04.c
+--- linux-3.1.1/drivers/media/dvb/dvb-usb/lmedm04.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-usb/lmedm04.c	2011-11-16 18:40:10.000000000 -0500
 @@ -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);
@@ -30024,9 +29994,9 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.9/drivers/m
  	data[0] = 0x0a;
  	len_in = 1;
  	info("FRM Firmware Cold Reset");
-diff -urNp linux-3.0.9/drivers/media/dvb/frontends/dib3000.h linux-3.0.9/drivers/media/dvb/frontends/dib3000.h
---- linux-3.0.9/drivers/media/dvb/frontends/dib3000.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/frontends/dib3000.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/dvb/frontends/dib3000.h linux-3.1.1/drivers/media/dvb/frontends/dib3000.h
+--- linux-3.1.1/drivers/media/dvb/frontends/dib3000.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/frontends/dib3000.h	2011-11-16 18:40:10.000000000 -0500
 @@ -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);
@@ -30040,9 +30010,9 @@ diff -urNp linux-3.0.9/drivers/media/dvb/frontends/dib3000.h linux-3.0.9/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.9/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c
---- linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/dvb/frontends/dib3000mb.c linux-3.1.1/drivers/media/dvb/frontends/dib3000mb.c
+--- linux-3.1.1/drivers/media/dvb/frontends/dib3000mb.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/frontends/dib3000mb.c	2011-11-16 18:40:10.000000000 -0500
 @@ -756,7 +756,7 @@ static int dib3000mb_tuner_pass_ctrl(str
  static struct dvb_frontend_ops dib3000mb_ops;
  
@@ -30052,9 +30022,9 @@ diff -urNp linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.9/drive
  {
  	struct dib3000_state* state = NULL;
  
-diff -urNp linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c
---- linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/dvb/frontends/mb86a16.c linux-3.1.1/drivers/media/dvb/frontends/mb86a16.c
+--- linux-3.1.1/drivers/media/dvb/frontends/mb86a16.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/frontends/mb86a16.c	2011-11-16 18:40:10.000000000 -0500
 @@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16
  	int ret = -1;
  	int sync;
@@ -30064,9 +30034,9 @@ diff -urNp linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c linux-3.0.9/drivers
  	dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate);
  
  	fcp = 3000;
-diff -urNp linux-3.0.9/drivers/media/dvb/frontends/or51211.c linux-3.0.9/drivers/media/dvb/frontends/or51211.c
---- linux-3.0.9/drivers/media/dvb/frontends/or51211.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/frontends/or51211.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/dvb/frontends/or51211.c linux-3.1.1/drivers/media/dvb/frontends/or51211.c
+--- linux-3.1.1/drivers/media/dvb/frontends/or51211.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/frontends/or51211.c	2011-11-16 18:40:10.000000000 -0500
 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
  	u8 tudata[585];
  	int i;
@@ -30076,10 +30046,10 @@ diff -urNp linux-3.0.9/drivers/media/dvb/frontends/or51211.c linux-3.0.9/drivers
  	dprintk("Firmware is %zd bytes\n",fw->size);
  
  	/* Get eprom data */
-diff -urNp linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c
---- linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c	2011-11-15 20:02:59.000000000 -0500
-@@ -379,7 +379,7 @@ static struct ngene_info ngene_info_m780
+diff -urNp linux-3.1.1/drivers/media/dvb/ngene/ngene-cards.c linux-3.1.1/drivers/media/dvb/ngene/ngene-cards.c
+--- linux-3.1.1/drivers/media/dvb/ngene/ngene-cards.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/ngene/ngene-cards.c	2011-11-16 18:39:07.000000000 -0500
+@@ -477,7 +477,7 @@ static struct ngene_info ngene_info_m780
  
  /****************************************************************************/
  
@@ -30088,9 +30058,33 @@ diff -urNp linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c linux-3.0.9/drivers
  	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.9/drivers/media/video/cx18/cx18-driver.c linux-3.0.9/drivers/media/video/cx18/cx18-driver.c
---- linux-3.0.9/drivers/media/video/cx18/cx18-driver.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/cx18/cx18-driver.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/radio/radio-cadet.c linux-3.1.1/drivers/media/radio/radio-cadet.c
+--- linux-3.1.1/drivers/media/radio/radio-cadet.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/radio/radio-cadet.c	2011-11-16 18:39:07.000000000 -0500
+@@ -326,6 +326,8 @@ static ssize_t cadet_read(struct file *f
+ 	unsigned char readbuf[RDS_BUFFER];
+ 	int i = 0;
+ 
++	if (count > RDS_BUFFER)
++		return -EFAULT;
+ 	mutex_lock(&dev->lock);
+ 	if (dev->rdsstat == 0) {
+ 		dev->rdsstat = 1;
+diff -urNp linux-3.1.1/drivers/media/video/au0828/au0828.h linux-3.1.1/drivers/media/video/au0828/au0828.h
+--- linux-3.1.1/drivers/media/video/au0828/au0828.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/au0828/au0828.h	2011-11-16 18:39:07.000000000 -0500
+@@ -191,7 +191,7 @@ struct au0828_dev {
+ 
+ 	/* I2C */
+ 	struct i2c_adapter		i2c_adap;
+-	struct i2c_algorithm		i2c_algo;
++	i2c_algorithm_no_const		i2c_algo;
+ 	struct i2c_client		i2c_client;
+ 	u32 				i2c_rc;
+ 
+diff -urNp linux-3.1.1/drivers/media/video/cx18/cx18-driver.c linux-3.1.1/drivers/media/video/cx18/cx18-driver.c
+--- linux-3.1.1/drivers/media/video/cx18/cx18-driver.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/cx18/cx18-driver.c	2011-11-16 18:40:10.000000000 -0500
 @@ -327,6 +327,8 @@ void cx18_read_eeprom(struct cx18 *cx, s
  	struct i2c_client c;
  	u8 eedata[256];
@@ -30100,9 +30094,9 @@ diff -urNp linux-3.0.9/drivers/media/video/cx18/cx18-driver.c linux-3.0.9/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.9/drivers/media/video/cx23885/cx23885-input.c linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c
---- linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/video/cx23885/cx23885-input.c linux-3.1.1/drivers/media/video/cx23885/cx23885-input.c
+--- linux-3.1.1/drivers/media/video/cx23885/cx23885-input.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/cx23885/cx23885-input.c	2011-11-16 18:40:10.000000000 -0500
 @@ -53,6 +53,8 @@ static void cx23885_input_process_measur
  	bool handle = false;
  	struct ir_raw_event ir_core_event[64];
@@ -30112,10 +30106,10 @@ diff -urNp linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c linux-3.0.9/d
  	do {
  		num = 0;
  		v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event,
-diff -urNp linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c
---- linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c	2011-11-15 20:02:59.000000000 -0500
-@@ -764,7 +764,7 @@ static struct snd_kcontrol_new snd_cx88_
+diff -urNp linux-3.1.1/drivers/media/video/cx88/cx88-alsa.c linux-3.1.1/drivers/media/video/cx88/cx88-alsa.c
+--- linux-3.1.1/drivers/media/video/cx88/cx88-alsa.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/cx88/cx88-alsa.c	2011-11-16 18:39:07.000000000 -0500
+@@ -766,7 +766,7 @@ static struct snd_kcontrol_new snd_cx88_
   * Only boards with eeprom and byte 1 at eeprom=1 have it
   */
  
@@ -30124,9 +30118,9 @@ diff -urNp linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c linux-3.0.9/drivers/
  	{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.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
---- linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+--- linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-11-16 18:40:10.000000000 -0500
 @@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw 
  	u8 *eeprom;
  	struct tveeprom tvdata;
@@ -30136,9 +30130,21 @@ diff -urNp linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.9/
  	memset(&tvdata,0,sizeof(tvdata));
  
  	eeprom = pvr2_eeprom_fetch(hdw);
-diff -urNp linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c
---- linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+--- linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h	2011-11-16 18:39:07.000000000 -0500
+@@ -196,7 +196,7 @@ struct pvr2_hdw {
+ 
+ 	/* I2C stuff */
+ 	struct i2c_adapter i2c_adap;
+-	struct i2c_algorithm i2c_algo;
++	i2c_algorithm_no_const i2c_algo;
+ 	pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
+ 	int i2c_cx25840_hack_state;
+ 	int i2c_linked;
+diff -urNp linux-3.1.1/drivers/media/video/saa7134/saa6752hs.c linux-3.1.1/drivers/media/video/saa7134/saa6752hs.c
+--- linux-3.1.1/drivers/media/video/saa7134/saa6752hs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/saa7134/saa6752hs.c	2011-11-16 18:40:10.000000000 -0500
 @@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su
  	unsigned char localPAT[256];
  	unsigned char localPMT[256];
@@ -30148,9 +30154,9 @@ diff -urNp linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c linux-3.0.9/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.9/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c
---- linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/video/saa7164/saa7164-cmd.c linux-3.1.1/drivers/media/video/saa7164/saa7164-cmd.c
+--- linux-3.1.1/drivers/media/video/saa7164/saa7164-cmd.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/saa7164/saa7164-cmd.c	2011-11-16 18:40:10.000000000 -0500
 @@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d
  	u8 tmp[512];
  	dprintk(DBGLVL_CMD, "%s()\n", __func__);
@@ -30169,10 +30175,10 @@ diff -urNp linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.9/dri
  	while (loop) {
  
  		struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 };
-diff -urNp linux-3.0.9/drivers/media/video/timblogiw.c linux-3.0.9/drivers/media/video/timblogiw.c
---- linux-3.0.9/drivers/media/video/timblogiw.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/timblogiw.c	2011-11-15 20:02:59.000000000 -0500
-@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *f
+diff -urNp linux-3.1.1/drivers/media/video/timblogiw.c linux-3.1.1/drivers/media/video/timblogiw.c
+--- linux-3.1.1/drivers/media/video/timblogiw.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/timblogiw.c	2011-11-16 18:40:10.000000000 -0500
+@@ -744,7 +744,7 @@ static int timblogiw_mmap(struct file *f
  
  /* Platform device functions */
  
@@ -30181,9 +30187,9 @@ diff -urNp linux-3.0.9/drivers/media/video/timblogiw.c linux-3.0.9/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.9/drivers/media/video/usbvision/usbvision-core.c linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c
---- linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/media/video/usbvision/usbvision-core.c linux-3.1.1/drivers/media/video/usbvision/usbvision-core.c
+--- linux-3.1.1/drivers/media/video/usbvision/usbvision-core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/usbvision/usbvision-core.c	2011-11-16 18:40:10.000000000 -0500
 @@ -707,6 +707,8 @@ static enum parse_state usbvision_parse_
  	unsigned char rv, gv, bv;
  	static unsigned char *Y, *U, *V;
@@ -30193,10 +30199,10 @@ diff -urNp linux-3.0.9/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.9/drivers/media/video/videobuf-dma-sg.c linux-3.0.9/drivers/media/video/videobuf-dma-sg.c
---- linux-3.0.9/drivers/media/video/videobuf-dma-sg.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/videobuf-dma-sg.c	2011-11-15 20:02:59.000000000 -0500
-@@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size)
+diff -urNp linux-3.1.1/drivers/media/video/videobuf-dma-sg.c linux-3.1.1/drivers/media/video/videobuf-dma-sg.c
+--- linux-3.1.1/drivers/media/video/videobuf-dma-sg.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/videobuf-dma-sg.c	2011-11-16 18:40:10.000000000 -0500
+@@ -607,6 +607,8 @@ void *videobuf_sg_alloc(size_t size)
  {
  	struct videobuf_queue q;
  
@@ -30205,9 +30211,9 @@ diff -urNp linux-3.0.9/drivers/media/video/videobuf-dma-sg.c linux-3.0.9/drivers
  	/* Required to make generic handler to call __videobuf_alloc */
  	q.int_ops = &sg_ops;
  
-diff -urNp linux-3.0.9/drivers/message/fusion/mptbase.c linux-3.0.9/drivers/message/fusion/mptbase.c
---- linux-3.0.9/drivers/message/fusion/mptbase.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/message/fusion/mptbase.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/message/fusion/mptbase.c linux-3.1.1/drivers/message/fusion/mptbase.c
+--- linux-3.1.1/drivers/message/fusion/mptbase.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/message/fusion/mptbase.c	2011-11-16 18:40:10.000000000 -0500
 @@ -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);
@@ -30222,9 +30228,9 @@ diff -urNp linux-3.0.9/drivers/message/fusion/mptbase.c linux-3.0.9/drivers/mess
  	/*
  	 *  Rounding UP to nearest 4-kB boundary here...
  	 */
-diff -urNp linux-3.0.9/drivers/message/fusion/mptsas.c linux-3.0.9/drivers/message/fusion/mptsas.c
---- linux-3.0.9/drivers/message/fusion/mptsas.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/message/fusion/mptsas.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/message/fusion/mptsas.c linux-3.1.1/drivers/message/fusion/mptsas.c
+--- linux-3.1.1/drivers/message/fusion/mptsas.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/message/fusion/mptsas.c	2011-11-16 18:39:07.000000000 -0500
 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
  		return 0;
  }
@@ -30273,9 +30279,9 @@ diff -urNp linux-3.0.9/drivers/message/fusion/mptsas.c linux-3.0.9/drivers/messa
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff -urNp linux-3.0.9/drivers/message/fusion/mptscsih.c linux-3.0.9/drivers/message/fusion/mptscsih.c
---- linux-3.0.9/drivers/message/fusion/mptscsih.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/message/fusion/mptscsih.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/message/fusion/mptscsih.c linux-3.1.1/drivers/message/fusion/mptscsih.c
+--- linux-3.1.1/drivers/message/fusion/mptscsih.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/message/fusion/mptscsih.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
  
  	h = shost_priv(SChost);
@@ -30301,9 +30307,9 @@ diff -urNp linux-3.0.9/drivers/message/fusion/mptscsih.c linux-3.0.9/drivers/mes
  
  	return h->info_kbuf;
  }
-diff -urNp linux-3.0.9/drivers/message/i2o/i2o_config.c linux-3.0.9/drivers/message/i2o/i2o_config.c
---- linux-3.0.9/drivers/message/i2o/i2o_config.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/message/i2o/i2o_config.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/message/i2o/i2o_config.c linux-3.1.1/drivers/message/i2o/i2o_config.c
+--- linux-3.1.1/drivers/message/i2o/i2o_config.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/message/i2o/i2o_config.c	2011-11-16 18:40:10.000000000 -0500
 @@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon
  	struct i2o_message *msg;
  	unsigned int iop;
@@ -30313,9 +30319,9 @@ diff -urNp linux-3.0.9/drivers/message/i2o/i2o_config.c linux-3.0.9/drivers/mess
  	if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
  		return -EFAULT;
  
-diff -urNp linux-3.0.9/drivers/message/i2o/i2o_proc.c linux-3.0.9/drivers/message/i2o/i2o_proc.c
---- linux-3.0.9/drivers/message/i2o/i2o_proc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/message/i2o/i2o_proc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/message/i2o/i2o_proc.c linux-3.1.1/drivers/message/i2o/i2o_proc.c
+--- linux-3.1.1/drivers/message/i2o/i2o_proc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/message/i2o/i2o_proc.c	2011-11-16 18:39:07.000000000 -0500
 @@ -255,13 +255,6 @@ static char *scsi_devices[] = {
  	"Array Controller Device"
  };
@@ -30402,9 +30408,9 @@ diff -urNp linux-3.0.9/drivers/message/i2o/i2o_proc.c linux-3.0.9/drivers/messag
  
  	return 0;
  }
-diff -urNp linux-3.0.9/drivers/message/i2o/iop.c linux-3.0.9/drivers/message/i2o/iop.c
---- linux-3.0.9/drivers/message/i2o/iop.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/message/i2o/iop.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/message/i2o/iop.c linux-3.1.1/drivers/message/i2o/iop.c
+--- linux-3.1.1/drivers/message/i2o/iop.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/message/i2o/iop.c	2011-11-16 18:39:07.000000000 -0500
 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
  
  	spin_lock_irqsave(&c->context_list_lock, flags);
@@ -30428,9 +30434,9 @@ diff -urNp linux-3.0.9/drivers/message/i2o/iop.c linux-3.0.9/drivers/message/i2o
  	INIT_LIST_HEAD(&c->context_list);
  #endif
  
-diff -urNp linux-3.0.9/drivers/mfd/ab3100-core.c linux-3.0.9/drivers/mfd/ab3100-core.c
---- linux-3.0.9/drivers/mfd/ab3100-core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mfd/ab3100-core.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mfd/ab3100-core.c linux-3.1.1/drivers/mfd/ab3100-core.c
+--- linux-3.1.1/drivers/mfd/ab3100-core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mfd/ab3100-core.c	2011-11-16 18:39:07.000000000 -0500
 @@ -809,7 +809,7 @@ struct ab_family_id {
  	char	*name;
  };
@@ -30440,9 +30446,9 @@ diff -urNp linux-3.0.9/drivers/mfd/ab3100-core.c linux-3.0.9/drivers/mfd/ab3100-
  	/* AB3100 */
  	{
  		.id = 0xc0,
-diff -urNp linux-3.0.9/drivers/mfd/abx500-core.c linux-3.0.9/drivers/mfd/abx500-core.c
---- linux-3.0.9/drivers/mfd/abx500-core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mfd/abx500-core.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mfd/abx500-core.c linux-3.1.1/drivers/mfd/abx500-core.c
+--- linux-3.1.1/drivers/mfd/abx500-core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mfd/abx500-core.c	2011-11-16 18:39:07.000000000 -0500
 @@ -14,7 +14,7 @@ static LIST_HEAD(abx500_list);
  
  struct abx500_device_entry {
@@ -30452,9 +30458,9 @@ diff -urNp linux-3.0.9/drivers/mfd/abx500-core.c linux-3.0.9/drivers/mfd/abx500-
  	struct device *dev;
  };
  
-diff -urNp linux-3.0.9/drivers/mfd/janz-cmodio.c linux-3.0.9/drivers/mfd/janz-cmodio.c
---- linux-3.0.9/drivers/mfd/janz-cmodio.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mfd/janz-cmodio.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mfd/janz-cmodio.c linux-3.1.1/drivers/mfd/janz-cmodio.c
+--- linux-3.1.1/drivers/mfd/janz-cmodio.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mfd/janz-cmodio.c	2011-11-16 18:39:07.000000000 -0500
 @@ -13,6 +13,7 @@
  
  #include <linux/kernel.h>
@@ -30463,9 +30469,9 @@ diff -urNp linux-3.0.9/drivers/mfd/janz-cmodio.c linux-3.0.9/drivers/mfd/janz-cm
  #include <linux/init.h>
  #include <linux/pci.h>
  #include <linux/interrupt.h>
-diff -urNp linux-3.0.9/drivers/mfd/wm8350-i2c.c linux-3.0.9/drivers/mfd/wm8350-i2c.c
---- linux-3.0.9/drivers/mfd/wm8350-i2c.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mfd/wm8350-i2c.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mfd/wm8350-i2c.c linux-3.1.1/drivers/mfd/wm8350-i2c.c
+--- linux-3.1.1/drivers/mfd/wm8350-i2c.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mfd/wm8350-i2c.c	2011-11-16 18:40:10.000000000 -0500
 @@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc
  	u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
  	int ret;
@@ -30475,9 +30481,9 @@ diff -urNp linux-3.0.9/drivers/mfd/wm8350-i2c.c linux-3.0.9/drivers/mfd/wm8350-i
  	if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
  		return -EINVAL;
  
-diff -urNp linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c
---- linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.c
+--- linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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.
@@ -30514,9 +30520,9 @@ diff -urNp linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.9/drivers/mi
  		return POLLIN | POLLRDNORM;
  	return 0;
  }
-diff -urNp linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h
---- linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.h
+--- linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.h	2011-11-16 18:39:07.000000000 -0500
 @@ -265,7 +265,7 @@ struct lis3lv02d {
  	struct input_polled_dev	*idev;     /* input device */
  	struct platform_device	*pdev;     /* platform device */
@@ -30526,9 +30532,9 @@ diff -urNp linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.9/drivers/mi
  	union axis_conversion	ac;        /* hw -> logical axis */
  	int			mapped_btns[3];
  
-diff -urNp linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c
---- linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/misc/sgi-gru/gruhandles.c linux-3.1.1/drivers/misc/sgi-gru/gruhandles.c
+--- linux-3.1.1/drivers/misc/sgi-gru/gruhandles.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/sgi-gru/gruhandles.c	2011-11-16 18:39:07.000000000 -0500
 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
  	unsigned long nsec;
  
@@ -30540,9 +30546,9 @@ diff -urNp linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c linux-3.0.9/drivers/mis
  	if (mcs_op_statistics[op].max < nsec)
  		mcs_op_statistics[op].max = nsec;
  }
-diff -urNp linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c
---- linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/misc/sgi-gru/gruprocfs.c linux-3.1.1/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-3.1.1/drivers/misc/sgi-gru/gruprocfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/sgi-gru/gruprocfs.c	2011-11-16 18:39:07.000000000 -0500
 @@ -32,9 +32,9 @@
  
  #define printstat(s, f)		printstat_val(s, &gru_stats.f, #f)
@@ -30566,9 +30572,9 @@ diff -urNp linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.9/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.9/drivers/misc/sgi-gru/grutables.h linux-3.0.9/drivers/misc/sgi-gru/grutables.h
---- linux-3.0.9/drivers/misc/sgi-gru/grutables.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/sgi-gru/grutables.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/misc/sgi-gru/grutables.h linux-3.1.1/drivers/misc/sgi-gru/grutables.h
+--- linux-3.1.1/drivers/misc/sgi-gru/grutables.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/sgi-gru/grutables.h	2011-11-16 18:39:07.000000000 -0500
 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
   * GRU statistics.
   */
@@ -30748,9 +30754,9 @@ diff -urNp linux-3.0.9/drivers/misc/sgi-gru/grutables.h linux-3.0.9/drivers/misc
  			} while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xpc.h linux-3.0.9/drivers/misc/sgi-xp/xpc.h
---- linux-3.0.9/drivers/misc/sgi-xp/xpc.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/sgi-xp/xpc.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/misc/sgi-xp/xpc.h linux-3.1.1/drivers/misc/sgi-xp/xpc.h
+--- linux-3.1.1/drivers/misc/sgi-xp/xpc.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/sgi-xp/xpc.h	2011-11-16 18:39:07.000000000 -0500
 @@ -835,6 +835,7 @@ struct xpc_arch_operations {
  	void (*received_payload) (struct xpc_channel *, void *);
  	void (*notify_senders_of_disconnect) (struct xpc_channel *);
@@ -30768,9 +30774,9 @@ diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xpc.h linux-3.0.9/drivers/misc/sgi-xp
  extern int xpc_disengage_timelimit;
  extern int xpc_disengage_timedout;
  extern int xpc_activate_IRQ_rcvd;
-diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c
---- linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/misc/sgi-xp/xpc_main.c linux-3.1.1/drivers/misc/sgi-xp/xpc_main.c
+--- linux-3.1.1/drivers/misc/sgi-xp/xpc_main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/sgi-xp/xpc_main.c	2011-11-16 18:39:07.000000000 -0500
 @@ -162,7 +162,7 @@ static struct notifier_block xpc_die_not
  	.notifier_call = xpc_system_die,
  };
@@ -30780,9 +30786,9 @@ diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c linux-3.0.9/drivers/misc/s
  
  /*
   * Timer function to enforce the timelimit on the partition disengage.
-diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xp.h linux-3.0.9/drivers/misc/sgi-xp/xp.h
---- linux-3.0.9/drivers/misc/sgi-xp/xp.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/sgi-xp/xp.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/misc/sgi-xp/xp.h linux-3.1.1/drivers/misc/sgi-xp/xp.h
+--- linux-3.1.1/drivers/misc/sgi-xp/xp.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/sgi-xp/xp.h	2011-11-16 18:39:07.000000000 -0500
 @@ -289,7 +289,7 @@ struct xpc_interface {
  					xpc_notify_func, void *);
  	void (*received) (short, int, void *);
@@ -30792,10 +30798,10 @@ diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xp.h linux-3.0.9/drivers/misc/sgi-xp/
  
  extern struct xpc_interface xpc_interface;
  
-diff -urNp linux-3.0.9/drivers/mmc/host/sdhci-pci.c linux-3.0.9/drivers/mmc/host/sdhci-pci.c
---- linux-3.0.9/drivers/mmc/host/sdhci-pci.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mmc/host/sdhci-pci.c	2011-11-15 20:02:59.000000000 -0500
-@@ -524,7 +524,7 @@ static const struct sdhci_pci_fixes sdhc
+diff -urNp linux-3.1.1/drivers/mmc/host/sdhci-pci.c linux-3.1.1/drivers/mmc/host/sdhci-pci.c
+--- linux-3.1.1/drivers/mmc/host/sdhci-pci.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mmc/host/sdhci-pci.c	2011-11-16 18:39:07.000000000 -0500
+@@ -542,7 +542,7 @@ static const struct sdhci_pci_fixes sdhc
  	.probe		= via_probe,
  };
  
@@ -30804,9 +30810,9 @@ diff -urNp linux-3.0.9/drivers/mmc/host/sdhci-pci.c linux-3.0.9/drivers/mmc/host
  	{
  		.vendor		= PCI_VENDOR_ID_RICOH,
  		.device		= PCI_DEVICE_ID_RICOH_R5C822,
-diff -urNp linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c
---- linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0001.c
+--- linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0001.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0001.c	2011-11-16 18:40:10.000000000 -0500
 @@ -757,6 +757,8 @@ static int chip_ready (struct map_info *
  	struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
  	unsigned long timeo = jiffies + HZ;
@@ -30834,9 +30840,9 @@ diff -urNp linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.9/drivers/m
  	adr += chip->start;
  
   retry:
-diff -urNp linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c
---- linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0020.c
+--- linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0020.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0020.c	2011-11-16 18:40:10.000000000 -0500
 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
  	unsigned long cmd_addr;
  	struct cfi_private *cfi = map->fldrv_priv;
@@ -30882,9 +30888,9 @@ diff -urNp linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.9/drivers/m
  	adr += chip->start;
  
  	/* Let's determine this according to the interleave only once */
-diff -urNp linux-3.0.9/drivers/mtd/devices/doc2000.c linux-3.0.9/drivers/mtd/devices/doc2000.c
---- linux-3.0.9/drivers/mtd/devices/doc2000.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/devices/doc2000.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mtd/devices/doc2000.c linux-3.1.1/drivers/mtd/devices/doc2000.c
+--- linux-3.1.1/drivers/mtd/devices/doc2000.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/devices/doc2000.c	2011-11-16 18:39:07.000000000 -0500
 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
  
  		/* The ECC will not be calculated correctly if less than 512 is written */
@@ -30894,9 +30900,9 @@ diff -urNp linux-3.0.9/drivers/mtd/devices/doc2000.c linux-3.0.9/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.9/drivers/mtd/devices/doc2001.c linux-3.0.9/drivers/mtd/devices/doc2001.c
---- linux-3.0.9/drivers/mtd/devices/doc2001.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/devices/doc2001.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mtd/devices/doc2001.c linux-3.1.1/drivers/mtd/devices/doc2001.c
+--- linux-3.1.1/drivers/mtd/devices/doc2001.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/devices/doc2001.c	2011-11-16 18:39:07.000000000 -0500
 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
  	struct Nand *mychip = &this->chips[from >> (this->chipshift)];
  
@@ -30906,9 +30912,9 @@ diff -urNp linux-3.0.9/drivers/mtd/devices/doc2001.c linux-3.0.9/drivers/mtd/dev
  		return -EINVAL;
  
  	/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-3.0.9/drivers/mtd/ftl.c linux-3.0.9/drivers/mtd/ftl.c
---- linux-3.0.9/drivers/mtd/ftl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/ftl.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mtd/ftl.c linux-3.1.1/drivers/mtd/ftl.c
+--- linux-3.1.1/drivers/mtd/ftl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/ftl.c	2011-11-16 18:40:10.000000000 -0500
 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
      loff_t offset;
      uint16_t srcunitswap = cpu_to_le16(srcunit);
@@ -30918,9 +30924,9 @@ diff -urNp linux-3.0.9/drivers/mtd/ftl.c linux-3.0.9/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.9/drivers/mtd/inftlcore.c linux-3.0.9/drivers/mtd/inftlcore.c
---- linux-3.0.9/drivers/mtd/inftlcore.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/inftlcore.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mtd/inftlcore.c linux-3.1.1/drivers/mtd/inftlcore.c
+--- linux-3.1.1/drivers/mtd/inftlcore.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/inftlcore.c	2011-11-16 18:40:10.000000000 -0500
 @@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr
  	struct inftl_oob oob;
  	size_t retlen;
@@ -30930,9 +30936,9 @@ diff -urNp linux-3.0.9/drivers/mtd/inftlcore.c linux-3.0.9/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.9/drivers/mtd/inftlmount.c linux-3.0.9/drivers/mtd/inftlmount.c
---- linux-3.0.9/drivers/mtd/inftlmount.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/inftlmount.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mtd/inftlmount.c linux-3.1.1/drivers/mtd/inftlmount.c
+--- linux-3.1.1/drivers/mtd/inftlmount.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/inftlmount.c	2011-11-16 18:40:10.000000000 -0500
 @@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL
  	struct INFTLPartition *ip;
  	size_t retlen;
@@ -30942,9 +30948,9 @@ diff -urNp linux-3.0.9/drivers/mtd/inftlmount.c linux-3.0.9/drivers/mtd/inftlmou
  	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
  
          /*
-diff -urNp linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c
---- linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mtd/lpddr/qinfo_probe.c linux-3.1.1/drivers/mtd/lpddr/qinfo_probe.c
+--- linux-3.1.1/drivers/mtd/lpddr/qinfo_probe.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/lpddr/qinfo_probe.c	2011-11-16 18:40:10.000000000 -0500
 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
  {
  	map_word pfow_val[4];
@@ -30954,9 +30960,9 @@ diff -urNp linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.9/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.9/drivers/mtd/mtdchar.c linux-3.0.9/drivers/mtd/mtdchar.c
---- linux-3.0.9/drivers/mtd/mtdchar.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/mtdchar.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mtd/mtdchar.c linux-3.1.1/drivers/mtd/mtdchar.c
+--- linux-3.1.1/drivers/mtd/mtdchar.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/mtdchar.c	2011-11-16 18:40:10.000000000 -0500
 @@ -554,6 +554,8 @@ static int mtd_ioctl(struct file *file, 
  	u_long size;
  	struct mtd_info_user info;
@@ -30966,9 +30972,9 @@ diff -urNp linux-3.0.9/drivers/mtd/mtdchar.c linux-3.0.9/drivers/mtd/mtdchar.c
  	DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
  
  	size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
-diff -urNp linux-3.0.9/drivers/mtd/nand/denali.c linux-3.0.9/drivers/mtd/nand/denali.c
---- linux-3.0.9/drivers/mtd/nand/denali.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/nand/denali.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mtd/nand/denali.c linux-3.1.1/drivers/mtd/nand/denali.c
+--- linux-3.1.1/drivers/mtd/nand/denali.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/nand/denali.c	2011-11-16 18:39:07.000000000 -0500
 @@ -26,6 +26,7 @@
  #include <linux/pci.h>
  #include <linux/mtd/mtd.h>
@@ -30977,9 +30983,9 @@ diff -urNp linux-3.0.9/drivers/mtd/nand/denali.c linux-3.0.9/drivers/mtd/nand/de
  
  #include "denali.h"
  
-diff -urNp linux-3.0.9/drivers/mtd/nftlcore.c linux-3.0.9/drivers/mtd/nftlcore.c
---- linux-3.0.9/drivers/mtd/nftlcore.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/nftlcore.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mtd/nftlcore.c linux-3.1.1/drivers/mtd/nftlcore.c
+--- linux-3.1.1/drivers/mtd/nftlcore.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/nftlcore.c	2011-11-16 18:40:10.000000000 -0500
 @@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre
  	int inplace = 1;
  	size_t retlen;
@@ -30989,9 +30995,9 @@ diff -urNp linux-3.0.9/drivers/mtd/nftlcore.c linux-3.0.9/drivers/mtd/nftlcore.c
  	memset(BlockMap, 0xff, sizeof(BlockMap));
  	memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
  
-diff -urNp linux-3.0.9/drivers/mtd/nftlmount.c linux-3.0.9/drivers/mtd/nftlmount.c
---- linux-3.0.9/drivers/mtd/nftlmount.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/nftlmount.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/mtd/nftlmount.c linux-3.1.1/drivers/mtd/nftlmount.c
+--- linux-3.1.1/drivers/mtd/nftlmount.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/nftlmount.c	2011-11-16 18:40:10.000000000 -0500
 @@ -24,6 +24,7 @@
  #include <asm/errno.h>
  #include <linux/delay.h>
@@ -31009,10 +31015,10 @@ diff -urNp linux-3.0.9/drivers/mtd/nftlmount.c linux-3.0.9/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.9/drivers/mtd/ubi/build.c linux-3.0.9/drivers/mtd/ubi/build.c
---- linux-3.0.9/drivers/mtd/ubi/build.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/ubi/build.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1287,7 +1287,7 @@ module_exit(ubi_exit);
+diff -urNp linux-3.1.1/drivers/mtd/ubi/build.c linux-3.1.1/drivers/mtd/ubi/build.c
+--- linux-3.1.1/drivers/mtd/ubi/build.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/ubi/build.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1311,7 +1311,7 @@ module_exit(ubi_exit);
  static int __init bytes_str_to_int(const char *str)
  {
  	char *endp;
@@ -31021,7 +31027,7 @@ diff -urNp linux-3.0.9/drivers/mtd/ubi/build.c linux-3.0.9/drivers/mtd/ubi/build
  
  	result = simple_strtoul(str, &endp, 0);
  	if (str == endp || result >= INT_MAX) {
-@@ -1298,11 +1298,11 @@ static int __init bytes_str_to_int(const
+@@ -1322,11 +1322,11 @@ static int __init bytes_str_to_int(const
  
  	switch (*endp) {
  	case 'G':
@@ -31036,7 +31042,7 @@ diff -urNp linux-3.0.9/drivers/mtd/ubi/build.c linux-3.0.9/drivers/mtd/ubi/build
  		if (endp[1] == 'i' && endp[2] == 'B')
  			endp += 2;
  	case '\0':
-@@ -1313,7 +1313,13 @@ static int __init bytes_str_to_int(const
+@@ -1337,7 +1337,13 @@ static int __init bytes_str_to_int(const
  		return -EINVAL;
  	}
  
@@ -31051,10 +31057,10 @@ diff -urNp linux-3.0.9/drivers/mtd/ubi/build.c linux-3.0.9/drivers/mtd/ubi/build
  }
  
  /**
-diff -urNp linux-3.0.9/drivers/net/atlx/atl2.c linux-3.0.9/drivers/net/atlx/atl2.c
---- linux-3.0.9/drivers/net/atlx/atl2.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/atlx/atl2.c	2011-11-15 20:02:59.000000000 -0500
-@@ -2840,7 +2840,7 @@ static void atl2_force_ps(struct atl2_hw
+diff -urNp linux-3.1.1/drivers/net/atlx/atl2.c linux-3.1.1/drivers/net/atlx/atl2.c
+--- linux-3.1.1/drivers/net/atlx/atl2.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/atlx/atl2.c	2011-11-16 18:39:07.000000000 -0500
+@@ -2857,7 +2857,7 @@ static void atl2_force_ps(struct atl2_hw
   */
  
  #define ATL2_PARAM(X, desc) \
@@ -31063,9 +31069,9 @@ diff -urNp linux-3.0.9/drivers/net/atlx/atl2.c linux-3.0.9/drivers/net/atlx/atl2
      MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
      MODULE_PARM_DESC(X, desc);
  #else
-diff -urNp linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c
---- linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/bna/bfa_ioc_ct.c linux-3.1.1/drivers/net/bna/bfa_ioc_ct.c
+--- linux-3.1.1/drivers/net/bna/bfa_ioc_ct.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/bna/bfa_ioc_ct.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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);
@@ -31110,10 +31116,10 @@ diff -urNp linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c linux-3.0.9/drivers/net/bna/
  	ioc->ioc_hwif = &nw_hwif_ct;
  }
  
-diff -urNp linux-3.0.9/drivers/net/bna/bnad.c linux-3.0.9/drivers/net/bna/bnad.c
---- linux-3.0.9/drivers/net/bna/bnad.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/bna/bnad.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1681,7 +1681,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx
+diff -urNp linux-3.1.1/drivers/net/bna/bnad.c linux-3.1.1/drivers/net/bna/bnad.c
+--- linux-3.1.1/drivers/net/bna/bnad.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/bna/bnad.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1673,7 +1673,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx
  	struct bna_intr_info *intr_info =
  			&res_info[BNA_TX_RES_INTR_T_TXCMPL].res_u.intr_info;
  	struct bna_tx_config *tx_config = &bnad->tx_config[tx_id];
@@ -31129,7 +31135,7 @@ diff -urNp linux-3.0.9/drivers/net/bna/bnad.c linux-3.0.9/drivers/net/bna/bnad.c
  	struct bna_tx *tx;
  	unsigned long flags;
  
-@@ -1690,13 +1697,6 @@ bnad_setup_tx(struct bnad *bnad, uint tx
+@@ -1682,13 +1689,6 @@ bnad_setup_tx(struct bnad *bnad, uint tx
  	tx_config->txq_depth = bnad->txq_depth;
  	tx_config->tx_type = BNA_TX_T_REGULAR;
  
@@ -31143,7 +31149,7 @@ diff -urNp linux-3.0.9/drivers/net/bna/bnad.c linux-3.0.9/drivers/net/bna/bnad.c
  	/* Get BNA's resource requirement for one tx object */
  	spin_lock_irqsave(&bnad->bna_lock, flags);
  	bna_tx_res_req(bnad->num_txq_per_tx,
-@@ -1827,21 +1827,21 @@ bnad_setup_rx(struct bnad *bnad, uint rx
+@@ -1819,21 +1819,21 @@ bnad_setup_rx(struct bnad *bnad, uint rx
  	struct bna_intr_info *intr_info =
  			&res_info[BNA_RX_RES_T_INTR].res_u.intr_info;
  	struct bna_rx_config *rx_config = &bnad->rx_config[rx_id];
@@ -31174,10 +31180,10 @@ diff -urNp linux-3.0.9/drivers/net/bna/bnad.c linux-3.0.9/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.9/drivers/net/bnx2.c linux-3.0.9/drivers/net/bnx2.c
---- linux-3.0.9/drivers/net/bnx2.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/bnx2.c	2011-11-15 20:02:59.000000000 -0500
-@@ -5831,6 +5831,8 @@ bnx2_test_nvram(struct bnx2 *bp)
+diff -urNp linux-3.1.1/drivers/net/bnx2.c linux-3.1.1/drivers/net/bnx2.c
+--- linux-3.1.1/drivers/net/bnx2.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/bnx2.c	2011-11-16 18:40:11.000000000 -0500
+@@ -5877,6 +5877,8 @@ bnx2_test_nvram(struct bnx2 *bp)
  	int rc = 0;
  	u32 magic, csum;
  
@@ -31186,10 +31192,10 @@ diff -urNp linux-3.0.9/drivers/net/bnx2.c linux-3.0.9/drivers/net/bnx2.c
  	if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
  		goto test_nvram_done;
  
-diff -urNp linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c
---- linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1705,6 +1705,8 @@ static int bnx2x_test_nvram(struct bnx2x
+diff -urNp linux-3.1.1/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.1.1/drivers/net/bnx2x/bnx2x_ethtool.c
+--- linux-3.1.1/drivers/net/bnx2x/bnx2x_ethtool.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/bnx2x/bnx2x_ethtool.c	2011-11-16 18:40:11.000000000 -0500
+@@ -1943,6 +1943,8 @@ static int bnx2x_test_nvram(struct bnx2x
  	int i, rc;
  	u32 magic, crc;
  
@@ -31198,43 +31204,21 @@ diff -urNp linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.9/drivers/net
  	if (BP_NOMCP(bp))
  		return 0;
  
-diff -urNp linux-3.0.9/drivers/net/can/mscan/mscan.c linux-3.0.9/drivers/net/can/mscan/mscan.c
---- linux-3.0.9/drivers/net/can/mscan/mscan.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/can/mscan/mscan.c	2011-11-15 20:02:59.000000000 -0500
-@@ -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]);
- 	}
+diff -urNp linux-3.1.1/drivers/net/bnx2x/bnx2x_sp.h linux-3.1.1/drivers/net/bnx2x/bnx2x_sp.h
+--- linux-3.1.1/drivers/net/bnx2x/bnx2x_sp.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/bnx2x/bnx2x_sp.h	2011-11-16 18:39:07.000000000 -0500
+@@ -449,7 +449,7 @@ struct bnx2x_rx_mode_obj {
  
- 	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;
+ 	int (*wait_comp)(struct bnx2x *bp,
+ 			 struct bnx2x_rx_mode_ramrod_params *p);
+-};
++} __no_const;
  
--		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);
- 	}
+ /********************** Set multicast group ***********************************/
  
- 	out_8(&regs->canrflg, MSCAN_RXF);
-diff -urNp linux-3.0.9/drivers/net/cxgb3/l2t.h linux-3.0.9/drivers/net/cxgb3/l2t.h
---- linux-3.0.9/drivers/net/cxgb3/l2t.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/cxgb3/l2t.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/cxgb3/l2t.h linux-3.1.1/drivers/net/cxgb3/l2t.h
+--- linux-3.1.1/drivers/net/cxgb3/l2t.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/cxgb3/l2t.h	2011-11-16 18:39:07.000000000 -0500
 @@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)
   */
  struct l2t_skb_cb {
@@ -31244,9 +31228,9 @@ diff -urNp linux-3.0.9/drivers/net/cxgb3/l2t.h linux-3.0.9/drivers/net/cxgb3/l2t
  
  #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
  
-diff -urNp linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c
---- linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/cxgb4/cxgb4_main.c linux-3.1.1/drivers/net/cxgb4/cxgb4_main.c
+--- linux-3.1.1/drivers/net/cxgb4/cxgb4_main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/cxgb4/cxgb4_main.c	2011-11-16 18:40:22.000000000 -0500
 @@ -3396,6 +3396,8 @@ static int __devinit enable_msix(struct 
  	unsigned int nchan = adap->params.nports;
  	struct msix_entry entries[MAX_INGQ + 1];
@@ -31256,9 +31240,9 @@ diff -urNp linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c linux-3.0.9/drivers/net/cx
  	for (i = 0; i < ARRAY_SIZE(entries); ++i)
  		entries[i].entry = i;
  
-diff -urNp linux-3.0.9/drivers/net/cxgb4/t4_hw.c linux-3.0.9/drivers/net/cxgb4/t4_hw.c
---- linux-3.0.9/drivers/net/cxgb4/t4_hw.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/cxgb4/t4_hw.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/cxgb4/t4_hw.c linux-3.1.1/drivers/net/cxgb4/t4_hw.c
+--- linux-3.1.1/drivers/net/cxgb4/t4_hw.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/cxgb4/t4_hw.c	2011-11-16 18:40:22.000000000 -0500
 @@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter
  	u8 vpd[VPD_LEN], csum;
  	unsigned int vpdr_len, kw_offset, id_len;
@@ -31268,9 +31252,9 @@ diff -urNp linux-3.0.9/drivers/net/cxgb4/t4_hw.c linux-3.0.9/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.9/drivers/net/e1000e/82571.c linux-3.0.9/drivers/net/e1000e/82571.c
---- linux-3.0.9/drivers/net/e1000e/82571.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/e1000e/82571.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/e1000e/82571.c linux-3.1.1/drivers/net/e1000e/82571.c
+--- linux-3.1.1/drivers/net/e1000e/82571.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/e1000e/82571.c	2011-11-16 18:39:07.000000000 -0500
 @@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s
  {
  	struct e1000_hw *hw = &adapter->hw;
@@ -31280,9 +31264,9 @@ diff -urNp linux-3.0.9/drivers/net/e1000e/82571.c linux-3.0.9/drivers/net/e1000e
  	u32 swsm = 0;
  	u32 swsm2 = 0;
  	bool force_clear_smbi = false;
-diff -urNp linux-3.0.9/drivers/net/e1000e/es2lan.c linux-3.0.9/drivers/net/e1000e/es2lan.c
---- linux-3.0.9/drivers/net/e1000e/es2lan.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/e1000e/es2lan.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/e1000e/es2lan.c linux-3.1.1/drivers/net/e1000e/es2lan.c
+--- linux-3.1.1/drivers/net/e1000e/es2lan.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/e1000e/es2lan.c	2011-11-16 18:39:07.000000000 -0500
 @@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es
  {
  	struct e1000_hw *hw = &adapter->hw;
@@ -31292,18 +31276,18 @@ diff -urNp linux-3.0.9/drivers/net/e1000e/es2lan.c linux-3.0.9/drivers/net/e1000
  
  	/* Set media type */
  	switch (adapter->pdev->device) {
-diff -urNp linux-3.0.9/drivers/net/e1000e/hw.h linux-3.0.9/drivers/net/e1000e/hw.h
---- linux-3.0.9/drivers/net/e1000e/hw.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/e1000e/hw.h	2011-11-15 20:02:59.000000000 -0500
-@@ -776,6 +776,7 @@ struct e1000_mac_operations {
+diff -urNp linux-3.1.1/drivers/net/e1000e/hw.h linux-3.1.1/drivers/net/e1000e/hw.h
+--- linux-3.1.1/drivers/net/e1000e/hw.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/e1000e/hw.h	2011-11-16 18:39:07.000000000 -0500
+@@ -778,6 +778,7 @@ struct e1000_mac_operations {
  	void (*write_vfta)(struct e1000_hw *, u32, u32);
  	s32  (*read_mac_addr)(struct e1000_hw *);
  };
 +typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
  
- /* Function pointers for the PHY. */
- struct e1000_phy_operations {
-@@ -799,6 +800,7 @@ struct e1000_phy_operations {
+ /*
+  * When to use various PHY register access functions:
+@@ -818,6 +819,7 @@ struct e1000_phy_operations {
  	void (*power_up)(struct e1000_hw *);
  	void (*power_down)(struct e1000_hw *);
  };
@@ -31311,7 +31295,7 @@ diff -urNp linux-3.0.9/drivers/net/e1000e/hw.h linux-3.0.9/drivers/net/e1000e/hw
  
  /* Function pointers for the NVM. */
  struct e1000_nvm_operations {
-@@ -810,9 +812,10 @@ struct e1000_nvm_operations {
+@@ -829,9 +831,10 @@ struct e1000_nvm_operations {
  	s32  (*validate)(struct e1000_hw *);
  	s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
  };
@@ -31323,7 +31307,7 @@ diff -urNp linux-3.0.9/drivers/net/e1000e/hw.h linux-3.0.9/drivers/net/e1000e/hw
  	u8 addr[ETH_ALEN];
  	u8 perm_addr[ETH_ALEN];
  
-@@ -853,7 +856,7 @@ struct e1000_mac_info {
+@@ -872,7 +875,7 @@ struct e1000_mac_info {
  };
  
  struct e1000_phy_info {
@@ -31332,7 +31316,7 @@ diff -urNp linux-3.0.9/drivers/net/e1000e/hw.h linux-3.0.9/drivers/net/e1000e/hw
  
  	enum e1000_phy_type type;
  
-@@ -887,7 +890,7 @@ struct e1000_phy_info {
+@@ -906,7 +909,7 @@ struct e1000_phy_info {
  };
  
  struct e1000_nvm_info {
@@ -31341,9 +31325,9 @@ diff -urNp linux-3.0.9/drivers/net/e1000e/hw.h linux-3.0.9/drivers/net/e1000e/hw
  
  	enum e1000_nvm_type type;
  	enum e1000_nvm_override override;
-diff -urNp linux-3.0.9/drivers/net/fealnx.c linux-3.0.9/drivers/net/fealnx.c
---- linux-3.0.9/drivers/net/fealnx.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/fealnx.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/fealnx.c linux-3.1.1/drivers/net/fealnx.c
+--- linux-3.1.1/drivers/net/fealnx.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/fealnx.c	2011-11-16 18:39:07.000000000 -0500
 @@ -150,7 +150,7 @@ struct chip_info {
  	int flags;
  };
@@ -31353,9 +31337,9 @@ diff -urNp linux-3.0.9/drivers/net/fealnx.c linux-3.0.9/drivers/net/fealnx.c
   	{ "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.9/drivers/net/hamradio/6pack.c linux-3.0.9/drivers/net/hamradio/6pack.c
---- linux-3.0.9/drivers/net/hamradio/6pack.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/hamradio/6pack.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/hamradio/6pack.c linux-3.1.1/drivers/net/hamradio/6pack.c
+--- linux-3.1.1/drivers/net/hamradio/6pack.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/hamradio/6pack.c	2011-11-16 18:40:22.000000000 -0500
 @@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t
  	unsigned char buf[512];
  	int count1;
@@ -31365,9 +31349,9 @@ diff -urNp linux-3.0.9/drivers/net/hamradio/6pack.c linux-3.0.9/drivers/net/hamr
  	if (!count)
  		return;
  
-diff -urNp linux-3.0.9/drivers/net/igb/e1000_hw.h linux-3.0.9/drivers/net/igb/e1000_hw.h
---- linux-3.0.9/drivers/net/igb/e1000_hw.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/igb/e1000_hw.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/igb/e1000_hw.h linux-3.1.1/drivers/net/igb/e1000_hw.h
+--- linux-3.1.1/drivers/net/igb/e1000_hw.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/igb/e1000_hw.h	2011-11-16 18:39:07.000000000 -0500
 @@ -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 *);
@@ -31436,9 +31420,9 @@ diff -urNp linux-3.0.9/drivers/net/igb/e1000_hw.h linux-3.0.9/drivers/net/igb/e1
  	struct e1000_mbx_stats stats;
  	u32 timeout;
  	u32 usec_delay;
-diff -urNp linux-3.0.9/drivers/net/igbvf/vf.h linux-3.0.9/drivers/net/igbvf/vf.h
---- linux-3.0.9/drivers/net/igbvf/vf.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/igbvf/vf.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/igbvf/vf.h linux-3.1.1/drivers/net/igbvf/vf.h
+--- linux-3.1.1/drivers/net/igbvf/vf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/igbvf/vf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -189,9 +189,10 @@ struct e1000_mac_operations {
  	s32  (*read_mac_addr)(struct e1000_hw *);
  	s32  (*set_vfta)(struct e1000_hw *, u16, bool);
@@ -31468,9 +31452,9 @@ diff -urNp linux-3.0.9/drivers/net/igbvf/vf.h linux-3.0.9/drivers/net/igbvf/vf.h
  	struct e1000_mbx_stats stats;
  	u32 timeout;
  	u32 usec_delay;
-diff -urNp linux-3.0.9/drivers/net/ixgb/ixgb_main.c linux-3.0.9/drivers/net/ixgb/ixgb_main.c
---- linux-3.0.9/drivers/net/ixgb/ixgb_main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/ixgb/ixgb_main.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/ixgb/ixgb_main.c linux-3.1.1/drivers/net/ixgb/ixgb_main.c
+--- linux-3.1.1/drivers/net/ixgb/ixgb_main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/ixgb/ixgb_main.c	2011-11-16 18:40:22.000000000 -0500
 @@ -1070,6 +1070,8 @@ ixgb_set_multi(struct net_device *netdev
  	u32 rctl;
  	int i;
@@ -31480,9 +31464,9 @@ diff -urNp linux-3.0.9/drivers/net/ixgb/ixgb_main.c linux-3.0.9/drivers/net/ixgb
  	/* Check for Promiscuous and All Multicast modes */
  
  	rctl = IXGB_READ_REG(hw, RCTL);
-diff -urNp linux-3.0.9/drivers/net/ixgb/ixgb_param.c linux-3.0.9/drivers/net/ixgb/ixgb_param.c
---- linux-3.0.9/drivers/net/ixgb/ixgb_param.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/ixgb/ixgb_param.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/ixgb/ixgb_param.c linux-3.1.1/drivers/net/ixgb/ixgb_param.c
+--- linux-3.1.1/drivers/net/ixgb/ixgb_param.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/ixgb/ixgb_param.c	2011-11-16 18:40:22.000000000 -0500
 @@ -261,6 +261,9 @@ void __devinit
  ixgb_check_options(struct ixgb_adapter *adapter)
  {
@@ -31493,10 +31477,10 @@ diff -urNp linux-3.0.9/drivers/net/ixgb/ixgb_param.c linux-3.0.9/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.9/drivers/net/ixgbe/ixgbe_type.h linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h
---- linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h	2011-11-15 20:02:59.000000000 -0500
-@@ -2584,6 +2584,7 @@ struct ixgbe_eeprom_operations {
+diff -urNp linux-3.1.1/drivers/net/ixgbe/ixgbe_type.h linux-3.1.1/drivers/net/ixgbe/ixgbe_type.h
+--- linux-3.1.1/drivers/net/ixgbe/ixgbe_type.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/ixgbe/ixgbe_type.h	2011-11-16 18:39:07.000000000 -0500
+@@ -2642,6 +2642,7 @@ struct ixgbe_eeprom_operations {
  	s32 (*update_checksum)(struct ixgbe_hw *);
  	u16 (*calc_checksum)(struct ixgbe_hw *);
  };
@@ -31504,15 +31488,15 @@ diff -urNp linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h linux-3.0.9/drivers/net/ix
  
  struct ixgbe_mac_operations {
  	s32 (*init_hw)(struct ixgbe_hw *);
-@@ -2639,6 +2640,7 @@ struct ixgbe_mac_operations {
- 	/* Flow Control */
- 	s32 (*fc_enable)(struct ixgbe_hw *, s32);
+@@ -2703,6 +2704,7 @@ struct ixgbe_mac_operations {
+ 	/* Manageability interface */
+ 	s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
  };
 +typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
  
  struct ixgbe_phy_operations {
  	s32 (*identify)(struct ixgbe_hw *);
-@@ -2658,9 +2660,10 @@ struct ixgbe_phy_operations {
+@@ -2722,9 +2724,10 @@ struct ixgbe_phy_operations {
  	s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
  	s32 (*check_overtemp)(struct ixgbe_hw *);
  };
@@ -31524,7 +31508,7 @@ diff -urNp linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h linux-3.0.9/drivers/net/ix
  	enum ixgbe_eeprom_type          type;
  	u32                             semaphore_delay;
  	u16                             word_size;
-@@ -2670,7 +2673,7 @@ struct ixgbe_eeprom_info {
+@@ -2734,7 +2737,7 @@ struct ixgbe_eeprom_info {
  
  #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED	0x01
  struct ixgbe_mac_info {
@@ -31533,7 +31517,7 @@ diff -urNp linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h linux-3.0.9/drivers/net/ix
  	enum ixgbe_mac_type             type;
  	u8                              addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
  	u8                              perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
-@@ -2698,7 +2701,7 @@ struct ixgbe_mac_info {
+@@ -2762,7 +2765,7 @@ struct ixgbe_mac_info {
  };
  
  struct ixgbe_phy_info {
@@ -31542,7 +31526,7 @@ diff -urNp linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h linux-3.0.9/drivers/net/ix
  	struct mdio_if_info		mdio;
  	enum ixgbe_phy_type             type;
  	u32                             id;
-@@ -2726,6 +2729,7 @@ struct ixgbe_mbx_operations {
+@@ -2790,6 +2793,7 @@ struct ixgbe_mbx_operations {
  	s32 (*check_for_ack)(struct ixgbe_hw *, u16);
  	s32 (*check_for_rst)(struct ixgbe_hw *, u16);
  };
@@ -31550,7 +31534,7 @@ diff -urNp linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h linux-3.0.9/drivers/net/ix
  
  struct ixgbe_mbx_stats {
  	u32 msgs_tx;
-@@ -2737,7 +2741,7 @@ struct ixgbe_mbx_stats {
+@@ -2801,7 +2805,7 @@ struct ixgbe_mbx_stats {
  };
  
  struct ixgbe_mbx_info {
@@ -31559,9 +31543,9 @@ diff -urNp linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h linux-3.0.9/drivers/net/ix
  	struct ixgbe_mbx_stats stats;
  	u32 timeout;
  	u32 usec_delay;
-diff -urNp linux-3.0.9/drivers/net/ixgbevf/vf.h linux-3.0.9/drivers/net/ixgbevf/vf.h
---- linux-3.0.9/drivers/net/ixgbevf/vf.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/ixgbevf/vf.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/ixgbevf/vf.h linux-3.1.1/drivers/net/ixgbevf/vf.h
+--- linux-3.1.1/drivers/net/ixgbevf/vf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/ixgbevf/vf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
  	s32 (*clear_vfta)(struct ixgbe_hw *);
  	s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
@@ -31596,10 +31580,10 @@ diff -urNp linux-3.0.9/drivers/net/ixgbevf/vf.h linux-3.0.9/drivers/net/ixgbevf/
  	struct ixgbe_mbx_stats stats;
  	u32 timeout;
  	u32 udelay;
-diff -urNp linux-3.0.9/drivers/net/ksz884x.c linux-3.0.9/drivers/net/ksz884x.c
---- linux-3.0.9/drivers/net/ksz884x.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/ksz884x.c	2011-11-15 20:02:59.000000000 -0500
-@@ -6534,6 +6534,8 @@ static void netdev_get_ethtool_stats(str
+diff -urNp linux-3.1.1/drivers/net/ksz884x.c linux-3.1.1/drivers/net/ksz884x.c
+--- linux-3.1.1/drivers/net/ksz884x.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/ksz884x.c	2011-11-16 18:40:22.000000000 -0500
+@@ -6533,6 +6533,8 @@ static void netdev_get_ethtool_stats(str
  	int rc;
  	u64 counter[TOTAL_PORT_COUNTER_NUM];
  
@@ -31608,9 +31592,9 @@ diff -urNp linux-3.0.9/drivers/net/ksz884x.c linux-3.0.9/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.9/drivers/net/mlx4/main.c linux-3.0.9/drivers/net/mlx4/main.c
---- linux-3.0.9/drivers/net/mlx4/main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/mlx4/main.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/mlx4/main.c linux-3.1.1/drivers/net/mlx4/main.c
+--- linux-3.1.1/drivers/net/mlx4/main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/mlx4/main.c	2011-11-16 18:40:22.000000000 -0500
 @@ -40,6 +40,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/slab.h>
@@ -31619,7 +31603,7 @@ diff -urNp linux-3.0.9/drivers/net/mlx4/main.c linux-3.0.9/drivers/net/mlx4/main
  
  #include <linux/mlx4/device.h>
  #include <linux/mlx4/doorbell.h>
-@@ -764,6 +765,8 @@ static int mlx4_init_hca(struct mlx4_dev
+@@ -762,6 +763,8 @@ static int mlx4_init_hca(struct mlx4_dev
  	u64 icm_size;
  	int err;
  
@@ -31628,10 +31612,10 @@ diff -urNp linux-3.0.9/drivers/net/mlx4/main.c linux-3.0.9/drivers/net/mlx4/main
  	err = mlx4_QUERY_FW(dev);
  	if (err) {
  		if (err == -EACCES)
-diff -urNp linux-3.0.9/drivers/net/niu.c linux-3.0.9/drivers/net/niu.c
---- linux-3.0.9/drivers/net/niu.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/niu.c	2011-11-15 20:02:59.000000000 -0500
-@@ -9056,6 +9056,8 @@ static void __devinit niu_try_msix(struc
+diff -urNp linux-3.1.1/drivers/net/niu.c linux-3.1.1/drivers/net/niu.c
+--- linux-3.1.1/drivers/net/niu.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/niu.c	2011-11-16 18:40:22.000000000 -0500
+@@ -9061,6 +9061,8 @@ static void __devinit niu_try_msix(struc
  	int i, num_irqs, err;
  	u8 first_ldg;
  
@@ -31640,18 +31624,9 @@ diff -urNp linux-3.0.9/drivers/net/niu.c linux-3.0.9/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.9/drivers/net/pcnet32.c linux-3.0.9/drivers/net/pcnet32.c
---- linux-3.0.9/drivers/net/pcnet32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/pcnet32.c	2011-11-15 20:02:59.000000000 -0500
-@@ -82,7 +82,7 @@ static int cards_found;
- /*
-  * VLB I/O addresses
-  */
--static unsigned int pcnet32_portlist[] __initdata =
-+static unsigned int pcnet32_portlist[] __devinitdata =
-     { 0x300, 0x320, 0x340, 0x360, 0 };
- 
- static int pcnet32_debug;
+diff -urNp linux-3.1.1/drivers/net/pcnet32.c linux-3.1.1/drivers/net/pcnet32.c
+--- linux-3.1.1/drivers/net/pcnet32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/pcnet32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -270,7 +270,7 @@ struct pcnet32_private {
  	struct sk_buff		**rx_skbuff;
  	dma_addr_t		*tx_dma_addr;
@@ -32159,7 +32134,7 @@ diff -urNp linux-3.0.9/drivers/net/pcnet32.c linux-3.0.9/drivers/net/pcnet32.c
  	spin_unlock_irqrestore(&lp->lock, flags);
  
  	return &dev->stats;
-@@ -2578,10 +2578,10 @@ static void pcnet32_load_multicast(struc
+@@ -2577,10 +2577,10 @@ static void pcnet32_load_multicast(struc
  	if (dev->flags & IFF_ALLMULTI) {
  		ib->filter[0] = cpu_to_le32(~0U);
  		ib->filter[1] = cpu_to_le32(~0U);
@@ -32174,7 +32149,7 @@ diff -urNp linux-3.0.9/drivers/net/pcnet32.c linux-3.0.9/drivers/net/pcnet32.c
  		return;
  	}
  	/* clear the multicast filter */
-@@ -2601,7 +2601,7 @@ static void pcnet32_load_multicast(struc
+@@ -2594,7 +2594,7 @@ static void pcnet32_load_multicast(struc
  		mcast_table[crc >> 4] |= cpu_to_le16(1 << (crc & 0xf));
  	}
  	for (i = 0; i < 4; i++)
@@ -32183,7 +32158,7 @@ diff -urNp linux-3.0.9/drivers/net/pcnet32.c linux-3.0.9/drivers/net/pcnet32.c
  				le16_to_cpu(mcast_table[i]));
  }
  
-@@ -2616,28 +2616,28 @@ static void pcnet32_set_multicast_list(s
+@@ -2609,28 +2609,28 @@ static void pcnet32_set_multicast_list(s
  
  	spin_lock_irqsave(&lp->lock, flags);
  	suspended = pcnet32_suspend(dev, &flags, 0);
@@ -32218,7 +32193,7 @@ diff -urNp linux-3.0.9/drivers/net/pcnet32.c linux-3.0.9/drivers/net/pcnet32.c
  		pcnet32_restart(dev, CSR0_NORMAL);
  		netif_wake_queue(dev);
  	}
-@@ -2655,8 +2655,8 @@ static int mdio_read(struct net_device *
+@@ -2648,8 +2648,8 @@ static int mdio_read(struct net_device *
  	if (!lp->mii)
  		return 0;
  
@@ -32229,7 +32204,7 @@ diff -urNp linux-3.0.9/drivers/net/pcnet32.c linux-3.0.9/drivers/net/pcnet32.c
  
  	return val_out;
  }
-@@ -2670,8 +2670,8 @@ static void mdio_write(struct net_device
+@@ -2663,8 +2663,8 @@ static void mdio_write(struct net_device
  	if (!lp->mii)
  		return;
  
@@ -32240,7 +32215,7 @@ diff -urNp linux-3.0.9/drivers/net/pcnet32.c linux-3.0.9/drivers/net/pcnet32.c
  }
  
  static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-@@ -2748,7 +2748,7 @@ static void pcnet32_check_media(struct n
+@@ -2741,7 +2741,7 @@ static void pcnet32_check_media(struct n
  		curr_link = mii_link_ok(&lp->mii_if);
  	} else {
  		ulong ioaddr = dev->base_addr;	/* card base I/O address */
@@ -32249,7 +32224,7 @@ diff -urNp linux-3.0.9/drivers/net/pcnet32.c linux-3.0.9/drivers/net/pcnet32.c
  	}
  	if (!curr_link) {
  		if (prev_link || verbose) {
-@@ -2771,13 +2771,13 @@ static void pcnet32_check_media(struct n
+@@ -2764,13 +2764,13 @@ static void pcnet32_check_media(struct n
  					    (ecmd.duplex == DUPLEX_FULL)
  					    ? "full" : "half");
  			}
@@ -32265,9 +32240,9 @@ diff -urNp linux-3.0.9/drivers/net/pcnet32.c linux-3.0.9/drivers/net/pcnet32.c
  			}
  		} else {
  			netif_info(lp, link, dev, "link up\n");
-diff -urNp linux-3.0.9/drivers/net/ppp_generic.c linux-3.0.9/drivers/net/ppp_generic.c
---- linux-3.0.9/drivers/net/ppp_generic.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/ppp_generic.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/ppp_generic.c linux-3.1.1/drivers/net/ppp_generic.c
+--- linux-3.1.1/drivers/net/ppp_generic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/ppp_generic.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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;
@@ -32286,10 +32261,10 @@ diff -urNp linux-3.0.9/drivers/net/ppp_generic.c linux-3.0.9/drivers/net/ppp_gen
  			break;
  		err = 0;
  		break;
-diff -urNp linux-3.0.9/drivers/net/r8169.c linux-3.0.9/drivers/net/r8169.c
---- linux-3.0.9/drivers/net/r8169.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/r8169.c	2011-11-15 20:02:59.000000000 -0500
-@@ -645,12 +645,12 @@ struct rtl8169_private {
+diff -urNp linux-3.1.1/drivers/net/r8169.c linux-3.1.1/drivers/net/r8169.c
+--- linux-3.1.1/drivers/net/r8169.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/r8169.c	2011-11-16 18:39:07.000000000 -0500
+@@ -663,12 +663,12 @@ struct rtl8169_private {
  	struct mdio_ops {
  		void (*write)(void __iomem *, int, int);
  		int (*read)(void __iomem *, int);
@@ -32304,10 +32279,10 @@ diff -urNp linux-3.0.9/drivers/net/r8169.c linux-3.0.9/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.9/drivers/net/sis190.c linux-3.0.9/drivers/net/sis190.c
---- linux-3.0.9/drivers/net/sis190.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/sis190.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1623,7 +1623,7 @@ static int __devinit sis190_get_mac_addr
+diff -urNp linux-3.1.1/drivers/net/sis190.c linux-3.1.1/drivers/net/sis190.c
+--- linux-3.1.1/drivers/net/sis190.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/sis190.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1624,7 +1624,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)
  {
@@ -32316,9 +32291,9 @@ diff -urNp linux-3.0.9/drivers/net/sis190.c linux-3.0.9/drivers/net/sis190.c
  	struct sis190_private *tp = netdev_priv(dev);
  	struct pci_dev *isa_bridge;
  	u8 reg, tmp8;
-diff -urNp linux-3.0.9/drivers/net/sundance.c linux-3.0.9/drivers/net/sundance.c
---- linux-3.0.9/drivers/net/sundance.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/sundance.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/sundance.c linux-3.1.1/drivers/net/sundance.c
+--- linux-3.1.1/drivers/net/sundance.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/sundance.c	2011-11-16 18:39:07.000000000 -0500
 @@ -218,7 +218,7 @@ enum {
  struct pci_id_info {
          const char *name;
@@ -32328,9 +32303,9 @@ diff -urNp linux-3.0.9/drivers/net/sundance.c linux-3.0.9/drivers/net/sundance.c
  	{"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.9/drivers/net/tg3.h linux-3.0.9/drivers/net/tg3.h
---- linux-3.0.9/drivers/net/tg3.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tg3.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/tg3.h linux-3.1.1/drivers/net/tg3.h
+--- linux-3.1.1/drivers/net/tg3.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tg3.h	2011-11-16 18:39:07.000000000 -0500
 @@ -134,6 +134,7 @@
  #define  CHIPREV_ID_5750_A0		 0x4000
  #define  CHIPREV_ID_5750_A1		 0x4001
@@ -32339,9 +32314,9 @@ diff -urNp linux-3.0.9/drivers/net/tg3.h linux-3.0.9/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.9/drivers/net/tokenring/abyss.c linux-3.0.9/drivers/net/tokenring/abyss.c
---- linux-3.0.9/drivers/net/tokenring/abyss.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tokenring/abyss.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/tokenring/abyss.c linux-3.1.1/drivers/net/tokenring/abyss.c
+--- linux-3.1.1/drivers/net/tokenring/abyss.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tokenring/abyss.c	2011-11-16 18:39:07.000000000 -0500
 @@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = 
  
  static int __init abyss_init (void)
@@ -32358,9 +32333,9 @@ diff -urNp linux-3.0.9/drivers/net/tokenring/abyss.c linux-3.0.9/drivers/net/tok
  
  	return pci_register_driver(&abyss_driver);
  }
-diff -urNp linux-3.0.9/drivers/net/tokenring/madgemc.c linux-3.0.9/drivers/net/tokenring/madgemc.c
---- linux-3.0.9/drivers/net/tokenring/madgemc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tokenring/madgemc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/tokenring/madgemc.c linux-3.1.1/drivers/net/tokenring/madgemc.c
+--- linux-3.1.1/drivers/net/tokenring/madgemc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tokenring/madgemc.c	2011-11-16 18:39:07.000000000 -0500
 @@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver 
  
  static int __init madgemc_init (void)
@@ -32376,9 +32351,9 @@ diff -urNp linux-3.0.9/drivers/net/tokenring/madgemc.c linux-3.0.9/drivers/net/t
  
  	return mca_register_driver (&madgemc_driver);
  }
-diff -urNp linux-3.0.9/drivers/net/tokenring/proteon.c linux-3.0.9/drivers/net/tokenring/proteon.c
---- linux-3.0.9/drivers/net/tokenring/proteon.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tokenring/proteon.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/tokenring/proteon.c linux-3.1.1/drivers/net/tokenring/proteon.c
+--- linux-3.1.1/drivers/net/tokenring/proteon.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tokenring/proteon.c	2011-11-16 18:39:07.000000000 -0500
 @@ -353,9 +353,11 @@ static int __init proteon_init(void)
  	struct platform_device *pdev;
  	int i, num = 0, err = 0;
@@ -32394,9 +32369,9 @@ diff -urNp linux-3.0.9/drivers/net/tokenring/proteon.c linux-3.0.9/drivers/net/t
  
  	err = platform_driver_register(&proteon_driver);
  	if (err)
-diff -urNp linux-3.0.9/drivers/net/tokenring/skisa.c linux-3.0.9/drivers/net/tokenring/skisa.c
---- linux-3.0.9/drivers/net/tokenring/skisa.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tokenring/skisa.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/tokenring/skisa.c linux-3.1.1/drivers/net/tokenring/skisa.c
+--- linux-3.1.1/drivers/net/tokenring/skisa.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tokenring/skisa.c	2011-11-16 18:39:07.000000000 -0500
 @@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
  	struct platform_device *pdev;
  	int i, num = 0, err = 0;
@@ -32412,10 +32387,10 @@ diff -urNp linux-3.0.9/drivers/net/tokenring/skisa.c linux-3.0.9/drivers/net/tok
  
  	err = platform_driver_register(&sk_isa_driver);
  	if (err)
-diff -urNp linux-3.0.9/drivers/net/tulip/de2104x.c linux-3.0.9/drivers/net/tulip/de2104x.c
---- linux-3.0.9/drivers/net/tulip/de2104x.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tulip/de2104x.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1794,6 +1794,8 @@ static void __devinit de21041_get_srom_i
+diff -urNp linux-3.1.1/drivers/net/tulip/de2104x.c linux-3.1.1/drivers/net/tulip/de2104x.c
+--- linux-3.1.1/drivers/net/tulip/de2104x.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tulip/de2104x.c	2011-11-16 18:40:22.000000000 -0500
+@@ -1795,6 +1795,8 @@ static void __devinit de21041_get_srom_i
  	struct de_srom_info_leaf *il;
  	void *bufp;
  
@@ -32424,10 +32399,10 @@ diff -urNp linux-3.0.9/drivers/net/tulip/de2104x.c linux-3.0.9/drivers/net/tulip
  	/* download entire eeprom */
  	for (i = 0; i < DE_EEPROM_WORDS; i++)
  		((__le16 *)ee_data)[i] =
-diff -urNp linux-3.0.9/drivers/net/tulip/de4x5.c linux-3.0.9/drivers/net/tulip/de4x5.c
---- linux-3.0.9/drivers/net/tulip/de4x5.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tulip/de4x5.c	2011-11-15 20:02:59.000000000 -0500
-@@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
+diff -urNp linux-3.1.1/drivers/net/tulip/de4x5.c linux-3.1.1/drivers/net/tulip/de4x5.c
+--- linux-3.1.1/drivers/net/tulip/de4x5.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tulip/de4x5.c	2011-11-16 18:39:07.000000000 -0500
+@@ -5397,7 +5397,7 @@ de4x5_ioctl(struct net_device *dev, stru
  	for (i=0; i<ETH_ALEN; i++) {
  	    tmp.addr[i] = dev->dev_addr[i];
  	}
@@ -32436,7 +32411,7 @@ diff -urNp linux-3.0.9/drivers/net/tulip/de4x5.c linux-3.0.9/drivers/net/tulip/d
  	break;
  
      case DE4X5_SET_HWADDR:           /* Set the hardware address */
-@@ -5441,7 +5441,7 @@ de4x5_ioctl(struct net_device *dev, stru
+@@ -5437,7 +5437,7 @@ de4x5_ioctl(struct net_device *dev, stru
  	spin_lock_irqsave(&lp->lock, flags);
  	memcpy(&statbuf, &lp->pktStats, ioc->len);
  	spin_unlock_irqrestore(&lp->lock, flags);
@@ -32445,9 +32420,9 @@ diff -urNp linux-3.0.9/drivers/net/tulip/de4x5.c linux-3.0.9/drivers/net/tulip/d
  		return -EFAULT;
  	break;
      }
-diff -urNp linux-3.0.9/drivers/net/tulip/eeprom.c linux-3.0.9/drivers/net/tulip/eeprom.c
---- linux-3.0.9/drivers/net/tulip/eeprom.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tulip/eeprom.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/tulip/eeprom.c linux-3.1.1/drivers/net/tulip/eeprom.c
+--- linux-3.1.1/drivers/net/tulip/eeprom.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tulip/eeprom.c	2011-11-16 18:39:07.000000000 -0500
 @@ -81,7 +81,7 @@ static struct eeprom_fixup eeprom_fixups
    {NULL}};
  
@@ -32457,9 +32432,9 @@ diff -urNp linux-3.0.9/drivers/net/tulip/eeprom.c linux-3.0.9/drivers/net/tulip/
  	"21140 non-MII",
  	"21140 MII PHY",
  	"21142 Serial PHY",
-diff -urNp linux-3.0.9/drivers/net/tulip/winbond-840.c linux-3.0.9/drivers/net/tulip/winbond-840.c
---- linux-3.0.9/drivers/net/tulip/winbond-840.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tulip/winbond-840.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/tulip/winbond-840.c linux-3.1.1/drivers/net/tulip/winbond-840.c
+--- linux-3.1.1/drivers/net/tulip/winbond-840.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tulip/winbond-840.c	2011-11-16 18:39:07.000000000 -0500
 @@ -236,7 +236,7 @@ struct pci_id_info {
          int drv_flags;		/* Driver use, intended as capability flags. */
  };
@@ -32469,9 +32444,9 @@ diff -urNp linux-3.0.9/drivers/net/tulip/winbond-840.c linux-3.0.9/drivers/net/t
  	{ 				/* Sometime a Level-One switch card. */
  	  "Winbond W89c840",	CanHaveMII | HasBrokenTx | FDXOnNoMII},
  	{ "Winbond W89c840",	CanHaveMII | HasBrokenTx},
-diff -urNp linux-3.0.9/drivers/net/usb/hso.c linux-3.0.9/drivers/net/usb/hso.c
---- linux-3.0.9/drivers/net/usb/hso.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/usb/hso.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/usb/hso.c linux-3.1.1/drivers/net/usb/hso.c
+--- linux-3.1.1/drivers/net/usb/hso.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/usb/hso.c	2011-11-16 18:39:07.000000000 -0500
 @@ -71,7 +71,7 @@
  #include <asm/byteorder.h>
  #include <linux/serial_core.h>
@@ -32568,10 +32543,10 @@ diff -urNp linux-3.0.9/drivers/net/usb/hso.c linux-3.0.9/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.9/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c
---- linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-11-15 20:02:59.000000000 -0500
-@@ -594,8 +594,7 @@ vmxnet3_set_rss_indir(struct net_device 
+diff -urNp linux-3.1.1/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.1.1/drivers/net/vmxnet3/vmxnet3_ethtool.c
+--- linux-3.1.1/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-11-16 18:39:07.000000000 -0500
+@@ -601,8 +601,7 @@ vmxnet3_set_rss_indir(struct net_device 
  		 * Return with error code if any of the queue indices
  		 * is out of range
  		 */
@@ -32581,10 +32556,10 @@ diff -urNp linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.9/drivers
  			return -EINVAL;
  	}
  
-diff -urNp linux-3.0.9/drivers/net/vxge/vxge-config.h linux-3.0.9/drivers/net/vxge/vxge-config.h
---- linux-3.0.9/drivers/net/vxge/vxge-config.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/vxge/vxge-config.h	2011-11-15 20:02:59.000000000 -0500
-@@ -512,7 +512,7 @@ struct vxge_hw_uld_cbs {
+diff -urNp linux-3.1.1/drivers/net/vxge/vxge-config.h linux-3.1.1/drivers/net/vxge/vxge-config.h
+--- linux-3.1.1/drivers/net/vxge/vxge-config.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/vxge/vxge-config.h	2011-11-16 18:39:07.000000000 -0500
+@@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
  	void (*link_down)(struct __vxge_hw_device *devh);
  	void (*crit_err)(struct __vxge_hw_device *devh,
  			enum vxge_hw_event type, u64 ext_data);
@@ -32593,10 +32568,10 @@ diff -urNp linux-3.0.9/drivers/net/vxge/vxge-config.h linux-3.0.9/drivers/net/vx
  
  /*
   * struct __vxge_hw_blockpool_entry - Block private data structure
-diff -urNp linux-3.0.9/drivers/net/vxge/vxge-main.c linux-3.0.9/drivers/net/vxge/vxge-main.c
---- linux-3.0.9/drivers/net/vxge/vxge-main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/vxge/vxge-main.c	2011-11-15 20:02:59.000000000 -0500
-@@ -98,6 +98,8 @@ static inline void VXGE_COMPLETE_VPATH_T
+diff -urNp linux-3.1.1/drivers/net/vxge/vxge-main.c linux-3.1.1/drivers/net/vxge/vxge-main.c
+--- linux-3.1.1/drivers/net/vxge/vxge-main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/vxge/vxge-main.c	2011-11-16 18:40:22.000000000 -0500
+@@ -100,6 +100,8 @@ static inline void VXGE_COMPLETE_VPATH_T
  	struct sk_buff *completed[NR_SKB_COMPLETED];
  	int more;
  
@@ -32605,7 +32580,7 @@ diff -urNp linux-3.0.9/drivers/net/vxge/vxge-main.c linux-3.0.9/drivers/net/vxge
  	do {
  		more = 0;
  		skb_ptr = completed;
-@@ -1920,6 +1922,8 @@ static enum vxge_hw_status vxge_rth_conf
+@@ -1915,6 +1917,8 @@ static enum vxge_hw_status vxge_rth_conf
  	u8 mtable[256] = {0}; /* CPU to vpath mapping  */
  	int index;
  
@@ -32614,9 +32589,9 @@ diff -urNp linux-3.0.9/drivers/net/vxge/vxge-main.c linux-3.0.9/drivers/net/vxge
  	/*
  	 * Filling
  	 * 	- itable with bucket numbers
-diff -urNp linux-3.0.9/drivers/net/vxge/vxge-traffic.h linux-3.0.9/drivers/net/vxge/vxge-traffic.h
---- linux-3.0.9/drivers/net/vxge/vxge-traffic.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/vxge/vxge-traffic.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/vxge/vxge-traffic.h linux-3.1.1/drivers/net/vxge/vxge-traffic.h
+--- linux-3.1.1/drivers/net/vxge/vxge-traffic.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/vxge/vxge-traffic.h	2011-11-16 18:39:07.000000000 -0500
 @@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
  			struct vxge_hw_mempool_dma	*dma_object,
  			u32			index,
@@ -32626,22 +32601,10 @@ diff -urNp linux-3.0.9/drivers/net/vxge/vxge-traffic.h linux-3.0.9/drivers/net/v
  
  #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath)				\
  		((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
-diff -urNp linux-3.0.9/drivers/net/wan/cycx_x25.c linux-3.0.9/drivers/net/wan/cycx_x25.c
---- linux-3.0.9/drivers/net/wan/cycx_x25.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wan/cycx_x25.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned
- 	unsigned char hex[1024],
- 	    	* phex = hex;
- 
-+	pax_track_stack();
-+
- 	if (len >= (sizeof(hex) / 2))
- 		len = (sizeof(hex) / 2) - 1;
- 
-diff -urNp linux-3.0.9/drivers/net/wan/hdlc_x25.c linux-3.0.9/drivers/net/wan/hdlc_x25.c
---- linux-3.0.9/drivers/net/wan/hdlc_x25.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wan/hdlc_x25.c	2011-11-15 20:02:59.000000000 -0500
-@@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
+diff -urNp linux-3.1.1/drivers/net/wan/hdlc_x25.c linux-3.1.1/drivers/net/wan/hdlc_x25.c
+--- linux-3.1.1/drivers/net/wan/hdlc_x25.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wan/hdlc_x25.c	2011-11-16 18:39:07.000000000 -0500
+@@ -134,16 +134,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
  
  static int x25_open(struct net_device *dev)
  {
@@ -32666,9 +32629,9 @@ diff -urNp linux-3.0.9/drivers/net/wan/hdlc_x25.c linux-3.0.9/drivers/net/wan/hd
  	result = lapb_register(dev, &cb);
  	if (result != LAPB_OK)
  		return result;
-diff -urNp linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c
---- linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/wimax/i2400m/usb-fw.c linux-3.1.1/drivers/net/wimax/i2400m/usb-fw.c
+--- linux-3.1.1/drivers/net/wimax/i2400m/usb-fw.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wimax/i2400m/usb-fw.c	2011-11-16 18:40:22.000000000 -0500
 @@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
  	int do_autopm = 1;
  	DECLARE_COMPLETION_ONSTACK(notif_completion);
@@ -32678,9 +32641,9 @@ diff -urNp linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.9/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.9/drivers/net/wireless/airo.c linux-3.0.9/drivers/net/wireless/airo.c
---- linux-3.0.9/drivers/net/wireless/airo.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/airo.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/wireless/airo.c linux-3.1.1/drivers/net/wireless/airo.c
+--- linux-3.1.1/drivers/net/wireless/airo.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/airo.c	2011-11-16 18:40:22.000000000 -0500
 @@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s
  	BSSListElement * loop_net;
  	BSSListElement * tmp_net;
@@ -32735,75 +32698,66 @@ diff -urNp linux-3.0.9/drivers/net/wireless/airo.c linux-3.0.9/drivers/net/wirel
  	/* Get stats out of the card */
  	clear_bit(JOB_WSTATS, &local->jobs);
  	if (local->power.event) {
-diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c
---- linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c	2011-11-15 20:02:59.000000000 -0500
-@@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath5k/debug.c linux-3.1.1/drivers/net/wireless/ath/ath5k/debug.c
+--- linux-3.1.1/drivers/net/wireless/ath/ath5k/debug.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath5k/debug.c	2011-11-16 19:08:21.000000000 -0500
+@@ -203,6 +203,8 @@ static ssize_t read_file_beacon(struct f
  	unsigned int v;
  	u64 tsf;
  
 +	pax_track_stack();
 +
- 	v = ath5k_hw_reg_read(sc->ah, AR5K_BEACON);
- 	len += snprintf(buf+len, sizeof(buf)-len,
+ 	v = ath5k_hw_reg_read(ah, AR5K_BEACON);
+ 	len += snprintf(buf + len, sizeof(buf) - len,
  		"%-24s0x%08x\tintval: %d\tTIM: 0x%x\n",
-@@ -323,6 +325,8 @@ static ssize_t read_file_debug(struct fi
+@@ -321,6 +323,8 @@ static ssize_t read_file_debug(struct fi
  	unsigned int len = 0;
  	unsigned int i;
  
 +	pax_track_stack();
 +
- 	len += snprintf(buf+len, sizeof(buf)-len,
- 		"DEBUG LEVEL: 0x%08x\n\n", sc->debug.level);
- 
-@@ -384,6 +388,8 @@ static ssize_t read_file_antenna(struct 
- 	unsigned int i;
- 	unsigned int v;
+ 	len += snprintf(buf + len, sizeof(buf) - len,
+ 		"DEBUG LEVEL: 0x%08x\n\n", ah->debug.level);
  
-+	pax_track_stack();
-+
- 	len += snprintf(buf+len, sizeof(buf)-len, "antenna mode\t%d\n",
- 		sc->ah->ah_ant_mode);
- 	len += snprintf(buf+len, sizeof(buf)-len, "default antenna\t%d\n",
-@@ -494,6 +500,8 @@ static ssize_t read_file_misc(struct fil
+@@ -492,6 +496,8 @@ static ssize_t read_file_misc(struct fil
  	unsigned int len = 0;
- 	u32 filt = ath5k_hw_get_rx_filter(sc->ah);
+ 	u32 filt = ath5k_hw_get_rx_filter(ah);
  
 +	pax_track_stack();
 +
- 	len += snprintf(buf+len, sizeof(buf)-len, "bssid-mask: %pM\n",
- 			sc->bssidmask);
- 	len += snprintf(buf+len, sizeof(buf)-len, "filter-flags: 0x%x ",
-@@ -550,6 +558,8 @@ static ssize_t read_file_frameerrors(str
+ 	len += snprintf(buf + len, sizeof(buf) - len, "bssid-mask: %pM\n",
+ 			ah->bssidmask);
+ 	len += snprintf(buf + len, sizeof(buf) - len, "filter-flags: 0x%x ",
+@@ -548,6 +554,8 @@ static ssize_t read_file_frameerrors(str
  	unsigned int len = 0;
  	int i;
  
 +	pax_track_stack();
 +
- 	len += snprintf(buf+len, sizeof(buf)-len,
+ 	len += snprintf(buf + len, sizeof(buf) - len,
  			"RX\n---------------------\n");
- 	len += snprintf(buf+len, sizeof(buf)-len, "CRC\t%u\t(%u%%)\n",
-@@ -667,6 +677,8 @@ static ssize_t read_file_ani(struct file
+ 	len += snprintf(buf + len, sizeof(buf) - len, "CRC\t%u\t(%u%%)\n",
+@@ -665,6 +673,8 @@ static ssize_t read_file_ani(struct file
  	char buf[700];
  	unsigned int len = 0;
  
 +	pax_track_stack();
 +
- 	len += snprintf(buf+len, sizeof(buf)-len,
+ 	len += snprintf(buf + len, sizeof(buf) - len,
  			"HW has PHY error counters:\t%s\n",
- 			sc->ah->ah_capabilities.cap_has_phyerr_counters ?
-@@ -827,6 +839,8 @@ static ssize_t read_file_queue(struct fi
+ 			ah->ah_capabilities.cap_has_phyerr_counters ?
+@@ -829,6 +839,8 @@ static ssize_t read_file_queue(struct fi
  	struct ath5k_buf *bf, *bf0;
  	int i, n;
  
 +	pax_track_stack();
 +
- 	len += snprintf(buf+len, sizeof(buf)-len,
- 			"available txbuffers: %d\n", sc->txbuf_len);
+ 	len += snprintf(buf + len, sizeof(buf) - len,
+ 			"available txbuffers: %d\n", ah->txbuf_len);
  
-diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c
---- linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+--- linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-11-16 18:40:22.000000000 -0500
 @@ -758,6 +758,8 @@ static void ar9003_hw_tx_iq_cal_post_pro
  	int i, im, j;
  	int nmeasurement;
@@ -32813,10 +32767,10 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.9
  	for (i = 0; i < AR9300_MAX_CHAINS; i++) {
  		if (ah->txchainmask & (1 << i))
  			num_chains++;
-diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
---- linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-11-15 20:02:59.000000000 -0500
-@@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L,
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+--- linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-11-16 18:40:22.000000000 -0500
+@@ -406,6 +406,8 @@ static bool create_pa_curve(u32 *data_L,
  	int theta_low_bin = 0;
  	int i;
  
@@ -32825,10 +32779,10 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.9
  	/* disregard any bin that contains <= 16 samples */
  	thresh_accum_cnt = 16;
  	scale_factor = 5;
-diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c
---- linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c	2011-11-15 20:02:59.000000000 -0500
-@@ -337,6 +337,8 @@ static ssize_t read_file_interrupt(struc
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/debug.c linux-3.1.1/drivers/net/wireless/ath/ath9k/debug.c
+--- linux-3.1.1/drivers/net/wireless/ath/ath9k/debug.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath9k/debug.c	2011-11-16 18:40:22.000000000 -0500
+@@ -387,6 +387,8 @@ static ssize_t read_file_interrupt(struc
  	char buf[512];
  	unsigned int len = 0;
  
@@ -32837,7 +32791,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.9/driver
  	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
  		len += snprintf(buf + len, sizeof(buf) - len,
  			"%8s: %10u\n", "RXLP", sc->debug.stats.istats.rxlp);
-@@ -427,6 +429,8 @@ static ssize_t read_file_wiphy(struct fi
+@@ -477,6 +479,8 @@ static ssize_t read_file_wiphy(struct fi
  	u8 addr[ETH_ALEN];
  	u32 tmp;
  
@@ -32846,9 +32800,9 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.9/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.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
---- linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.1.1/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+--- linux-3.1.1/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-11-16 18:40:22.000000000 -0500
 @@ -31,6 +31,8 @@ static ssize_t read_file_tgt_int_stats(s
  	unsigned int len = 0;
  	int ret = 0;
@@ -32903,10 +32857,10 @@ diff -urNp linux-3.0.9/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.9/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h
---- linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h	2011-11-15 20:02:59.000000000 -0500
-@@ -585,7 +585,7 @@ struct ath_hw_private_ops {
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/hw.h linux-3.1.1/drivers/net/wireless/ath/ath9k/hw.h
+--- linux-3.1.1/drivers/net/wireless/ath/ath9k/hw.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath9k/hw.h	2011-11-16 18:39:07.000000000 -0500
+@@ -588,7 +588,7 @@ struct ath_hw_private_ops {
  
  	/* ANI */
  	void (*ani_cache_ini_regs)(struct ath_hw *ah);
@@ -32915,7 +32869,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.9/drivers/n
  
  /**
   * struct ath_hw_ops - callbacks used by hardware code and driver code
-@@ -637,7 +637,7 @@ struct ath_hw_ops {
+@@ -639,7 +639,7 @@ struct ath_hw_ops {
  	void (*antdiv_comb_conf_set)(struct ath_hw *ah,
  			struct ath_hw_antcomb_conf *antconf);
  
@@ -32924,7 +32878,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.9/drivers/n
  
  struct ath_nf_limits {
  	s16 max;
-@@ -650,7 +650,7 @@ struct ath_nf_limits {
+@@ -652,7 +652,7 @@ struct ath_nf_limits {
  #define AH_UNPLUGGED    0x2 /* The card has been physically removed. */
  
  struct ath_hw {
@@ -32933,9 +32887,9 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.9/drivers/n
  
  	struct ieee80211_hw *hw;
  	struct ath_common common;
-diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath.h linux-3.0.9/drivers/net/wireless/ath/ath.h
---- linux-3.0.9/drivers/net/wireless/ath/ath.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath.h linux-3.1.1/drivers/net/wireless/ath/ath.h
+--- linux-3.1.1/drivers/net/wireless/ath/ath.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath.h	2011-11-16 18:39:07.000000000 -0500
 @@ -121,6 +121,7 @@ struct ath_ops {
  	void (*write_flush) (void *);
  	u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
@@ -32944,10 +32898,10 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath.h linux-3.0.9/drivers/net/wi
  
  struct ath_common;
  struct ath_bus_ops;
-diff -urNp linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c
---- linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c	2011-11-15 20:02:59.000000000 -0500
-@@ -2100,6 +2100,8 @@ static int ipw2100_set_essid(struct ipw2
+diff -urNp linux-3.1.1/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.1.1/drivers/net/wireless/ipw2x00/ipw2100.c
+--- linux-3.1.1/drivers/net/wireless/ipw2x00/ipw2100.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ipw2x00/ipw2100.c	2011-11-16 18:40:22.000000000 -0500
+@@ -2102,6 +2102,8 @@ static int ipw2100_set_essid(struct ipw2
  	int err;
  	DECLARE_SSID_BUF(ssid);
  
@@ -32956,7 +32910,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.9/driver
  	IPW_DEBUG_HC("SSID: '%s'\n", print_ssid(ssid, essid, ssid_len));
  
  	if (ssid_len)
-@@ -5449,6 +5451,8 @@ static int ipw2100_set_key(struct ipw210
+@@ -5451,6 +5453,8 @@ static int ipw2100_set_key(struct ipw210
  	struct ipw2100_wep_key *wep_key = (void *)cmd.host_command_parameters;
  	int err;
  
@@ -32965,9 +32919,9 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.9/driver
  	IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
  		     idx, keylen, len);
  
-diff -urNp linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c
---- linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.1.1/drivers/net/wireless/ipw2x00/libipw_rx.c
+--- linux-3.1.1/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-11-16 18:40:22.000000000 -0500
 @@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons
  	unsigned long flags;
  	DECLARE_SSID_BUF(ssid);
@@ -32977,10 +32931,10 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.9/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.9/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c
---- linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-11-15 20:02:59.000000000 -0500
-@@ -3962,7 +3962,9 @@ static int iwl3945_pci_probe(struct pci_
+diff -urNp linux-3.1.1/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.1.1/drivers/net/wireless/iwlegacy/iwl3945-base.c
+--- linux-3.1.1/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-11-16 18:39:07.000000000 -0500
+@@ -3687,7 +3687,9 @@ static int iwl3945_pci_probe(struct pci_
  	 */
  	if (iwl3945_mod_params.disable_hw_scan) {
  		IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
@@ -32991,10 +32945,10 @@ diff -urNp linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.9/
  	}
  
  	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
-diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
---- linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-11-15 20:02:59.000000000 -0500
-@@ -910,6 +910,8 @@ static void rs_tx_status(void *priv_r, s
+diff -urNp linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+--- linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-11-16 18:40:22.000000000 -0500
+@@ -920,6 +920,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;
  
@@ -33003,7 +32957,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.9/dri
  	IWL_DEBUG_RATE_LIMIT(priv, "get frame ack response, update rate scale window\n");
  
  	/* Treat uninitialized rate scaling data same as non-existing. */
-@@ -2918,6 +2920,8 @@ static void rs_fill_link_cmd(struct iwl_
+@@ -2931,6 +2933,8 @@ static void rs_fill_link_cmd(struct iwl_
  		container_of(lq_sta, struct iwl_station_priv, lq_sta);
  	struct iwl_link_quality_cmd *lq_cmd = &lq_sta->lq;
  
@@ -33012,10 +32966,10 @@ diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.9/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.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c
---- linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-11-15 20:02:59.000000000 -0500
-@@ -548,6 +548,8 @@ static ssize_t iwl_dbgfs_status_read(str
+diff -urNp linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+--- linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-11-16 18:40:22.000000000 -0500
+@@ -561,6 +561,8 @@ static ssize_t iwl_dbgfs_status_read(str
  	int pos = 0;
  	const size_t bufsz = sizeof(buf);
  
@@ -33024,7 +32978,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.9/dr
  	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n",
  		test_bit(STATUS_HCMD_ACTIVE, &priv->status));
  	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_INT_ENABLED:\t %d\n",
-@@ -680,6 +682,8 @@ static ssize_t iwl_dbgfs_qos_read(struct
+@@ -693,6 +695,8 @@ static ssize_t iwl_dbgfs_qos_read(struct
  	char buf[256 * NUM_IWL_RXON_CTX];
  	const size_t bufsz = sizeof(buf);
  
@@ -33033,9 +32987,9 @@ diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.9/dr
  	for_each_context(priv, ctx) {
  		pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n",
  				 ctx->ctxid);
-diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-11-16 18:39:07.000000000 -0500
 @@ -68,8 +68,8 @@ do {                                    
  } while (0)
  
@@ -33047,9 +33001,9 @@ diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.9/driv
  static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
  				      const void *p, u32 len)
  {}
-diff -urNp linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c
---- linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.1.1/drivers/net/wireless/iwmc3200wifi/debugfs.c
+--- linux-3.1.1/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-11-16 18:40:22.000000000 -0500
 @@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
  	int buf_len = 512;
  	size_t len = 0;
@@ -33059,10 +33013,10 @@ diff -urNp linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.9/d
  	if (*ppos != 0)
  		return 0;
  	if (count < sizeof(buf))
-diff -urNp linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c
---- linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1260,9 +1260,11 @@ static int __init init_mac80211_hwsim(vo
+diff -urNp linux-3.1.1/drivers/net/wireless/mac80211_hwsim.c linux-3.1.1/drivers/net/wireless/mac80211_hwsim.c
+--- linux-3.1.1/drivers/net/wireless/mac80211_hwsim.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/mac80211_hwsim.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1670,9 +1670,11 @@ static int __init init_mac80211_hwsim(vo
  		return -EINVAL;
  
  	if (fake_hw_scan) {
@@ -33077,9 +33031,21 @@ diff -urNp linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c linux-3.0.9/drivers
  	}
  
  	spin_lock_init(&hwsim_radio_lock);
-diff -urNp linux-3.0.9/drivers/net/wireless/rndis_wlan.c linux-3.0.9/drivers/net/wireless/rndis_wlan.c
---- linux-3.0.9/drivers/net/wireless/rndis_wlan.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/rndis_wlan.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/wireless/mwifiex/main.h linux-3.1.1/drivers/net/wireless/mwifiex/main.h
+--- linux-3.1.1/drivers/net/wireless/mwifiex/main.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/mwifiex/main.h	2011-11-16 18:39:07.000000000 -0500
+@@ -560,7 +560,7 @@ struct mwifiex_if_ops {
+ 
+ 	void (*update_mp_end_port) (struct mwifiex_adapter *, u16);
+ 	void (*cleanup_mpa_buf) (struct mwifiex_adapter *);
+-};
++} __no_const;
+ 
+ struct mwifiex_adapter {
+ 	struct mwifiex_private *priv[MWIFIEX_MAX_BSS_NUM];
+diff -urNp linux-3.1.1/drivers/net/wireless/rndis_wlan.c linux-3.1.1/drivers/net/wireless/rndis_wlan.c
+--- linux-3.1.1/drivers/net/wireless/rndis_wlan.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/rndis_wlan.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn
  
  	netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
@@ -33089,9 +33055,9 @@ diff -urNp linux-3.0.9/drivers/net/wireless/rndis_wlan.c linux-3.0.9/drivers/net
  		rts_threshold = 2347;
  
  	tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
---- linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.1.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+--- linux-3.1.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-11-16 18:40:22.000000000 -0500
 @@ -837,6 +837,8 @@ bool _rtl92c_phy_sw_chnl_step_by_step(st
  	u8 rfpath;
  	u8 num_total_rfpath = rtlphy->num_total_rfpath;
@@ -33101,9 +33067,9 @@ diff -urNp linux-3.0.9/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.9/drivers/net/wireless/wl1251/wl1251.h linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h
---- linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/net/wireless/wl1251/wl1251.h linux-3.1.1/drivers/net/wireless/wl1251/wl1251.h
+--- linux-3.1.1/drivers/net/wireless/wl1251/wl1251.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/wl1251/wl1251.h	2011-11-16 18:39:07.000000000 -0500
 @@ -266,7 +266,7 @@ struct wl1251_if_operations {
  	void (*reset)(struct wl1251 *wl);
  	void (*enable_irq)(struct wl1251 *wl);
@@ -33113,10 +33079,10 @@ diff -urNp linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h linux-3.0.9/drivers/
  
  struct wl1251 {
  	struct ieee80211_hw *hw;
-diff -urNp linux-3.0.9/drivers/net/wireless/wl12xx/spi.c linux-3.0.9/drivers/net/wireless/wl12xx/spi.c
---- linux-3.0.9/drivers/net/wireless/wl12xx/spi.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/wl12xx/spi.c	2011-11-15 20:02:59.000000000 -0500
-@@ -280,6 +280,8 @@ static void wl1271_spi_raw_write(struct 
+diff -urNp linux-3.1.1/drivers/net/wireless/wl12xx/spi.c linux-3.1.1/drivers/net/wireless/wl12xx/spi.c
+--- linux-3.1.1/drivers/net/wireless/wl12xx/spi.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/wl12xx/spi.c	2011-11-16 18:40:22.000000000 -0500
+@@ -281,6 +281,8 @@ static void wl1271_spi_raw_write(struct 
  	u32 chunk_len;
  	int i;
  
@@ -33125,9 +33091,9 @@ diff -urNp linux-3.0.9/drivers/net/wireless/wl12xx/spi.c linux-3.0.9/drivers/net
  	WARN_ON(len > WL1271_AGGR_BUFFER_SIZE);
  
  	spi_message_init(&m);
-diff -urNp linux-3.0.9/drivers/oprofile/buffer_sync.c linux-3.0.9/drivers/oprofile/buffer_sync.c
---- linux-3.0.9/drivers/oprofile/buffer_sync.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/oprofile/buffer_sync.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/oprofile/buffer_sync.c linux-3.1.1/drivers/oprofile/buffer_sync.c
+--- linux-3.1.1/drivers/oprofile/buffer_sync.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/oprofile/buffer_sync.c	2011-11-16 18:39:07.000000000 -0500
 @@ -343,7 +343,7 @@ static void add_data(struct op_entry *en
  		if (cookie == NO_COOKIE)
  			offset = pc;
@@ -33163,9 +33129,9 @@ diff -urNp linux-3.0.9/drivers/oprofile/buffer_sync.c linux-3.0.9/drivers/oprofi
  		}
  	}
  	release_mm(mm);
-diff -urNp linux-3.0.9/drivers/oprofile/event_buffer.c linux-3.0.9/drivers/oprofile/event_buffer.c
---- linux-3.0.9/drivers/oprofile/event_buffer.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/oprofile/event_buffer.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/oprofile/event_buffer.c linux-3.1.1/drivers/oprofile/event_buffer.c
+--- linux-3.1.1/drivers/oprofile/event_buffer.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/oprofile/event_buffer.c	2011-11-16 18:39:07.000000000 -0500
 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
  	}
  
@@ -33175,9 +33141,9 @@ diff -urNp linux-3.0.9/drivers/oprofile/event_buffer.c linux-3.0.9/drivers/oprof
  		return;
  	}
  
-diff -urNp linux-3.0.9/drivers/oprofile/oprof.c linux-3.0.9/drivers/oprofile/oprof.c
---- linux-3.0.9/drivers/oprofile/oprof.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/oprofile/oprof.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/oprofile/oprof.c linux-3.1.1/drivers/oprofile/oprof.c
+--- linux-3.1.1/drivers/oprofile/oprof.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/oprofile/oprof.c	2011-11-16 18:39:07.000000000 -0500
 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
  	if (oprofile_ops.switch_events())
  		return;
@@ -33187,9 +33153,9 @@ diff -urNp linux-3.0.9/drivers/oprofile/oprof.c linux-3.0.9/drivers/oprofile/opr
  	start_switch_worker();
  }
  
-diff -urNp linux-3.0.9/drivers/oprofile/oprofilefs.c linux-3.0.9/drivers/oprofile/oprofilefs.c
---- linux-3.0.9/drivers/oprofile/oprofilefs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/oprofile/oprofilefs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/oprofile/oprofilefs.c linux-3.1.1/drivers/oprofile/oprofilefs.c
+--- linux-3.1.1/drivers/oprofile/oprofilefs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/oprofile/oprofilefs.c	2011-11-16 18:39:07.000000000 -0500
 @@ -186,7 +186,7 @@ static const struct file_operations atom
  
  
@@ -33199,9 +33165,9 @@ diff -urNp linux-3.0.9/drivers/oprofile/oprofilefs.c linux-3.0.9/drivers/oprofil
  {
  	return __oprofilefs_create_file(sb, root, name,
  					&atomic_ro_fops, 0444, val);
-diff -urNp linux-3.0.9/drivers/oprofile/oprofile_stats.c linux-3.0.9/drivers/oprofile/oprofile_stats.c
---- linux-3.0.9/drivers/oprofile/oprofile_stats.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/oprofile/oprofile_stats.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/oprofile/oprofile_stats.c linux-3.1.1/drivers/oprofile/oprofile_stats.c
+--- linux-3.1.1/drivers/oprofile/oprofile_stats.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/oprofile/oprofile_stats.c	2011-11-16 18:39:07.000000000 -0500
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
  		cpu_buf->sample_invalid_eip = 0;
  	}
@@ -33219,11 +33185,11 @@ diff -urNp linux-3.0.9/drivers/oprofile/oprofile_stats.c linux-3.0.9/drivers/opr
  }
  
  
-diff -urNp linux-3.0.9/drivers/oprofile/oprofile_stats.h linux-3.0.9/drivers/oprofile/oprofile_stats.h
---- linux-3.0.9/drivers/oprofile/oprofile_stats.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/oprofile/oprofile_stats.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/oprofile/oprofile_stats.h linux-3.1.1/drivers/oprofile/oprofile_stats.h
+--- linux-3.1.1/drivers/oprofile/oprofile_stats.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/oprofile/oprofile_stats.h	2011-11-16 18:39:07.000000000 -0500
 @@ -13,11 +13,11 @@
- #include <asm/atomic.h>
+ #include <linux/atomic.h>
  
  struct oprofile_stat_struct {
 -	atomic_t sample_lost_no_mm;
@@ -33239,9 +33205,9 @@ diff -urNp linux-3.0.9/drivers/oprofile/oprofile_stats.h linux-3.0.9/drivers/opr
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-3.0.9/drivers/parport/procfs.c linux-3.0.9/drivers/parport/procfs.c
---- linux-3.0.9/drivers/parport/procfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/parport/procfs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/parport/procfs.c linux-3.1.1/drivers/parport/procfs.c
+--- linux-3.1.1/drivers/parport/procfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/parport/procfs.c	2011-11-16 18:39:07.000000000 -0500
 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
  
  	*ppos += len;
@@ -33260,9 +33226,9 @@ diff -urNp linux-3.0.9/drivers/parport/procfs.c linux-3.0.9/drivers/parport/proc
  }
  #endif /* IEEE1284.3 support. */
  
-diff -urNp linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h
---- linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/pci/hotplug/cpci_hotplug.h linux-3.1.1/drivers/pci/hotplug/cpci_hotplug.h
+--- linux-3.1.1/drivers/pci/hotplug/cpci_hotplug.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pci/hotplug/cpci_hotplug.h	2011-11-16 18:39:07.000000000 -0500
 @@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
  	int (*hardware_test) (struct slot* slot, u32 value);
  	u8  (*get_power) (struct slot* slot);
@@ -33272,9 +33238,9 @@ diff -urNp linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.9/drivers/pc
  
  struct cpci_hp_controller {
  	unsigned int irq;
-diff -urNp linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/pci/hotplug/cpqphp_nvram.c linux-3.1.1/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-3.1.1/drivers/pci/hotplug/cpqphp_nvram.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pci/hotplug/cpqphp_nvram.c	2011-11-16 18:39:07.000000000 -0500
 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
  
  void compaq_nvram_init (void __iomem *rom_start)
@@ -33289,9 +33255,9 @@ diff -urNp linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.9/drivers/pc
  	dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
  	/* initialize our int15 lock */
-diff -urNp linux-3.0.9/drivers/pci/pcie/aspm.c linux-3.0.9/drivers/pci/pcie/aspm.c
---- linux-3.0.9/drivers/pci/pcie/aspm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pci/pcie/aspm.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/pci/pcie/aspm.c linux-3.1.1/drivers/pci/pcie/aspm.c
+--- linux-3.1.1/drivers/pci/pcie/aspm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pci/pcie/aspm.c	2011-11-16 18:39:07.000000000 -0500
 @@ -27,9 +27,9 @@
  #define MODULE_PARAM_PREFIX "pcie_aspm."
  
@@ -33305,10 +33271,10 @@ diff -urNp linux-3.0.9/drivers/pci/pcie/aspm.c linux-3.0.9/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.9/drivers/pci/probe.c linux-3.0.9/drivers/pci/probe.c
---- linux-3.0.9/drivers/pci/probe.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pci/probe.c	2011-11-15 20:02:59.000000000 -0500
-@@ -129,7 +129,7 @@ int __pci_read_base(struct pci_dev *dev,
+diff -urNp linux-3.1.1/drivers/pci/probe.c linux-3.1.1/drivers/pci/probe.c
+--- linux-3.1.1/drivers/pci/probe.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pci/probe.c	2011-11-16 18:39:07.000000000 -0500
+@@ -136,7 +136,7 @@ int __pci_read_base(struct pci_dev *dev,
  	u32 l, sz, mask;
  	u16 orig_cmd;
  
@@ -33317,9 +33283,9 @@ diff -urNp linux-3.0.9/drivers/pci/probe.c linux-3.0.9/drivers/pci/probe.c
  
  	if (!dev->mmio_always_on) {
  		pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
-diff -urNp linux-3.0.9/drivers/pci/proc.c linux-3.0.9/drivers/pci/proc.c
---- linux-3.0.9/drivers/pci/proc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pci/proc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/pci/proc.c linux-3.1.1/drivers/pci/proc.c
+--- linux-3.1.1/drivers/pci/proc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pci/proc.c	2011-11-16 18:40:22.000000000 -0500
 @@ -476,7 +476,16 @@ static const struct file_operations proc
  static int __init pci_proc_init(void)
  {
@@ -33337,9 +33303,9 @@ diff -urNp linux-3.0.9/drivers/pci/proc.c linux-3.0.9/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.9/drivers/pci/xen-pcifront.c linux-3.0.9/drivers/pci/xen-pcifront.c
---- linux-3.0.9/drivers/pci/xen-pcifront.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pci/xen-pcifront.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/pci/xen-pcifront.c linux-3.1.1/drivers/pci/xen-pcifront.c
+--- linux-3.1.1/drivers/pci/xen-pcifront.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pci/xen-pcifront.c	2011-11-16 18:40:22.000000000 -0500
 @@ -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);
@@ -33385,9 +33351,9 @@ diff -urNp linux-3.0.9/drivers/pci/xen-pcifront.c linux-3.0.9/drivers/pci/xen-pc
  	err = do_pci_op(pdev, &op);
  	if (likely(!err)) {
  		vector[0] = op.value;
-diff -urNp linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c
---- linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/platform/x86/thinkpad_acpi.c linux-3.1.1/drivers/platform/x86/thinkpad_acpi.c
+--- linux-3.1.1/drivers/platform/x86/thinkpad_acpi.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/platform/x86/thinkpad_acpi.c	2011-11-16 18:39:07.000000000 -0500
 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
  	return 0;
  }
@@ -33397,9 +33363,9 @@ diff -urNp linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c linux-3.0.9/drivers/
  {
  	/* log only what the user can fix... */
  	const u32 wantedmask = hotkey_driver_mask &
-diff -urNp linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c
---- linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/pnp/pnpbios/bioscalls.c linux-3.1.1/drivers/pnp/pnpbios/bioscalls.c
+--- linux-3.1.1/drivers/pnp/pnpbios/bioscalls.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pnp/pnpbios/bioscalls.c	2011-11-16 18:39:07.000000000 -0500
 @@ -59,7 +59,7 @@ do { \
  	set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
  } while(0)
@@ -33456,9 +33422,9 @@ diff -urNp linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c linux-3.0.9/drivers/pnp/p
 +
 +	pax_close_kernel();
  }
-diff -urNp linux-3.0.9/drivers/pnp/resource.c linux-3.0.9/drivers/pnp/resource.c
---- linux-3.0.9/drivers/pnp/resource.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pnp/resource.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/pnp/resource.c linux-3.1.1/drivers/pnp/resource.c
+--- linux-3.1.1/drivers/pnp/resource.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pnp/resource.c	2011-11-16 18:39:07.000000000 -0500
 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
  		return 1;
  
@@ -33477,9 +33443,9 @@ diff -urNp linux-3.0.9/drivers/pnp/resource.c linux-3.0.9/drivers/pnp/resource.c
  		return 0;
  
  	/* check if the resource is reserved */
-diff -urNp linux-3.0.9/drivers/power/bq27x00_battery.c linux-3.0.9/drivers/power/bq27x00_battery.c
---- linux-3.0.9/drivers/power/bq27x00_battery.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/power/bq27x00_battery.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/power/bq27x00_battery.c linux-3.1.1/drivers/power/bq27x00_battery.c
+--- linux-3.1.1/drivers/power/bq27x00_battery.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/power/bq27x00_battery.c	2011-11-16 18:39:07.000000000 -0500
 @@ -67,7 +67,7 @@
  struct bq27x00_device_info;
  struct bq27x00_access_methods {
@@ -33489,9 +33455,9 @@ diff -urNp linux-3.0.9/drivers/power/bq27x00_battery.c linux-3.0.9/drivers/power
  
  enum bq27x00_chip { BQ27000, BQ27500 };
  
-diff -urNp linux-3.0.9/drivers/regulator/max8660.c linux-3.0.9/drivers/regulator/max8660.c
---- linux-3.0.9/drivers/regulator/max8660.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/regulator/max8660.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/regulator/max8660.c linux-3.1.1/drivers/regulator/max8660.c
+--- linux-3.1.1/drivers/regulator/max8660.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/regulator/max8660.c	2011-11-16 18:39:07.000000000 -0500
 @@ -383,8 +383,10 @@ static int __devinit max8660_probe(struc
  		max8660->shadow_regs[MAX8660_OVER1] = 5;
  	} else {
@@ -33505,9 +33471,9 @@ diff -urNp linux-3.0.9/drivers/regulator/max8660.c linux-3.0.9/drivers/regulator
  	}
  
  	/*
-diff -urNp linux-3.0.9/drivers/regulator/mc13892-regulator.c linux-3.0.9/drivers/regulator/mc13892-regulator.c
---- linux-3.0.9/drivers/regulator/mc13892-regulator.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/regulator/mc13892-regulator.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/regulator/mc13892-regulator.c linux-3.1.1/drivers/regulator/mc13892-regulator.c
+--- linux-3.1.1/drivers/regulator/mc13892-regulator.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/regulator/mc13892-regulator.c	2011-11-16 18:39:07.000000000 -0500
 @@ -564,10 +564,12 @@ static int __devinit mc13892_regulator_p
  	}
  	mc13xxx_unlock(mc13892);
@@ -33523,9 +33489,9 @@ diff -urNp linux-3.0.9/drivers/regulator/mc13892-regulator.c linux-3.0.9/drivers
  	for (i = 0; i < pdata->num_regulators; i++) {
  		init_data = &pdata->regulators[i];
  		priv->regulators[i] = regulator_register(
-diff -urNp linux-3.0.9/drivers/rtc/rtc-dev.c linux-3.0.9/drivers/rtc/rtc-dev.c
---- linux-3.0.9/drivers/rtc/rtc-dev.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/rtc/rtc-dev.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/rtc/rtc-dev.c linux-3.1.1/drivers/rtc/rtc-dev.c
+--- linux-3.1.1/drivers/rtc/rtc-dev.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/rtc/rtc-dev.c	2011-11-16 18:40:22.000000000 -0500
 @@ -14,6 +14,7 @@
  #include <linux/module.h>
  #include <linux/rtc.h>
@@ -33543,9 +33509,9 @@ diff -urNp linux-3.0.9/drivers/rtc/rtc-dev.c linux-3.0.9/drivers/rtc/rtc-dev.c
  		return rtc_set_time(rtc, &tm);
  
  	case RTC_PIE_ON:
-diff -urNp linux-3.0.9/drivers/scsi/aacraid/aacraid.h linux-3.0.9/drivers/scsi/aacraid/aacraid.h
---- linux-3.0.9/drivers/scsi/aacraid/aacraid.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/aacraid/aacraid.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/aacraid/aacraid.h linux-3.1.1/drivers/scsi/aacraid/aacraid.h
+--- linux-3.1.1/drivers/scsi/aacraid/aacraid.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/aacraid/aacraid.h	2011-11-16 18:39:07.000000000 -0500
 @@ -492,7 +492,7 @@ struct adapter_ops
  	int  (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
  	/* Administrative operations */
@@ -33555,9 +33521,9 @@ diff -urNp linux-3.0.9/drivers/scsi/aacraid/aacraid.h linux-3.0.9/drivers/scsi/a
  
  /*
   *	Define which interrupt handler needs to be installed
-diff -urNp linux-3.0.9/drivers/scsi/aacraid/commctrl.c linux-3.0.9/drivers/scsi/aacraid/commctrl.c
---- linux-3.0.9/drivers/scsi/aacraid/commctrl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/aacraid/commctrl.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/aacraid/commctrl.c linux-3.1.1/drivers/scsi/aacraid/commctrl.c
+--- linux-3.1.1/drivers/scsi/aacraid/commctrl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/aacraid/commctrl.c	2011-11-16 18:40:22.000000000 -0500
 @@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d
  	u32 actual_fibsize64, actual_fibsize = 0;
  	int i;
@@ -33566,9 +33532,9 @@ diff -urNp linux-3.0.9/drivers/scsi/aacraid/commctrl.c linux-3.0.9/drivers/scsi/
  
  	if (dev->in_reset) {
  		dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
-diff -urNp linux-3.0.9/drivers/scsi/aacraid/linit.c linux-3.0.9/drivers/scsi/aacraid/linit.c
---- linux-3.0.9/drivers/scsi/aacraid/linit.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/aacraid/linit.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/aacraid/linit.c linux-3.1.1/drivers/scsi/aacraid/linit.c
+--- linux-3.1.1/drivers/scsi/aacraid/linit.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/aacraid/linit.c	2011-11-16 18:39:07.000000000 -0500
 @@ -92,7 +92,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_
  #elif defined(__devinitconst)
  static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
@@ -33578,9 +33544,9 @@ diff -urNp linux-3.0.9/drivers/scsi/aacraid/linit.c linux-3.0.9/drivers/scsi/aac
  #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.9/drivers/scsi/aic94xx/aic94xx_init.c linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c
---- linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/aic94xx/aic94xx_init.c linux-3.1.1/drivers/scsi/aic94xx/aic94xx_init.c
+--- linux-3.1.1/drivers/scsi/aic94xx/aic94xx_init.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/aic94xx/aic94xx_init.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1012,7 +1012,7 @@ static struct sas_domain_function_templa
  	.lldd_control_phy	= asd_control_phy,
  };
@@ -33590,22 +33556,54 @@ diff -urNp linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c linux-3.0.9/drivers/s
  	{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.9/drivers/scsi/bfa/bfad.c linux-3.0.9/drivers/scsi/bfa/bfad.c
---- linux-3.0.9/drivers/scsi/bfa/bfad.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/bfa/bfad.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1032,6 +1032,8 @@ bfad_start_ops(struct bfad_s *bfad) {
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfad.c linux-3.1.1/drivers/scsi/bfa/bfad.c
+--- linux-3.1.1/drivers/scsi/bfa/bfad.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfad.c	2011-11-16 19:01:15.000000000 -0500
+@@ -1019,6 +1019,8 @@ bfad_start_ops(struct bfad_s *bfad) {
  	struct bfad_vport_s *vport, *vport_new;
  	struct bfa_fcs_driver_info_s driver_info;
  
 +	pax_track_stack();
 +
- 	/* Fill the driver_info info to fcs*/
- 	memset(&driver_info, 0, sizeof(driver_info));
- 	strncpy(driver_info.version, BFAD_DRIVER_VERSION,
-diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c
---- linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc
+ 	/* Limit min/max. xfer size to [64k-32MB] */
+ 	if (max_xfer_size < BFAD_MIN_SECTORS >> 1)
+ 		max_xfer_size = BFAD_MIN_SECTORS >> 1;
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.c linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.c
+--- linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.c	2011-11-16 18:39:07.000000000 -0500
+@@ -4179,7 +4179,7 @@ bfa_itn_create(struct bfa_s *bfa, struct
+ 		void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
+ {
+ 	struct bfa_fcp_mod_s *fcp = BFA_FCP_MOD(bfa);
+-	struct bfa_itn_s *itn;
++	bfa_itn_s_no_const *itn;
+ 
+ 	itn =  BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
+ 	itn->isr = isr;
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.h linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.h
+--- linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.h	2011-11-16 18:39:07.000000000 -0500
+@@ -37,6 +37,7 @@ struct bfa_iotag_s {
+ struct bfa_itn_s {
+ 	bfa_isr_func_t isr;
+ };
++typedef struct bfa_itn_s __no_const bfa_itn_s_no_const;
+ 
+ void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
+ 		void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
+@@ -149,7 +150,7 @@ struct bfa_fcp_mod_s {
+ 	struct list_head	iotag_tio_free_q;	/* free IO resources */
+ 	struct list_head	iotag_unused_q;	/* unused IO resources*/
+ 	struct bfa_iotag_s	*iotag_arr;
+-	struct bfa_itn_s	*itn_arr;
++	bfa_itn_s_no_const	*itn_arr;
+ 	int			num_ioim_reqs;
+ 	int			num_fwtio_reqs;
+ 	int			num_itns;
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.1.1/drivers/scsi/bfa/bfa_fcs_lport.c
+--- linux-3.1.1/drivers/scsi/bfa/bfa_fcs_lport.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfa_fcs_lport.c	2011-11-16 18:40:22.000000000 -0500
+@@ -1700,6 +1700,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc
  	u16        len, count;
  	u16	templen;
  
@@ -33614,7 +33612,7 @@ diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.9/drivers/scsi
  	/*
  	 * get hba attributes
  	 */
-@@ -1836,6 +1838,8 @@ bfa_fcs_lport_fdmi_build_portattr_block(
+@@ -1977,6 +1979,8 @@ bfa_fcs_lport_fdmi_build_portattr_block(
  	u8	count = 0;
  	u16	templen;
  
@@ -33623,10 +33621,10 @@ diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.9/drivers/scsi
  	/*
  	 * get port attributes
  	 */
-diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c
---- linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.1.1/drivers/scsi/bfa/bfa_fcs_rport.c
+--- linux-3.1.1/drivers/scsi/bfa/bfa_fcs_rport.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfa_fcs_rport.c	2011-11-16 18:40:22.000000000 -0500
+@@ -1871,6 +1871,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc
  	struct fc_rpsc_speed_info_s speeds;
  	struct bfa_port_attr_s pport_attr;
  
@@ -33635,22 +33633,22 @@ diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.9/drivers/scsi
  	bfa_trc(port->fcs, rx_fchs->s_id);
  	bfa_trc(port->fcs, rx_fchs->d_id);
  
-diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa.h linux-3.0.9/drivers/scsi/bfa/bfa.h
---- linux-3.0.9/drivers/scsi/bfa/bfa.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/bfa/bfa.h	2011-11-15 20:02:59.000000000 -0500
-@@ -238,7 +238,7 @@ struct bfa_hwif_s {
- 				u32 *nvecs, u32 *maxvec);
- 	void (*hw_msix_get_rme_range) (struct bfa_s *bfa, u32 *start,
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa.h linux-3.1.1/drivers/scsi/bfa/bfa.h
+--- linux-3.1.1/drivers/scsi/bfa/bfa.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfa.h	2011-11-16 18:39:07.000000000 -0500
+@@ -196,7 +196,7 @@ struct bfa_hwif_s {
  				       u32 *end);
+ 	int	cpe_vec_q0;
+ 	int	rme_vec_q0;
 -};
 +} __no_const;
  typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
  
- struct bfa_iocfc_s {
-diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h
---- linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h	2011-11-15 20:02:59.000000000 -0500
-@@ -196,7 +196,7 @@ struct bfa_ioc_cbfn_s {
+ struct bfa_faa_cbfn_s {
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_ioc.h linux-3.1.1/drivers/scsi/bfa/bfa_ioc.h
+--- linux-3.1.1/drivers/scsi/bfa/bfa_ioc.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfa_ioc.h	2011-11-16 18:39:07.000000000 -0500
+@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
  	bfa_ioc_disable_cbfn_t	disable_cbfn;
  	bfa_ioc_hbfail_cbfn_t	hbfail_cbfn;
  	bfa_ioc_reset_cbfn_t	reset_cbfn;
@@ -33658,19 +33656,19 @@ diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h linux-3.0.9/drivers/scsi/bfa/b
 +} __no_const;
  
  /*
-  * Heartbeat failure notification queue element.
-@@ -268,7 +268,7 @@ struct bfa_ioc_hwif_s {
- 	void		(*ioc_sync_leave)	(struct bfa_ioc_s *ioc);
+  * IOC event notification mechanism.
+@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
  	void		(*ioc_sync_ack)		(struct bfa_ioc_s *ioc);
  	bfa_boolean_t	(*ioc_sync_complete)	(struct bfa_ioc_s *ioc);
+ 	bfa_boolean_t	(*ioc_lpu_read_stat)	(struct bfa_ioc_s *ioc);
 -};
 +} __no_const;
  
- #define bfa_ioc_pcifn(__ioc)		((__ioc)->pcidev.pci_func)
- #define bfa_ioc_devid(__ioc)		((__ioc)->pcidev.device_id)
-diff -urNp linux-3.0.9/drivers/scsi/BusLogic.c linux-3.0.9/drivers/scsi/BusLogic.c
---- linux-3.0.9/drivers/scsi/BusLogic.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/BusLogic.c	2011-11-15 20:02:59.000000000 -0500
+ /*
+  * Queue element to wait for room in request queue. FIFO order is
+diff -urNp linux-3.1.1/drivers/scsi/BusLogic.c linux-3.1.1/drivers/scsi/BusLogic.c
+--- linux-3.1.1/drivers/scsi/BusLogic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/BusLogic.c	2011-11-16 18:40:22.000000000 -0500
 @@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla
  static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
  						    *PrototypeHostAdapter)
@@ -33680,9 +33678,9 @@ diff -urNp linux-3.0.9/drivers/scsi/BusLogic.c linux-3.0.9/drivers/scsi/BusLogic
  	/*
  	   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.9/drivers/scsi/dpt_i2o.c linux-3.0.9/drivers/scsi/dpt_i2o.c
---- linux-3.0.9/drivers/scsi/dpt_i2o.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/dpt_i2o.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/dpt_i2o.c linux-3.1.1/drivers/scsi/dpt_i2o.c
+--- linux-3.1.1/drivers/scsi/dpt_i2o.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/dpt_i2o.c	2011-11-16 18:40:22.000000000 -0500
 @@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p
  	dma_addr_t addr;
  	ulong flags = 0;
@@ -33701,9 +33699,9 @@ diff -urNp linux-3.0.9/drivers/scsi/dpt_i2o.c linux-3.0.9/drivers/scsi/dpt_i2o.c
  	memset(msg, 0 , sizeof(msg));
  	len = scsi_bufflen(cmd);
  	direction = 0x00000000;	
-diff -urNp linux-3.0.9/drivers/scsi/eata.c linux-3.0.9/drivers/scsi/eata.c
---- linux-3.0.9/drivers/scsi/eata.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/eata.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/eata.c linux-3.1.1/drivers/scsi/eata.c
+--- linux-3.1.1/drivers/scsi/eata.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/eata.c	2011-11-16 18:40:22.000000000 -0500
 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
  	struct hostdata *ha;
  	char name[16];
@@ -33713,9 +33711,9 @@ diff -urNp linux-3.0.9/drivers/scsi/eata.c linux-3.0.9/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.9/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c
---- linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.1.1/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-3.1.1/drivers/scsi/fcoe/fcoe_ctlr.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/fcoe/fcoe_ctlr.c	2011-11-16 18:40:22.000000000 -0500
 @@ -2503,6 +2503,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe
  	} buf;
  	int rc;
@@ -33725,9 +33723,9 @@ diff -urNp linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.9/drivers/scsi/fc
  	fiph = (struct fip_header *)skb->data;
  	sub = fiph->fip_subcode;
  
-diff -urNp linux-3.0.9/drivers/scsi/gdth.c linux-3.0.9/drivers/scsi/gdth.c
---- linux-3.0.9/drivers/scsi/gdth.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/gdth.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/gdth.c linux-3.1.1/drivers/scsi/gdth.c
+--- linux-3.1.1/drivers/scsi/gdth.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/gdth.c	2011-11-16 18:40:22.000000000 -0500
 @@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg)
      unsigned long flags;
      gdth_ha_str *ha;
@@ -33765,9 +33763,9 @@ diff -urNp linux-3.0.9/drivers/scsi/gdth.c linux-3.0.9/drivers/scsi/gdth.c
      memset(cmnd, 0xff, MAX_COMMAND_SIZE);
  
      TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
-diff -urNp linux-3.0.9/drivers/scsi/gdth_proc.c linux-3.0.9/drivers/scsi/gdth_proc.c
---- linux-3.0.9/drivers/scsi/gdth_proc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/gdth_proc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/gdth_proc.c linux-3.1.1/drivers/scsi/gdth_proc.c
+--- linux-3.1.1/drivers/scsi/gdth_proc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/gdth_proc.c	2011-11-16 18:40:22.000000000 -0500
 @@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi
      u64         paddr;
  
@@ -33787,9 +33785,9 @@ diff -urNp linux-3.0.9/drivers/scsi/gdth_proc.c linux-3.0.9/drivers/scsi/gdth_pr
      gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
      estr = kmalloc(sizeof(*estr), GFP_KERNEL);
      if (!gdtcmd || !estr)
-diff -urNp linux-3.0.9/drivers/scsi/hosts.c linux-3.0.9/drivers/scsi/hosts.c
---- linux-3.0.9/drivers/scsi/hosts.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/hosts.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/hosts.c linux-3.1.1/drivers/scsi/hosts.c
+--- linux-3.1.1/drivers/scsi/hosts.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/hosts.c	2011-11-16 18:39:07.000000000 -0500
 @@ -42,7 +42,7 @@
  #include "scsi_logging.h"
  
@@ -33808,9 +33806,9 @@ diff -urNp linux-3.0.9/drivers/scsi/hosts.c linux-3.0.9/drivers/scsi/hosts.c
  	shost->dma_channel = 0xff;
  
  	/* These three are default values which can be overridden */
-diff -urNp linux-3.0.9/drivers/scsi/hpsa.c linux-3.0.9/drivers/scsi/hpsa.c
---- linux-3.0.9/drivers/scsi/hpsa.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/hpsa.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/hpsa.c linux-3.1.1/drivers/scsi/hpsa.c
+--- linux-3.1.1/drivers/scsi/hpsa.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/hpsa.c	2011-11-16 18:39:07.000000000 -0500
 @@ -498,7 +498,7 @@ static inline u32 next_command(struct ct
  	u32 a;
  
@@ -33925,9 +33923,9 @@ diff -urNp linux-3.0.9/drivers/scsi/hpsa.c linux-3.0.9/drivers/scsi/hpsa.c
  	h->transMethod = CFGTBL_Trans_Performant;
  }
  
-diff -urNp linux-3.0.9/drivers/scsi/hpsa.h linux-3.0.9/drivers/scsi/hpsa.h
---- linux-3.0.9/drivers/scsi/hpsa.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/hpsa.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/hpsa.h linux-3.1.1/drivers/scsi/hpsa.h
+--- linux-3.1.1/drivers/scsi/hpsa.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/hpsa.h	2011-11-16 18:39:07.000000000 -0500
 @@ -73,7 +73,7 @@ struct ctlr_info {
  	unsigned int msix_vector;
  	unsigned int msi_vector;
@@ -33937,9 +33935,9 @@ diff -urNp linux-3.0.9/drivers/scsi/hpsa.h linux-3.0.9/drivers/scsi/hpsa.h
  
  	/* queue and queue Info */
  	struct list_head reqQ;
-diff -urNp linux-3.0.9/drivers/scsi/ips.h linux-3.0.9/drivers/scsi/ips.h
---- linux-3.0.9/drivers/scsi/ips.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/ips.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/ips.h linux-3.1.1/drivers/scsi/ips.h
+--- linux-3.1.1/drivers/scsi/ips.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/ips.h	2011-11-16 18:39:07.000000000 -0500
 @@ -1027,7 +1027,7 @@ typedef struct {
     int       (*intr)(struct ips_ha *);
     void      (*enableint)(struct ips_ha *);
@@ -33949,9 +33947,9 @@ diff -urNp linux-3.0.9/drivers/scsi/ips.h linux-3.0.9/drivers/scsi/ips.h
  
  typedef struct ips_ha {
     uint8_t            ha_id[IPS_MAX_CHANNELS+1];
-diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/libfc/fc_exch.c
---- linux-3.0.9/drivers/scsi/libfc/fc_exch.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/libfc/fc_exch.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/libfc/fc_exch.c linux-3.1.1/drivers/scsi/libfc/fc_exch.c
+--- linux-3.1.1/drivers/scsi/libfc/fc_exch.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/libfc/fc_exch.c	2011-11-16 18:39:07.000000000 -0500
 @@ -105,12 +105,12 @@ struct fc_exch_mgr {
  	 * all together if not used XXX
  	 */
@@ -33971,7 +33969,7 @@ diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/lib
  	} stats;
  };
  
-@@ -700,7 +700,7 @@ static struct fc_exch *fc_exch_em_alloc(
+@@ -718,7 +718,7 @@ static struct fc_exch *fc_exch_em_alloc(
  	/* allocate memory for exchange */
  	ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
  	if (!ep) {
@@ -33980,7 +33978,7 @@ diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/lib
  		goto out;
  	}
  	memset(ep, 0, sizeof(*ep));
-@@ -761,7 +761,7 @@ out:
+@@ -779,7 +779,7 @@ out:
  	return ep;
  err:
  	spin_unlock_bh(&pool->lock);
@@ -33989,7 +33987,7 @@ diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/lib
  	mempool_free(ep, mp->ep_pool);
  	return NULL;
  }
-@@ -906,7 +906,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -922,7 +922,7 @@ static enum fc_pf_rjt_reason fc_seq_look
  		xid = ntohs(fh->fh_ox_id);	/* we originated exch */
  		ep = fc_exch_find(mp, xid);
  		if (!ep) {
@@ -33998,7 +33996,7 @@ diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/lib
  			reject = FC_RJT_OX_ID;
  			goto out;
  		}
-@@ -936,7 +936,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -952,7 +952,7 @@ static enum fc_pf_rjt_reason fc_seq_look
  		ep = fc_exch_find(mp, xid);
  		if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
  			if (ep) {
@@ -34007,7 +34005,7 @@ diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/lib
  				reject = FC_RJT_RX_ID;
  				goto rel;
  			}
-@@ -947,7 +947,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -963,7 +963,7 @@ static enum fc_pf_rjt_reason fc_seq_look
  			}
  			xid = ep->xid;	/* get our XID */
  		} else if (!ep) {
@@ -34016,16 +34014,16 @@ diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/lib
  			reject = FC_RJT_RX_ID;	/* XID not found */
  			goto out;
  		}
-@@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -980,7 +980,7 @@ static enum fc_pf_rjt_reason fc_seq_look
  	} else {
  		sp = &ep->seq;
  		if (sp->id != fh->fh_seq_id) {
 -			atomic_inc(&mp->stats.seq_not_found);
 +			atomic_inc_unchecked(&mp->stats.seq_not_found);
- 			reject = FC_RJT_SEQ_ID;	/* sequence/exch should exist */
- 			goto rel;
- 		}
-@@ -1392,22 +1392,22 @@ static void fc_exch_recv_seq_resp(struct
+ 			if (f_ctl & FC_FC_END_SEQ) {
+ 				/*
+ 				 * Update sequence_id based on incoming last
+@@ -1430,22 +1430,22 @@ static void fc_exch_recv_seq_resp(struct
  
  	ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
  	if (!ep) {
@@ -34052,7 +34050,7 @@ diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/lib
  		goto rel;
  	}
  	sof = fr_sof(fp);
-@@ -1416,7 +1416,7 @@ static void fc_exch_recv_seq_resp(struct
+@@ -1454,7 +1454,7 @@ static void fc_exch_recv_seq_resp(struct
  		sp->ssb_stat |= SSB_ST_RESP;
  		sp->id = fh->fh_seq_id;
  	} else if (sp->id != fh->fh_seq_id) {
@@ -34061,7 +34059,7 @@ diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/lib
  		goto rel;
  	}
  
-@@ -1480,9 +1480,9 @@ static void fc_exch_recv_resp(struct fc_
+@@ -1518,9 +1518,9 @@ static void fc_exch_recv_resp(struct fc_
  	sp = fc_seq_lookup_orig(mp, fp);	/* doesn't hold sequence */
  
  	if (!sp)
@@ -34073,9 +34071,9 @@ diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/lib
  
  	fc_frame_free(fp);
  }
-diff -urNp linux-3.0.9/drivers/scsi/libsas/sas_ata.c linux-3.0.9/drivers/scsi/libsas/sas_ata.c
---- linux-3.0.9/drivers/scsi/libsas/sas_ata.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/libsas/sas_ata.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/libsas/sas_ata.c linux-3.1.1/drivers/scsi/libsas/sas_ata.c
+--- linux-3.1.1/drivers/scsi/libsas/sas_ata.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/libsas/sas_ata.c	2011-11-16 18:39:07.000000000 -0500
 @@ -368,7 +368,7 @@ static struct ata_port_operations sas_sa
  	.postreset		= ata_std_postreset,
  	.error_handler		= ata_std_error_handler,
@@ -34085,10 +34083,10 @@ diff -urNp linux-3.0.9/drivers/scsi/libsas/sas_ata.c linux-3.0.9/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.9/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c
---- linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c	2011-11-15 20:02:59.000000000 -0500
-@@ -104,7 +104,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_
+diff -urNp linux-3.1.1/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.1.1/drivers/scsi/lpfc/lpfc_debugfs.c
+--- linux-3.1.1/drivers/scsi/lpfc/lpfc_debugfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/lpfc/lpfc_debugfs.c	2011-11-16 18:40:22.000000000 -0500
+@@ -105,7 +105,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_
  
  #include <linux/debugfs.h>
  
@@ -34097,7 +34095,7 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.9/drivers/scsi
  static unsigned long lpfc_debugfs_start_time = 0L;
  
  /* iDiag */
-@@ -141,7 +141,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_v
+@@ -146,7 +146,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_v
  	lpfc_debugfs_enable = 0;
  
  	len = 0;
@@ -34106,7 +34104,7 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.9/drivers/scsi
  		(lpfc_debugfs_max_disc_trc - 1);
  	for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
  		dtp = vport->disc_trc + i;
-@@ -202,7 +202,7 @@ lpfc_debugfs_slow_ring_trc_data(struct l
+@@ -212,7 +212,7 @@ lpfc_debugfs_slow_ring_trc_data(struct l
  	lpfc_debugfs_enable = 0;
  
  	len = 0;
@@ -34115,16 +34113,7 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.9/drivers/scsi
  		(lpfc_debugfs_max_slow_ring_trc - 1);
  	for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
  		dtp = phba->slow_ring_trc + i;
-@@ -380,6 +380,8 @@ lpfc_debugfs_dumpHBASlim_data(struct lpf
- 	uint32_t *ptr;
- 	char buffer[1024];
- 
-+	pax_track_stack();
-+
- 	off = 0;
- 	spin_lock_irq(&phba->hbalock);
- 
-@@ -617,14 +619,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport 
+@@ -635,14 +635,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport 
  		!vport || !vport->disc_trc)
  		return;
  
@@ -34141,7 +34130,7 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.9/drivers/scsi
  	dtp->jif = jiffies;
  #endif
  	return;
-@@ -655,14 +657,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_h
+@@ -673,14 +673,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_h
  		!phba || !phba->slow_ring_trc)
  		return;
  
@@ -34158,7 +34147,7 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.9/drivers/scsi
  	dtp->jif = jiffies;
  #endif
  	return;
-@@ -2606,7 +2608,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
+@@ -3828,7 +3828,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
  						 "slow_ring buffer\n");
  				goto debug_failed;
  			}
@@ -34167,7 +34156,7 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.9/drivers/scsi
  			memset(phba->slow_ring_trc, 0,
  				(sizeof(struct lpfc_debugfs_trc) *
  				lpfc_debugfs_max_slow_ring_trc));
-@@ -2652,7 +2654,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
+@@ -3874,7 +3874,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
  				 "buffer\n");
  		goto debug_failed;
  	}
@@ -34176,9 +34165,9 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.9/drivers/scsi
  
  	snprintf(name, sizeof(name), "discovery_trace");
  	vport->debug_disc_trc =
-diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc.h linux-3.0.9/drivers/scsi/lpfc/lpfc.h
---- linux-3.0.9/drivers/scsi/lpfc/lpfc.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/lpfc/lpfc.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/lpfc/lpfc.h linux-3.1.1/drivers/scsi/lpfc/lpfc.h
+--- linux-3.1.1/drivers/scsi/lpfc/lpfc.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/lpfc/lpfc.h	2011-11-16 18:39:07.000000000 -0500
 @@ -425,7 +425,7 @@ struct lpfc_vport {
  	struct dentry *debug_nodelist;
  	struct dentry *vport_debugfs_root;
@@ -34188,7 +34177,7 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc.h linux-3.0.9/drivers/scsi/lpfc/lp
  #endif
  	uint8_t stat_data_enabled;
  	uint8_t stat_data_blocked;
-@@ -832,8 +832,8 @@ struct lpfc_hba {
+@@ -835,8 +835,8 @@ struct lpfc_hba {
  	struct timer_list fabric_block_timer;
  	unsigned long bit_flags;
  #define	FABRIC_COMANDS_BLOCKED	0
@@ -34199,7 +34188,7 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc.h linux-3.0.9/drivers/scsi/lpfc/lp
  	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 {
+@@ -850,7 +850,7 @@ struct lpfc_hba {
  	struct dentry *debug_dumpDif;    /* BlockGuard BPL*/
  	struct dentry *debug_slow_ring_trc;
  	struct lpfc_debugfs_trc *slow_ring_trc;
@@ -34208,10 +34197,10 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc.h linux-3.0.9/drivers/scsi/lpfc/lp
  	/* iDiag debugfs sub-directory */
  	struct dentry *idiag_root;
  	struct dentry *idiag_pci_cfg;
-diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c
---- linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c	2011-11-15 20:02:59.000000000 -0500
-@@ -9971,8 +9971,10 @@ lpfc_init(void)
+diff -urNp linux-3.1.1/drivers/scsi/lpfc/lpfc_init.c linux-3.1.1/drivers/scsi/lpfc/lpfc_init.c
+--- linux-3.1.1/drivers/scsi/lpfc/lpfc_init.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/lpfc/lpfc_init.c	2011-11-16 18:39:07.000000000 -0500
+@@ -9969,8 +9969,10 @@ lpfc_init(void)
  	printk(LPFC_COPYRIGHT "\n");
  
  	if (lpfc_enable_npiv) {
@@ -34224,9 +34213,9 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c linux-3.0.9/drivers/scsi/lp
  	}
  	lpfc_transport_template =
  				fc_attach_transport(&lpfc_transport_functions);
-diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c
---- linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/lpfc/lpfc_scsi.c linux-3.1.1/drivers/scsi/lpfc/lpfc_scsi.c
+--- linux-3.1.1/drivers/scsi/lpfc/lpfc_scsi.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/lpfc/lpfc_scsi.c	2011-11-16 18:39:07.000000000 -0500
 @@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
  	uint32_t evt_posted;
  
@@ -34278,9 +34267,9 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.9/drivers/scsi/lp
  }
  
  /**
-diff -urNp linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c
---- linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/megaraid/megaraid_mbox.c linux-3.1.1/drivers/scsi/megaraid/megaraid_mbox.c
+--- linux-3.1.1/drivers/scsi/megaraid/megaraid_mbox.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/megaraid/megaraid_mbox.c	2011-11-16 18:40:22.000000000 -0500
 @@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter
  	int		rval;
  	int		i;
@@ -34290,9 +34279,9 @@ diff -urNp linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.9/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.9/drivers/scsi/osd/osd_initiator.c linux-3.0.9/drivers/scsi/osd/osd_initiator.c
---- linux-3.0.9/drivers/scsi/osd/osd_initiator.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/osd/osd_initiator.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/osd/osd_initiator.c linux-3.1.1/drivers/scsi/osd/osd_initiator.c
+--- linux-3.1.1/drivers/scsi/osd/osd_initiator.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/osd/osd_initiator.c	2011-11-16 18:40:22.000000000 -0500
 @@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st
  	int nelem = ARRAY_SIZE(get_attrs), a = 0;
  	int ret;
@@ -34302,9 +34291,9 @@ diff -urNp linux-3.0.9/drivers/scsi/osd/osd_initiator.c linux-3.0.9/drivers/scsi
  	or = osd_start_request(od, GFP_KERNEL);
  	if (!or)
  		return -ENOMEM;
-diff -urNp linux-3.0.9/drivers/scsi/pmcraid.c linux-3.0.9/drivers/scsi/pmcraid.c
---- linux-3.0.9/drivers/scsi/pmcraid.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/pmcraid.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/pmcraid.c linux-3.1.1/drivers/scsi/pmcraid.c
+--- linux-3.1.1/drivers/scsi/pmcraid.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/pmcraid.c	2011-11-16 18:39:07.000000000 -0500
 @@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc
  		res->scsi_dev = scsi_dev;
  		scsi_dev->hostdata = res;
@@ -34375,9 +34364,9 @@ diff -urNp linux-3.0.9/drivers/scsi/pmcraid.c linux-3.0.9/drivers/scsi/pmcraid.c
  	schedule_work(&pinstance->worker_q);
  	return rc;
  
-diff -urNp linux-3.0.9/drivers/scsi/pmcraid.h linux-3.0.9/drivers/scsi/pmcraid.h
---- linux-3.0.9/drivers/scsi/pmcraid.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/pmcraid.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/pmcraid.h linux-3.1.1/drivers/scsi/pmcraid.h
+--- linux-3.1.1/drivers/scsi/pmcraid.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/pmcraid.h	2011-11-16 18:39:07.000000000 -0500
 @@ -749,7 +749,7 @@ struct pmcraid_instance {
  	struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
  
@@ -34407,9 +34396,9 @@ diff -urNp linux-3.0.9/drivers/scsi/pmcraid.h linux-3.0.9/drivers/scsi/pmcraid.h
  
  	/* To indicate add/delete/modify during CCN */
  	u8 change_detected;
-diff -urNp linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h
---- linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/qla2xxx/qla_def.h linux-3.1.1/drivers/scsi/qla2xxx/qla_def.h
+--- linux-3.1.1/drivers/scsi/qla2xxx/qla_def.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/qla2xxx/qla_def.h	2011-11-16 18:39:07.000000000 -0500
 @@ -2244,7 +2244,7 @@ struct isp_operations {
  	int (*get_flash_version) (struct scsi_qla_host *, void *);
  	int (*start_scsi) (srb_t *);
@@ -34419,9 +34408,9 @@ diff -urNp linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h linux-3.0.9/drivers/scsi/q
  
  /* MSI-X Support *************************************************************/
  
-diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h
---- linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/qla4xxx/ql4_def.h linux-3.1.1/drivers/scsi/qla4xxx/ql4_def.h
+--- linux-3.1.1/drivers/scsi/qla4xxx/ql4_def.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/qla4xxx/ql4_def.h	2011-11-16 18:39:07.000000000 -0500
 @@ -256,7 +256,7 @@ struct ddb_entry {
  	atomic_t retry_relogin_timer; /* Min Time between relogins
  				       * (4000 only) */
@@ -34431,9 +34420,9 @@ diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.9/drivers/scsi/q
  				       * retried */
  
  	uint16_t port;
-diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c
---- linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/qla4xxx/ql4_init.c linux-3.1.1/drivers/scsi/qla4xxx/ql4_init.c
+--- linux-3.1.1/drivers/scsi/qla4xxx/ql4_init.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/qla4xxx/ql4_init.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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);
@@ -34452,9 +34441,9 @@ diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.9/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.9/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c
---- linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/qla4xxx/ql4_os.c linux-3.1.1/drivers/scsi/qla4xxx/ql4_os.c
+--- linux-3.1.1/drivers/scsi/qla4xxx/ql4_os.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/qla4xxx/ql4_os.c	2011-11-16 18:39:07.000000000 -0500
 @@ -811,13 +811,13 @@ static void qla4xxx_timer(struct scsi_ql
  			    ddb_entry->fw_ddb_device_state ==
  			    DDB_DS_SESSION_FAILED) {
@@ -34471,9 +34460,9 @@ diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.9/drivers/scsi/ql
  							  relogin_retry_count))
  					);
  				start_dpc++;
-diff -urNp linux-3.0.9/drivers/scsi/scsi.c linux-3.0.9/drivers/scsi/scsi.c
---- linux-3.0.9/drivers/scsi/scsi.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/scsi.c linux-3.1.1/drivers/scsi/scsi.c
+--- linux-3.1.1/drivers/scsi/scsi.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi.c	2011-11-16 18:39:07.000000000 -0500
 @@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
  	unsigned long timeout;
  	int rtn = 0;
@@ -34483,9 +34472,9 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi.c linux-3.0.9/drivers/scsi/scsi.c
  
  	/* check if the device is still usable */
  	if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
-diff -urNp linux-3.0.9/drivers/scsi/scsi_debug.c linux-3.0.9/drivers/scsi/scsi_debug.c
---- linux-3.0.9/drivers/scsi/scsi_debug.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_debug.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/scsi_debug.c linux-3.1.1/drivers/scsi/scsi_debug.c
+--- linux-3.1.1/drivers/scsi/scsi_debug.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_debug.c	2011-11-16 18:40:22.000000000 -0500
 @@ -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;
@@ -34504,10 +34493,10 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_debug.c linux-3.0.9/drivers/scsi/scsi_d
  	if ((errsts = check_readiness(scp, 1, devip)))
  		return errsts;
  	memset(arr, 0, sizeof(arr));
-diff -urNp linux-3.0.9/drivers/scsi/scsi_lib.c linux-3.0.9/drivers/scsi/scsi_lib.c
---- linux-3.0.9/drivers/scsi/scsi_lib.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_lib.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1412,7 +1412,7 @@ static void scsi_kill_request(struct req
+diff -urNp linux-3.1.1/drivers/scsi/scsi_lib.c linux-3.1.1/drivers/scsi/scsi_lib.c
+--- linux-3.1.1/drivers/scsi/scsi_lib.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_lib.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1413,7 +1413,7 @@ static void scsi_kill_request(struct req
  	shost = sdev->host;
  	scsi_init_cmd_errh(cmd);
  	cmd->result = DID_NO_CONNECT << 16;
@@ -34516,7 +34505,7 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_lib.c linux-3.0.9/drivers/scsi/scsi_lib
  
  	/*
  	 * SCSI request completion path will do scsi_device_unbusy(),
-@@ -1438,9 +1438,9 @@ static void scsi_softirq_done(struct req
+@@ -1439,9 +1439,9 @@ static void scsi_softirq_done(struct req
  
  	INIT_LIST_HEAD(&cmd->eh_entry);
  
@@ -34528,9 +34517,9 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_lib.c linux-3.0.9/drivers/scsi/scsi_lib
  
  	disposition = scsi_decide_disposition(cmd);
  	if (disposition != SUCCESS &&
-diff -urNp linux-3.0.9/drivers/scsi/scsi_sysfs.c linux-3.0.9/drivers/scsi/scsi_sysfs.c
---- linux-3.0.9/drivers/scsi/scsi_sysfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_sysfs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/scsi_sysfs.c linux-3.1.1/drivers/scsi/scsi_sysfs.c
+--- linux-3.1.1/drivers/scsi/scsi_sysfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_sysfs.c	2011-11-16 18:39:07.000000000 -0500
 @@ -622,7 +622,7 @@ show_iostat_##field(struct device *dev, 
  		    char *buf)						\
  {									\
@@ -34540,9 +34529,9 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_sysfs.c linux-3.0.9/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.9/drivers/scsi/scsi_tgt_lib.c linux-3.0.9/drivers/scsi/scsi_tgt_lib.c
---- linux-3.0.9/drivers/scsi/scsi_tgt_lib.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_tgt_lib.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/scsi_tgt_lib.c linux-3.1.1/drivers/scsi/scsi_tgt_lib.c
+--- linux-3.1.1/drivers/scsi/scsi_tgt_lib.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_tgt_lib.c	2011-11-16 18:39:07.000000000 -0500
 @@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct sc
  	int err;
  
@@ -34552,9 +34541,9 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_tgt_lib.c linux-3.0.9/drivers/scsi/scsi
  	if (err) {
  		/*
  		 * TODO: need to fixup sg_tablesize, max_segment_size,
-diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_fc.c linux-3.0.9/drivers/scsi/scsi_transport_fc.c
---- linux-3.0.9/drivers/scsi/scsi_transport_fc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_transport_fc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/scsi_transport_fc.c linux-3.1.1/drivers/scsi/scsi_transport_fc.c
+--- linux-3.1.1/drivers/scsi/scsi_transport_fc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_transport_fc.c	2011-11-16 18:39:07.000000000 -0500
 @@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_
   * Netlink Infrastructure
   */
@@ -34591,9 +34580,9 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_fc.c linux-3.0.9/drivers/scsi
  		return -EINVAL;
  	/*
  	 * Check for overflow; dev_loss_tmo is u32
-diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c
---- linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/scsi_transport_iscsi.c linux-3.1.1/drivers/scsi/scsi_transport_iscsi.c
+--- linux-3.1.1/drivers/scsi/scsi_transport_iscsi.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_transport_iscsi.c	2011-11-16 18:39:07.000000000 -0500
 @@ -83,7 +83,7 @@ struct iscsi_internal {
  	struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
  };
@@ -34621,9 +34610,9 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c linux-3.0.9/drivers/s
  
  	err = class_register(&iscsi_transport_class);
  	if (err)
-diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_srp.c linux-3.0.9/drivers/scsi/scsi_transport_srp.c
---- linux-3.0.9/drivers/scsi/scsi_transport_srp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_transport_srp.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/scsi_transport_srp.c linux-3.1.1/drivers/scsi/scsi_transport_srp.c
+--- linux-3.1.1/drivers/scsi/scsi_transport_srp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_transport_srp.c	2011-11-16 18:39:07.000000000 -0500
 @@ -33,7 +33,7 @@
  #include "scsi_transport_srp_internal.h"
  
@@ -34651,9 +34640,9 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_srp.c linux-3.0.9/drivers/scs
  	dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
  
  	transport_setup_device(&rport->dev);
-diff -urNp linux-3.0.9/drivers/scsi/sg.c linux-3.0.9/drivers/scsi/sg.c
---- linux-3.0.9/drivers/scsi/sg.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/sg.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/sg.c linux-3.1.1/drivers/scsi/sg.c
+--- linux-3.1.1/drivers/scsi/sg.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/sg.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1075,7 +1075,7 @@ sg_ioctl(struct file *filp, unsigned int
  				       sdp->disk->disk_name,
  				       MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
@@ -34681,9 +34670,9 @@ diff -urNp linux-3.0.9/drivers/scsi/sg.c linux-3.0.9/drivers/scsi/sg.c
  
  	sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
  	if (!sg_proc_sgp)
-diff -urNp linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c
---- linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.1.1/drivers/scsi/sym53c8xx_2/sym_glue.c
+--- linux-3.1.1/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-11-16 18:40:22.000000000 -0500
 @@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p
  	int do_iounmap = 0;
  	int do_disable_device = 1;
@@ -34693,9 +34682,9 @@ diff -urNp linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.9/drivers/s
  	memset(&sym_dev, 0, sizeof(sym_dev));
  	memset(&nvram, 0, sizeof(nvram));
  	sym_dev.pdev = pdev;
-diff -urNp linux-3.0.9/drivers/scsi/vmw_pvscsi.c linux-3.0.9/drivers/scsi/vmw_pvscsi.c
---- linux-3.0.9/drivers/scsi/vmw_pvscsi.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/vmw_pvscsi.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/scsi/vmw_pvscsi.c linux-3.1.1/drivers/scsi/vmw_pvscsi.c
+--- linux-3.1.1/drivers/scsi/vmw_pvscsi.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/vmw_pvscsi.c	2011-11-16 18:40:22.000000000 -0500
 @@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const
  	dma_addr_t base;
  	unsigned i;
@@ -34705,21 +34694,9 @@ diff -urNp linux-3.0.9/drivers/scsi/vmw_pvscsi.c linux-3.0.9/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.9/drivers/spi/dw_spi_pci.c linux-3.0.9/drivers/spi/dw_spi_pci.c
---- linux-3.0.9/drivers/spi/dw_spi_pci.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/spi/dw_spi_pci.c	2011-11-15 20:02:59.000000000 -0500
-@@ -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.9/drivers/spi/spi.c linux-3.0.9/drivers/spi/spi.c
---- linux-3.0.9/drivers/spi/spi.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/spi/spi.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/spi/spi.c linux-3.1.1/drivers/spi/spi.c
+--- linux-3.1.1/drivers/spi/spi.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/spi/spi.c	2011-11-16 18:39:07.000000000 -0500
 @@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma
  EXPORT_SYMBOL_GPL(spi_bus_unlock);
  
@@ -34729,9 +34706,21 @@ diff -urNp linux-3.0.9/drivers/spi/spi.c linux-3.0.9/drivers/spi/spi.c
  
  static u8	*buf;
  
-diff -urNp linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c
---- linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/spi/spi-dw-pci.c linux-3.1.1/drivers/spi/spi-dw-pci.c
+--- linux-3.1.1/drivers/spi/spi-dw-pci.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/spi/spi-dw-pci.c	2011-11-16 18:39:07.000000000 -0500
+@@ -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.1.1/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.1.1/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+--- linux-3.1.1/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-11-16 18:39:07.000000000 -0500
 @@ -362,7 +362,7 @@ static struct ar_cookie s_ar_cookie_mem[
          (((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0))
  
@@ -34741,9 +34730,9 @@ diff -urNp linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.9/
      .ndo_init               = NULL,
      .ndo_open               = ar6000_open,
      .ndo_stop               = ar6000_close,
-diff -urNp linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
---- linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.1.1/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
+--- linux-3.1.1/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-11-16 18:39:07.000000000 -0500
 @@ -30,7 +30,7 @@ typedef bool (*ar6k_pal_recv_pkt_t)(void
  typedef struct ar6k_pal_config_s
  {
@@ -34753,99 +34742,99 @@ diff -urNp linux-3.0.9/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.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
---- linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-11-15 20:02:59.000000000 -0500
-@@ -853,14 +853,14 @@ static void dhd_op_if(dhd_if_t *ifp)
+diff -urNp linux-3.1.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.1.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+--- linux-3.1.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-11-16 18:39:07.000000000 -0500
+@@ -451,14 +451,14 @@ static void brcmf_op_if(struct brcmf_if 
  			free_netdev(ifp->net);
  		}
  		/* Allocate etherdev, including space for private structure */
--		ifp->net = alloc_etherdev(sizeof(dhd));
-+		ifp->net = alloc_etherdev(sizeof(*dhd));
+-		ifp->net = alloc_etherdev(sizeof(drvr_priv));
++		ifp->net = alloc_etherdev(sizeof(*drvr_priv));
  		if (!ifp->net) {
- 			DHD_ERROR(("%s: OOM - alloc_etherdev\n", __func__));
+ 			BRCMF_ERROR(("%s: OOM - alloc_etherdev\n", __func__));
  			ret = -ENOMEM;
  		}
  		if (ret == 0) {
  			strcpy(ifp->net->name, ifp->name);
--			memcpy(netdev_priv(ifp->net), &dhd, sizeof(dhd));
-+			memcpy(netdev_priv(ifp->net), dhd, sizeof(*dhd));
- 			err = dhd_net_attach(&dhd->pub, ifp->idx);
+-			memcpy(netdev_priv(ifp->net), &drvr_priv, sizeof(drvr_priv));
++			memcpy(netdev_priv(ifp->net), &drvr_priv, sizeof(*drvr_priv));
+ 			err = brcmf_net_attach(&drvr_priv->pub, ifp->idx);
  			if (err != 0) {
- 				DHD_ERROR(("%s: dhd_net_attach failed, "
-@@ -1872,7 +1872,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu
- 		strcpy(nv_path, nvram_path);
+ 				BRCMF_ERROR(("%s: brcmf_net_attach failed, "
+@@ -1279,7 +1279,7 @@ struct brcmf_pub *brcmf_attach(struct br
+ 	BRCMF_TRACE(("%s: Enter\n", __func__));
  
  	/* Allocate etherdev, including space for private structure */
--	net = alloc_etherdev(sizeof(dhd));
-+	net = alloc_etherdev(sizeof(*dhd));
+-	net = alloc_etherdev(sizeof(drvr_priv));
++	net = alloc_etherdev(sizeof(*drvr_priv));
  	if (!net) {
- 		DHD_ERROR(("%s: OOM - alloc_etherdev\n", __func__));
+ 		BRCMF_ERROR(("%s: OOM - alloc_etherdev\n", __func__));
  		goto fail;
-@@ -1888,7 +1888,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu
+@@ -1295,7 +1295,7 @@ struct brcmf_pub *brcmf_attach(struct br
  	/*
- 	 * Save the dhd_info into the priv
+ 	 * Save the brcmf_info into the priv
  	 */
--	memcpy(netdev_priv(net), &dhd, sizeof(dhd));
-+	memcpy(netdev_priv(net), dhd, sizeof(*dhd));
+-	memcpy(netdev_priv(net), &drvr_priv, sizeof(drvr_priv));
++	memcpy(netdev_priv(net), &drvr_priv, sizeof(*drvr_priv));
  
  	/* Set network interface name if it was provided as module parameter */
  	if (iface_name[0]) {
-@@ -2004,7 +2004,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu
+@@ -1352,7 +1352,7 @@ struct brcmf_pub *brcmf_attach(struct br
  	/*
- 	 * Save the dhd_info into the priv
+ 	 * Save the brcmf_info into the priv
  	 */
--	memcpy(netdev_priv(net), &dhd, sizeof(dhd));
-+	memcpy(netdev_priv(net), dhd, sizeof(*dhd));
- 
- #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
- 	g_bus = bus;
-diff -urNp linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h
---- linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h	2011-11-15 20:02:59.000000000 -0500
-@@ -593,7 +593,7 @@ struct phy_func_ptr {
+-	memcpy(netdev_priv(net), &drvr_priv, sizeof(drvr_priv));
++	memcpy(netdev_priv(net), &drvr_priv, sizeof(*drvr_priv));
+ 
+ #if defined(CONFIG_PM_SLEEP)
+ 	atomic_set(&brcmf_mmc_suspend, false);
+diff -urNp linux-3.1.1/drivers/staging/brcm80211/brcmfmac/sdio_host.h linux-3.1.1/drivers/staging/brcm80211/brcmfmac/sdio_host.h
+--- linux-3.1.1/drivers/staging/brcm80211/brcmfmac/sdio_host.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/brcm80211/brcmfmac/sdio_host.h	2011-11-16 18:39:07.000000000 -0500
+@@ -263,7 +263,7 @@ struct brcmf_sdioh_driver {
+ 			 u16 func, uint bustype, u32 regsva, void *param);
+ 	/* detach from device */
+ 	void (*detach) (void *ch);
+-};
++} __no_const;
+ 
+ struct sdioh_info;
+ 
+diff -urNp linux-3.1.1/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h linux-3.1.1/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
+--- linux-3.1.1/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h	2011-11-16 18:39:07.000000000 -0500
+@@ -591,7 +591,7 @@ struct phy_func_ptr {
  	initfn_t carrsuppr;
  	rxsigpwrfn_t rxsigpwr;
  	detachfn_t detach;
 -};
 +} __no_const;
- typedef struct phy_func_ptr phy_func_ptr_t;
- 
- struct phy_info {
-diff -urNp linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h
---- linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h	2011-11-15 20:02:59.000000000 -0500
-@@ -185,7 +185,7 @@ typedef struct {
- 			 u16 func, uint bustype, void *regsva, void *param);
- 	/* detach from device */
- 	void (*detach) (void *ch);
--} bcmsdh_driver_t;
-+} __no_const bcmsdh_driver_t;
- 
- /* platform specific/high level functions */
- extern int bcmsdh_register(bcmsdh_driver_t *driver);
-diff -urNp linux-3.0.9/drivers/staging/et131x/et1310_tx.c linux-3.0.9/drivers/staging/et131x/et1310_tx.c
---- linux-3.0.9/drivers/staging/et131x/et1310_tx.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/et131x/et1310_tx.c	2011-11-15 20:02:59.000000000 -0500
+ 
+ struct brcms_phy {
+ 	struct brcms_phy_pub pubpi_ro;
+diff -urNp linux-3.1.1/drivers/staging/et131x/et1310_tx.c linux-3.1.1/drivers/staging/et131x/et1310_tx.c
+--- linux-3.1.1/drivers/staging/et131x/et1310_tx.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/et131x/et1310_tx.c	2011-11-16 18:39:07.000000000 -0500
 @@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru
  	struct net_device_stats *stats = &etdev->net_stats;
  
  	if (tcb->flags & fMP_DEST_BROAD)
--		atomic_inc(&etdev->Stats.brdcstxmt);
-+		atomic_inc_unchecked(&etdev->Stats.brdcstxmt);
+-		atomic_inc(&etdev->stats.brdcstxmt);
++		atomic_inc_unchecked(&etdev->stats.brdcstxmt);
  	else if (tcb->flags & fMP_DEST_MULTI)
--		atomic_inc(&etdev->Stats.multixmt);
-+		atomic_inc_unchecked(&etdev->Stats.multixmt);
+-		atomic_inc(&etdev->stats.multixmt);
++		atomic_inc_unchecked(&etdev->stats.multixmt);
  	else
--		atomic_inc(&etdev->Stats.unixmt);
-+		atomic_inc_unchecked(&etdev->Stats.unixmt);
+-		atomic_inc(&etdev->stats.unixmt);
++		atomic_inc_unchecked(&etdev->stats.unixmt);
  
  	if (tcb->skb) {
  		stats->tx_bytes += tcb->skb->len;
-diff -urNp linux-3.0.9/drivers/staging/et131x/et131x_adapter.h linux-3.0.9/drivers/staging/et131x/et131x_adapter.h
---- linux-3.0.9/drivers/staging/et131x/et131x_adapter.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/et131x/et131x_adapter.h	2011-11-15 20:02:59.000000000 -0500
-@@ -110,11 +110,11 @@ typedef struct _ce_stats_t {
+diff -urNp linux-3.1.1/drivers/staging/et131x/et131x_adapter.h linux-3.1.1/drivers/staging/et131x/et131x_adapter.h
+--- linux-3.1.1/drivers/staging/et131x/et131x_adapter.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/et131x/et131x_adapter.h	2011-11-16 18:39:07.000000000 -0500
+@@ -106,11 +106,11 @@ struct ce_stats {
  	 * operations
  	 */
  	u32 unircv;	/* # multicast packets received */
@@ -34860,10 +34849,10 @@ diff -urNp linux-3.0.9/drivers/staging/et131x/et131x_adapter.h linux-3.0.9/drive
  	u32 norcvbuf;	/* # Rx packets discarded */
  	u32 noxmtbuf;	/* # Tx packets discarded */
  
-diff -urNp linux-3.0.9/drivers/staging/hv/channel.c linux-3.0.9/drivers/staging/hv/channel.c
---- linux-3.0.9/drivers/staging/hv/channel.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/hv/channel.c	2011-11-15 20:02:59.000000000 -0500
-@@ -433,8 +433,8 @@ int vmbus_establish_gpadl(struct vmbus_c
+diff -urNp linux-3.1.1/drivers/staging/hv/channel.c linux-3.1.1/drivers/staging/hv/channel.c
+--- linux-3.1.1/drivers/staging/hv/channel.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/hv/channel.c	2011-11-16 18:39:07.000000000 -0500
+@@ -447,8 +447,8 @@ int vmbus_establish_gpadl(struct vmbus_c
  	int ret = 0;
  	int t;
  
@@ -34874,9 +34863,9 @@ diff -urNp linux-3.0.9/drivers/staging/hv/channel.c linux-3.0.9/drivers/staging/
  
  	ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
  	if (ret)
-diff -urNp linux-3.0.9/drivers/staging/hv/hv.c linux-3.0.9/drivers/staging/hv/hv.c
---- linux-3.0.9/drivers/staging/hv/hv.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/hv/hv.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/hv/hv.c linux-3.1.1/drivers/staging/hv/hv.c
+--- linux-3.1.1/drivers/staging/hv/hv.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/hv/hv.c	2011-11-16 18:39:07.000000000 -0500
 @@ -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;
@@ -34886,10 +34875,10 @@ diff -urNp linux-3.0.9/drivers/staging/hv/hv.c linux-3.0.9/drivers/staging/hv/hv
  
  	__asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
  			      "=a"(hv_status_lo) : "d" (control_hi),
-diff -urNp linux-3.0.9/drivers/staging/hv/hv_mouse.c linux-3.0.9/drivers/staging/hv/hv_mouse.c
---- linux-3.0.9/drivers/staging/hv/hv_mouse.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/hv/hv_mouse.c	2011-11-15 20:02:59.000000000 -0500
-@@ -879,8 +879,10 @@ static void reportdesc_callback(struct h
+diff -urNp linux-3.1.1/drivers/staging/hv/hv_mouse.c linux-3.1.1/drivers/staging/hv/hv_mouse.c
+--- linux-3.1.1/drivers/staging/hv/hv_mouse.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/hv/hv_mouse.c	2011-11-16 18:39:07.000000000 -0500
+@@ -878,8 +878,10 @@ static void reportdesc_callback(struct h
  	if (hid_dev) {
  		DPRINT_INFO(INPUTVSC_DRV, "hid_device created");
  
@@ -34902,9 +34891,9 @@ diff -urNp linux-3.0.9/drivers/staging/hv/hv_mouse.c linux-3.0.9/drivers/staging
  
  		hid_dev->bus = BUS_VIRTUAL;
  		hid_dev->vendor = input_device_ctx->device_info.vendor;
-diff -urNp linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h
---- linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/hv/hyperv_vmbus.h linux-3.1.1/drivers/staging/hv/hyperv_vmbus.h
+--- linux-3.1.1/drivers/staging/hv/hyperv_vmbus.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/hv/hyperv_vmbus.h	2011-11-16 18:39:07.000000000 -0500
 @@ -559,7 +559,7 @@ enum vmbus_connect_state {
  struct vmbus_connection {
  	enum vmbus_connect_state conn_state;
@@ -34914,9 +34903,9 @@ diff -urNp linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h linux-3.0.9/drivers/sta
  
  	/*
  	 * Represents channel interrupts. Each bit position represents a
-diff -urNp linux-3.0.9/drivers/staging/hv/rndis_filter.c linux-3.0.9/drivers/staging/hv/rndis_filter.c
---- linux-3.0.9/drivers/staging/hv/rndis_filter.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/hv/rndis_filter.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/hv/rndis_filter.c linux-3.1.1/drivers/staging/hv/rndis_filter.c
+--- linux-3.1.1/drivers/staging/hv/rndis_filter.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/hv/rndis_filter.c	2011-11-16 18:39:07.000000000 -0500
 @@ -43,7 +43,7 @@ struct rndis_device {
  
  	enum rndis_device_state state;
@@ -34935,7 +34924,7 @@ diff -urNp linux-3.0.9/drivers/staging/hv/rndis_filter.c linux-3.0.9/drivers/sta
  
  	/* Add to the request list */
  	spin_lock_irqsave(&dev->request_lock, flags);
-@@ -637,7 +637,7 @@ static void rndis_filter_halt_device(str
+@@ -622,7 +622,7 @@ static void rndis_filter_halt_device(str
  
  	/* Setup the rndis set */
  	halt = &request->request_msg.msg.halt_req;
@@ -34944,10 +34933,10 @@ diff -urNp linux-3.0.9/drivers/staging/hv/rndis_filter.c linux-3.0.9/drivers/sta
  
  	/* Ignore return since this msg is optional. */
  	rndis_filter_send_request(dev, request);
-diff -urNp linux-3.0.9/drivers/staging/hv/vmbus_drv.c linux-3.0.9/drivers/staging/hv/vmbus_drv.c
---- linux-3.0.9/drivers/staging/hv/vmbus_drv.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/hv/vmbus_drv.c	2011-11-15 20:02:59.000000000 -0500
-@@ -668,11 +668,11 @@ int vmbus_child_device_register(struct h
+diff -urNp linux-3.1.1/drivers/staging/hv/vmbus_drv.c linux-3.1.1/drivers/staging/hv/vmbus_drv.c
+--- linux-3.1.1/drivers/staging/hv/vmbus_drv.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/hv/vmbus_drv.c	2011-11-16 18:39:07.000000000 -0500
+@@ -660,11 +660,11 @@ int vmbus_child_device_register(struct h
  {
  	int ret = 0;
  
@@ -34961,9 +34950,9 @@ diff -urNp linux-3.0.9/drivers/staging/hv/vmbus_drv.c linux-3.0.9/drivers/stagin
  
  	/* The new device belongs to this bus */
  	child_device_obj->device.bus = &hv_bus; /* device->dev.bus; */
-diff -urNp linux-3.0.9/drivers/staging/iio/ring_generic.h linux-3.0.9/drivers/staging/iio/ring_generic.h
---- linux-3.0.9/drivers/staging/iio/ring_generic.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/iio/ring_generic.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/iio/ring_generic.h linux-3.1.1/drivers/staging/iio/ring_generic.h
+--- linux-3.1.1/drivers/staging/iio/ring_generic.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/iio/ring_generic.h	2011-11-16 18:39:07.000000000 -0500
 @@ -62,7 +62,7 @@ struct iio_ring_access_funcs {
  
  	int (*is_enabled)(struct iio_ring_buffer *ring);
@@ -34973,9 +34962,9 @@ diff -urNp linux-3.0.9/drivers/staging/iio/ring_generic.h linux-3.0.9/drivers/st
  
  struct iio_ring_setup_ops {
  	int				(*preenable)(struct iio_dev *);
-diff -urNp linux-3.0.9/drivers/staging/octeon/ethernet.c linux-3.0.9/drivers/staging/octeon/ethernet.c
---- linux-3.0.9/drivers/staging/octeon/ethernet.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/octeon/ethernet.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/octeon/ethernet.c linux-3.1.1/drivers/staging/octeon/ethernet.c
+--- linux-3.1.1/drivers/staging/octeon/ethernet.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/octeon/ethernet.c	2011-11-16 18:39:07.000000000 -0500
 @@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_
  		 * since the RX tasklet also increments it.
  		 */
@@ -34992,10 +34981,10 @@ diff -urNp linux-3.0.9/drivers/staging/octeon/ethernet.c linux-3.0.9/drivers/sta
  #endif
  	}
  
-diff -urNp linux-3.0.9/drivers/staging/octeon/ethernet-rx.c linux-3.0.9/drivers/staging/octeon/ethernet-rx.c
---- linux-3.0.9/drivers/staging/octeon/ethernet-rx.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/octeon/ethernet-rx.c	2011-11-15 20:02:59.000000000 -0500
-@@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi
+diff -urNp linux-3.1.1/drivers/staging/octeon/ethernet-rx.c linux-3.1.1/drivers/staging/octeon/ethernet-rx.c
+--- linux-3.1.1/drivers/staging/octeon/ethernet-rx.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/octeon/ethernet-rx.c	2011-11-16 18:39:07.000000000 -0500
+@@ -420,11 +420,11 @@ static int cvm_oct_napi_poll(struct napi
  				/* Increment RX stats for virtual ports */
  				if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
  #ifdef CONFIG_64BIT
@@ -35011,7 +35000,7 @@ diff -urNp linux-3.0.9/drivers/staging/octeon/ethernet-rx.c linux-3.0.9/drivers/
  #endif
  				}
  				netif_receive_skb(skb);
-@@ -433,9 +433,9 @@ static int cvm_oct_napi_poll(struct napi
+@@ -436,9 +436,9 @@ static int cvm_oct_napi_poll(struct napi
  					   dev->name);
  				*/
  #ifdef CONFIG_64BIT
@@ -35023,10 +35012,10 @@ diff -urNp linux-3.0.9/drivers/staging/octeon/ethernet-rx.c linux-3.0.9/drivers/
  #endif
  				dev_kfree_skb_irq(skb);
  			}
-diff -urNp linux-3.0.9/drivers/staging/pohmelfs/inode.c linux-3.0.9/drivers/staging/pohmelfs/inode.c
---- linux-3.0.9/drivers/staging/pohmelfs/inode.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/pohmelfs/inode.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1856,7 +1856,7 @@ static int pohmelfs_fill_super(struct su
+diff -urNp linux-3.1.1/drivers/staging/pohmelfs/inode.c linux-3.1.1/drivers/staging/pohmelfs/inode.c
+--- linux-3.1.1/drivers/staging/pohmelfs/inode.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/pohmelfs/inode.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1861,7 +1861,7 @@ static int pohmelfs_fill_super(struct su
  	mutex_init(&psb->mcache_lock);
  	psb->mcache_root = RB_ROOT;
  	psb->mcache_timeout = msecs_to_jiffies(5000);
@@ -35035,7 +35024,7 @@ diff -urNp linux-3.0.9/drivers/staging/pohmelfs/inode.c linux-3.0.9/drivers/stag
  
  	psb->trans_max_pages = 100;
  
-@@ -1871,7 +1871,7 @@ static int pohmelfs_fill_super(struct su
+@@ -1876,7 +1876,7 @@ static int pohmelfs_fill_super(struct su
  	INIT_LIST_HEAD(&psb->crypto_ready_list);
  	INIT_LIST_HEAD(&psb->crypto_active_list);
  
@@ -35044,9 +35033,9 @@ diff -urNp linux-3.0.9/drivers/staging/pohmelfs/inode.c linux-3.0.9/drivers/stag
  	atomic_long_set(&psb->total_inodes, 0);
  
  	mutex_init(&psb->state_lock);
-diff -urNp linux-3.0.9/drivers/staging/pohmelfs/mcache.c linux-3.0.9/drivers/staging/pohmelfs/mcache.c
---- linux-3.0.9/drivers/staging/pohmelfs/mcache.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/pohmelfs/mcache.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/pohmelfs/mcache.c linux-3.1.1/drivers/staging/pohmelfs/mcache.c
+--- linux-3.1.1/drivers/staging/pohmelfs/mcache.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/pohmelfs/mcache.c	2011-11-16 18:39:07.000000000 -0500
 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
  	m->data = data;
  	m->start = start;
@@ -35056,9 +35045,9 @@ diff -urNp linux-3.0.9/drivers/staging/pohmelfs/mcache.c linux-3.0.9/drivers/sta
  
  	mutex_lock(&psb->mcache_lock);
  	err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-3.0.9/drivers/staging/pohmelfs/netfs.h linux-3.0.9/drivers/staging/pohmelfs/netfs.h
---- linux-3.0.9/drivers/staging/pohmelfs/netfs.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/pohmelfs/netfs.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/pohmelfs/netfs.h linux-3.1.1/drivers/staging/pohmelfs/netfs.h
+--- linux-3.1.1/drivers/staging/pohmelfs/netfs.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/pohmelfs/netfs.h	2011-11-16 18:39:07.000000000 -0500
 @@ -571,14 +571,14 @@ struct pohmelfs_config;
  struct pohmelfs_sb {
  	struct rb_root		mcache_root;
@@ -35076,9 +35065,9 @@ diff -urNp linux-3.0.9/drivers/staging/pohmelfs/netfs.h linux-3.0.9/drivers/stag
  
  	unsigned int		crypto_attached_size;
  	unsigned int		crypto_align_size;
-diff -urNp linux-3.0.9/drivers/staging/pohmelfs/trans.c linux-3.0.9/drivers/staging/pohmelfs/trans.c
---- linux-3.0.9/drivers/staging/pohmelfs/trans.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/pohmelfs/trans.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/pohmelfs/trans.c linux-3.1.1/drivers/staging/pohmelfs/trans.c
+--- linux-3.1.1/drivers/staging/pohmelfs/trans.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/pohmelfs/trans.c	2011-11-16 18:39:07.000000000 -0500
 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
  	int err;
  	struct netfs_cmd *cmd = t->iovec.iov_base;
@@ -35088,9 +35077,9 @@ diff -urNp linux-3.0.9/drivers/staging/pohmelfs/trans.c linux-3.0.9/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.9/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h
---- linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/rtl8712/rtl871x_io.h linux-3.1.1/drivers/staging/rtl8712/rtl871x_io.h
+--- linux-3.1.1/drivers/staging/rtl8712/rtl871x_io.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/rtl8712/rtl871x_io.h	2011-11-16 18:39:07.000000000 -0500
 @@ -83,7 +83,7 @@ struct	_io_ops {
  			  u8 *pmem);
  	u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
@@ -35100,9 +35089,9 @@ diff -urNp linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.9/drivers/
  
  struct io_req {
  	struct list_head list;
-diff -urNp linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c
---- linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/sbe-2t3e3/netdev.c linux-3.1.1/drivers/staging/sbe-2t3e3/netdev.c
+--- linux-3.1.1/drivers/staging/sbe-2t3e3/netdev.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/sbe-2t3e3/netdev.c	2011-11-16 18:39:08.000000000 -0500
 @@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, s
  	t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
  
@@ -35112,22 +35101,10 @@ diff -urNp linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.9/drivers/st
  			return -EFAULT;
  
  	return 0;
-diff -urNp linux-3.0.9/drivers/staging/tty/stallion.c linux-3.0.9/drivers/staging/tty/stallion.c
---- linux-3.0.9/drivers/staging/tty/stallion.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/tty/stallion.c	2011-11-15 20:02:59.000000000 -0500
-@@ -2406,6 +2406,8 @@ static int stl_getportstruct(struct stlp
- 	struct stlport	stl_dummyport;
- 	struct stlport	*portp;
- 
-+	pax_track_stack();
-+
- 	if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
- 		return -EFAULT;
- 	portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
-diff -urNp linux-3.0.9/drivers/staging/usbip/usbip_common.h linux-3.0.9/drivers/staging/usbip/usbip_common.h
---- linux-3.0.9/drivers/staging/usbip/usbip_common.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/usbip/usbip_common.h	2011-11-15 20:02:59.000000000 -0500
-@@ -315,7 +315,7 @@ struct usbip_device {
+diff -urNp linux-3.1.1/drivers/staging/usbip/usbip_common.h linux-3.1.1/drivers/staging/usbip/usbip_common.h
+--- linux-3.1.1/drivers/staging/usbip/usbip_common.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/usbip/usbip_common.h	2011-11-16 18:39:08.000000000 -0500
+@@ -289,7 +289,7 @@ struct usbip_device {
  		void (*shutdown)(struct usbip_device *);
  		void (*reset)(struct usbip_device *);
  		void (*unusable)(struct usbip_device *);
@@ -35135,11 +35112,11 @@ diff -urNp linux-3.0.9/drivers/staging/usbip/usbip_common.h linux-3.0.9/drivers/
 +	} __no_const eh_ops;
  };
  
- void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd,
-diff -urNp linux-3.0.9/drivers/staging/usbip/vhci.h linux-3.0.9/drivers/staging/usbip/vhci.h
---- linux-3.0.9/drivers/staging/usbip/vhci.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/usbip/vhci.h	2011-11-15 20:02:59.000000000 -0500
-@@ -94,7 +94,7 @@ struct vhci_hcd {
+ #if 0
+diff -urNp linux-3.1.1/drivers/staging/usbip/vhci.h linux-3.1.1/drivers/staging/usbip/vhci.h
+--- linux-3.1.1/drivers/staging/usbip/vhci.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/usbip/vhci.h	2011-11-16 18:39:08.000000000 -0500
+@@ -85,7 +85,7 @@ struct vhci_hcd {
  	unsigned resuming:1;
  	unsigned long re_timeout;
  
@@ -35148,10 +35125,10 @@ diff -urNp linux-3.0.9/drivers/staging/usbip/vhci.h linux-3.0.9/drivers/staging/
  
  	/*
  	 * NOTE:
-diff -urNp linux-3.0.9/drivers/staging/usbip/vhci_hcd.c linux-3.0.9/drivers/staging/usbip/vhci_hcd.c
---- linux-3.0.9/drivers/staging/usbip/vhci_hcd.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/usbip/vhci_hcd.c	2011-11-15 20:02:59.000000000 -0500
-@@ -511,7 +511,7 @@ static void vhci_tx_urb(struct urb *urb)
+diff -urNp linux-3.1.1/drivers/staging/usbip/vhci_hcd.c linux-3.1.1/drivers/staging/usbip/vhci_hcd.c
+--- linux-3.1.1/drivers/staging/usbip/vhci_hcd.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/usbip/vhci_hcd.c	2011-11-16 18:39:08.000000000 -0500
+@@ -527,7 +527,7 @@ static void vhci_tx_urb(struct urb *urb)
  		return;
  	}
  
@@ -35160,7 +35137,7 @@ diff -urNp linux-3.0.9/drivers/staging/usbip/vhci_hcd.c linux-3.0.9/drivers/stag
  	if (priv->seqnum == 0xffff)
  		dev_info(&urb->dev->dev, "seqnum max\n");
  
-@@ -765,7 +765,7 @@ static int vhci_urb_dequeue(struct usb_h
+@@ -779,7 +779,7 @@ static int vhci_urb_dequeue(struct usb_h
  			return -ENOMEM;
  		}
  
@@ -35169,7 +35146,7 @@ diff -urNp linux-3.0.9/drivers/staging/usbip/vhci_hcd.c linux-3.0.9/drivers/stag
  		if (unlink->seqnum == 0xffff)
  			pr_info("seqnum max\n");
  
-@@ -955,7 +955,7 @@ static int vhci_start(struct usb_hcd *hc
+@@ -969,7 +969,7 @@ static int vhci_start(struct usb_hcd *hc
  		vdev->rhport = rhport;
  	}
  
@@ -35178,9 +35155,9 @@ diff -urNp linux-3.0.9/drivers/staging/usbip/vhci_hcd.c linux-3.0.9/drivers/stag
  	spin_lock_init(&vhci->lock);
  
  	hcd->power_budget = 0; /* no limit */
-diff -urNp linux-3.0.9/drivers/staging/usbip/vhci_rx.c linux-3.0.9/drivers/staging/usbip/vhci_rx.c
---- linux-3.0.9/drivers/staging/usbip/vhci_rx.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/usbip/vhci_rx.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/usbip/vhci_rx.c linux-3.1.1/drivers/staging/usbip/vhci_rx.c
+--- linux-3.1.1/drivers/staging/usbip/vhci_rx.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/usbip/vhci_rx.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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);
@@ -35190,9 +35167,9 @@ diff -urNp linux-3.0.9/drivers/staging/usbip/vhci_rx.c linux-3.0.9/drivers/stagi
  		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
  		return;
  	}
-diff -urNp linux-3.0.9/drivers/staging/vt6655/hostap.c linux-3.0.9/drivers/staging/vt6655/hostap.c
---- linux-3.0.9/drivers/staging/vt6655/hostap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/vt6655/hostap.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/vt6655/hostap.c linux-3.1.1/drivers/staging/vt6655/hostap.c
+--- linux-3.1.1/drivers/staging/vt6655/hostap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/vt6655/hostap.c	2011-11-16 18:39:08.000000000 -0500
 @@ -79,14 +79,13 @@ static int          msglevel            
   *
   */
@@ -35219,9 +35196,9 @@ diff -urNp linux-3.0.9/drivers/staging/vt6655/hostap.c linux-3.0.9/drivers/stagi
  	pDevice->apdev->netdev_ops = &apdev_netdev_ops;
  
  	pDevice->apdev->type = ARPHRD_IEEE80211;
-diff -urNp linux-3.0.9/drivers/staging/vt6656/hostap.c linux-3.0.9/drivers/staging/vt6656/hostap.c
---- linux-3.0.9/drivers/staging/vt6656/hostap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/vt6656/hostap.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/vt6656/hostap.c linux-3.1.1/drivers/staging/vt6656/hostap.c
+--- linux-3.1.1/drivers/staging/vt6656/hostap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/vt6656/hostap.c	2011-11-16 18:39:08.000000000 -0500
 @@ -80,14 +80,13 @@ static int          msglevel            
   *
   */
@@ -35248,9 +35225,9 @@ diff -urNp linux-3.0.9/drivers/staging/vt6656/hostap.c linux-3.0.9/drivers/stagi
  	pDevice->apdev->netdev_ops = &apdev_netdev_ops;
  
  	pDevice->apdev->type = ARPHRD_IEEE80211;
-diff -urNp linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c
---- linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.1.1/drivers/staging/wlan-ng/hfa384x_usb.c
+--- linux-3.1.1/drivers/staging/wlan-ng/hfa384x_usb.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/wlan-ng/hfa384x_usb.c	2011-11-16 18:39:08.000000000 -0500
 @@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hf
  
  struct usbctlx_completor {
@@ -35260,9 +35237,9 @@ diff -urNp linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.9/drivers
  
  static int
  hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
-diff -urNp linux-3.0.9/drivers/staging/zcache/tmem.c linux-3.0.9/drivers/staging/zcache/tmem.c
---- linux-3.0.9/drivers/staging/zcache/tmem.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/zcache/tmem.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/staging/zcache/tmem.c linux-3.1.1/drivers/staging/zcache/tmem.c
+--- linux-3.1.1/drivers/staging/zcache/tmem.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/zcache/tmem.c	2011-11-16 18:39:08.000000000 -0500
 @@ -39,7 +39,7 @@
   * A tmem host implementation must use this function to register callbacks
   * for memory allocation.
@@ -35281,18 +35258,18 @@ diff -urNp linux-3.0.9/drivers/staging/zcache/tmem.c linux-3.0.9/drivers/staging
  
  void tmem_register_pamops(struct tmem_pamops *m)
  {
-diff -urNp linux-3.0.9/drivers/staging/zcache/tmem.h linux-3.0.9/drivers/staging/zcache/tmem.h
---- linux-3.0.9/drivers/staging/zcache/tmem.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/zcache/tmem.h	2011-11-15 20:02:59.000000000 -0500
-@@ -171,6 +171,7 @@ struct tmem_pamops {
- 	int (*get_data)(struct page *, void *, struct tmem_pool *);
- 	void (*free)(void *, struct tmem_pool *);
+diff -urNp linux-3.1.1/drivers/staging/zcache/tmem.h linux-3.1.1/drivers/staging/zcache/tmem.h
+--- linux-3.1.1/drivers/staging/zcache/tmem.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/zcache/tmem.h	2011-11-16 18:39:08.000000000 -0500
+@@ -180,6 +180,7 @@ struct tmem_pamops {
+ 	void (*new_obj)(struct tmem_obj *);
+ 	int (*replace_in_obj)(void *, struct tmem_obj *);
  };
 +typedef struct tmem_pamops __no_const tmem_pamops_no_const;
  extern void tmem_register_pamops(struct tmem_pamops *m);
  
  /* memory allocation methods provided by the host implementation */
-@@ -180,6 +181,7 @@ struct tmem_hostops {
+@@ -189,6 +190,7 @@ struct tmem_hostops {
  	struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
  	void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
  };
@@ -35300,10 +35277,22 @@ diff -urNp linux-3.0.9/drivers/staging/zcache/tmem.h linux-3.0.9/drivers/staging
  extern void tmem_register_hostops(struct tmem_hostops *m);
  
  /* core tmem accessor functions */
-diff -urNp linux-3.0.9/drivers/target/target_core_alua.c linux-3.0.9/drivers/target/target_core_alua.c
---- linux-3.0.9/drivers/target/target_core_alua.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/target/target_core_alua.c	2011-11-15 20:02:59.000000000 -0500
-@@ -695,6 +695,8 @@ static int core_alua_update_tpg_primary_
+diff -urNp linux-3.1.1/drivers/target/iscsi/iscsi_target.c linux-3.1.1/drivers/target/iscsi/iscsi_target.c
+--- linux-3.1.1/drivers/target/iscsi/iscsi_target.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/iscsi/iscsi_target.c	2011-11-16 18:39:08.000000000 -0500
+@@ -1368,7 +1368,7 @@ static int iscsit_handle_data_out(struct
+ 		 * outstanding_r2ts reaches zero, go ahead and send the delayed
+ 		 * TASK_ABORTED status.
+ 		 */
+-		if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
++		if (atomic_read_unchecked(&se_cmd->t_transport_aborted) != 0) {
+ 			if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
+ 				if (--cmd->outstanding_r2ts < 1) {
+ 					iscsit_stop_dataout_timer(cmd);
+diff -urNp linux-3.1.1/drivers/target/target_core_alua.c linux-3.1.1/drivers/target/target_core_alua.c
+--- linux-3.1.1/drivers/target/target_core_alua.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/target_core_alua.c	2011-11-16 18:40:29.000000000 -0500
+@@ -723,6 +723,8 @@ static int core_alua_update_tpg_primary_
  	char path[ALUA_METADATA_PATH_LEN];
  	int len;
  
@@ -35312,7 +35301,7 @@ diff -urNp linux-3.0.9/drivers/target/target_core_alua.c linux-3.0.9/drivers/tar
  	memset(path, 0, ALUA_METADATA_PATH_LEN);
  
  	len = snprintf(md_buf, tg_pt_gp->tg_pt_gp_md_buf_len,
-@@ -958,6 +960,8 @@ static int core_alua_update_tpg_secondar
+@@ -986,6 +988,8 @@ static int core_alua_update_tpg_secondar
  	char path[ALUA_METADATA_PATH_LEN], wwn[ALUA_SECONDARY_METADATA_WWN_LEN];
  	int len;
  
@@ -35321,10 +35310,10 @@ diff -urNp linux-3.0.9/drivers/target/target_core_alua.c linux-3.0.9/drivers/tar
  	memset(path, 0, ALUA_METADATA_PATH_LEN);
  	memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN);
  
-diff -urNp linux-3.0.9/drivers/target/target_core_cdb.c linux-3.0.9/drivers/target/target_core_cdb.c
---- linux-3.0.9/drivers/target/target_core_cdb.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/target/target_core_cdb.c	2011-11-15 20:02:59.000000000 -0500
-@@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd *
+diff -urNp linux-3.1.1/drivers/target/target_core_cdb.c linux-3.1.1/drivers/target/target_core_cdb.c
+--- linux-3.1.1/drivers/target/target_core_cdb.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/target_core_cdb.c	2011-11-16 18:40:29.000000000 -0500
+@@ -933,6 +933,8 @@ target_emulate_modesense(struct se_cmd *
  	int length = 0;
  	unsigned char buf[SE_MODE_PAGE_BUF];
  
@@ -35333,21 +35322,21 @@ diff -urNp linux-3.0.9/drivers/target/target_core_cdb.c linux-3.0.9/drivers/targ
  	memset(buf, 0, SE_MODE_PAGE_BUF);
  
  	switch (cdb[2] & 0x3f) {
-diff -urNp linux-3.0.9/drivers/target/target_core_configfs.c linux-3.0.9/drivers/target/target_core_configfs.c
---- linux-3.0.9/drivers/target/target_core_configfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/target/target_core_configfs.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1276,6 +1276,8 @@ static ssize_t target_core_dev_pr_show_a
+diff -urNp linux-3.1.1/drivers/target/target_core_configfs.c linux-3.1.1/drivers/target/target_core_configfs.c
+--- linux-3.1.1/drivers/target/target_core_configfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/target_core_configfs.c	2011-11-16 19:04:37.000000000 -0500
+@@ -1267,6 +1267,8 @@ static ssize_t target_core_dev_pr_show_a
  	ssize_t len = 0;
  	int reg_count = 0, prf_isid;
  
 +	pax_track_stack();
 +
- 	if (!(su_dev->se_dev_ptr))
+ 	if (!su_dev->se_dev_ptr)
  		return -ENODEV;
  
-diff -urNp linux-3.0.9/drivers/target/target_core_pr.c linux-3.0.9/drivers/target/target_core_pr.c
---- linux-3.0.9/drivers/target/target_core_pr.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/target/target_core_pr.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/target/target_core_pr.c linux-3.1.1/drivers/target/target_core_pr.c
+--- linux-3.1.1/drivers/target/target_core_pr.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/target_core_pr.c	2011-11-16 18:40:29.000000000 -0500
 @@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi
  	unsigned char t_port[PR_APTPL_MAX_TPORT_LEN];
  	u16 tpgt;
@@ -35357,7 +35346,7 @@ diff -urNp linux-3.0.9/drivers/target/target_core_pr.c linux-3.0.9/drivers/targe
  	memset(i_port, 0, PR_APTPL_MAX_IPORT_LEN);
  	memset(t_port, 0, PR_APTPL_MAX_TPORT_LEN);
  	/*
-@@ -1861,6 +1863,8 @@ static int __core_scsi3_update_aptpl_buf
+@@ -1867,6 +1869,8 @@ static int __core_scsi3_update_aptpl_buf
  	ssize_t len = 0;
  	int reg_count = 0;
  
@@ -35366,7 +35355,7 @@ diff -urNp linux-3.0.9/drivers/target/target_core_pr.c linux-3.0.9/drivers/targe
  	memset(buf, 0, pr_aptpl_buf_len);
  	/*
  	 * Called to clear metadata once APTPL has been deactivated.
-@@ -1983,6 +1987,8 @@ static int __core_scsi3_write_aptpl_to_f
+@@ -1989,6 +1993,8 @@ static int __core_scsi3_write_aptpl_to_f
  	char path[512];
  	int ret;
  
@@ -35375,40 +35364,40 @@ diff -urNp linux-3.0.9/drivers/target/target_core_pr.c linux-3.0.9/drivers/targe
  	memset(iov, 0, sizeof(struct iovec));
  	memset(path, 0, 512);
  
-diff -urNp linux-3.0.9/drivers/target/target_core_tmr.c linux-3.0.9/drivers/target/target_core_tmr.c
---- linux-3.0.9/drivers/target/target_core_tmr.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/target/target_core_tmr.c	2011-11-15 20:02:59.000000000 -0500
-@@ -269,7 +269,7 @@ int core_tmr_lun_reset(
- 			CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key,
- 			T_TASK(cmd)->t_task_cdbs,
- 			atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
--			atomic_read(&T_TASK(cmd)->t_task_cdbs_sent),
-+			atomic_read_unchecked(&T_TASK(cmd)->t_task_cdbs_sent),
- 			atomic_read(&T_TASK(cmd)->t_transport_active),
- 			atomic_read(&T_TASK(cmd)->t_transport_stop),
- 			atomic_read(&T_TASK(cmd)->t_transport_sent));
-@@ -311,7 +311,7 @@ int core_tmr_lun_reset(
- 			DEBUG_LR("LUN_RESET: got t_transport_active = 1 for"
+diff -urNp linux-3.1.1/drivers/target/target_core_tmr.c linux-3.1.1/drivers/target/target_core_tmr.c
+--- linux-3.1.1/drivers/target/target_core_tmr.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/target_core_tmr.c	2011-11-16 18:39:08.000000000 -0500
+@@ -255,7 +255,7 @@ static void core_tmr_drain_task_list(
+ 			cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
+ 			cmd->t_task_list_num,
+ 			atomic_read(&cmd->t_task_cdbs_left),
+-			atomic_read(&cmd->t_task_cdbs_sent),
++			atomic_read_unchecked(&cmd->t_task_cdbs_sent),
+ 			atomic_read(&cmd->t_transport_active),
+ 			atomic_read(&cmd->t_transport_stop),
+ 			atomic_read(&cmd->t_transport_sent));
+@@ -291,7 +291,7 @@ static void core_tmr_drain_task_list(
+ 			pr_debug("LUN_RESET: got t_transport_active = 1 for"
  				" task: %p, t_fe_count: %d dev: %p\n", task,
  				fe_count, dev);
--			atomic_set(&T_TASK(cmd)->t_transport_aborted, 1);
-+			atomic_set_unchecked(&T_TASK(cmd)->t_transport_aborted, 1);
- 			spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock,
- 						flags);
+-			atomic_set(&cmd->t_transport_aborted, 1);
++			atomic_set_unchecked(&cmd->t_transport_aborted, 1);
+ 			spin_unlock_irqrestore(&cmd->t_state_lock, flags);
+ 
  			core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
-@@ -321,7 +321,7 @@ int core_tmr_lun_reset(
+@@ -299,7 +299,7 @@ static void core_tmr_drain_task_list(
  		}
- 		DEBUG_LR("LUN_RESET: Got t_transport_active = 0 for task: %p,"
+ 		pr_debug("LUN_RESET: Got t_transport_active = 0 for task: %p,"
  			" t_fe_count: %d dev: %p\n", task, fe_count, dev);
--		atomic_set(&T_TASK(cmd)->t_transport_aborted, 1);
-+		atomic_set_unchecked(&T_TASK(cmd)->t_transport_aborted, 1);
- 		spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
- 		core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
+-		atomic_set(&cmd->t_transport_aborted, 1);
++		atomic_set_unchecked(&cmd->t_transport_aborted, 1);
+ 		spin_unlock_irqrestore(&cmd->t_state_lock, flags);
  
-diff -urNp linux-3.0.9/drivers/target/target_core_transport.c linux-3.0.9/drivers/target/target_core_transport.c
---- linux-3.0.9/drivers/target/target_core_transport.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/target/target_core_transport.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1681,7 +1681,7 @@ struct se_device *transport_add_device_t
+ 		core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
+diff -urNp linux-3.1.1/drivers/target/target_core_transport.c linux-3.1.1/drivers/target/target_core_transport.c
+--- linux-3.1.1/drivers/target/target_core_transport.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/target_core_transport.c	2011-11-16 18:39:08.000000000 -0500
+@@ -1445,7 +1445,7 @@ struct se_device *transport_add_device_t
  
  	dev->queue_depth	= dev_limits->queue_depth;
  	atomic_set(&dev->depth_left, dev->queue_depth);
@@ -35417,75 +35406,75 @@ diff -urNp linux-3.0.9/drivers/target/target_core_transport.c linux-3.0.9/driver
  
  	se_dev_set_default_attribs(dev, dev_limits);
  
-@@ -1882,7 +1882,7 @@ static int transport_check_alloc_task_at
+@@ -1633,7 +1633,7 @@ static int transport_check_alloc_task_at
  	 * Used to determine when ORDERED commands should go from
  	 * Dormant to Active status.
  	 */
--	cmd->se_ordered_id = atomic_inc_return(&SE_DEV(cmd)->dev_ordered_id);
-+	cmd->se_ordered_id = atomic_inc_return_unchecked(&SE_DEV(cmd)->dev_ordered_id);
+-	cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
++	cmd->se_ordered_id = atomic_inc_return_unchecked(&cmd->se_dev->dev_ordered_id);
  	smp_mb__after_atomic_inc();
- 	DEBUG_STA("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
+ 	pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
  			cmd->se_ordered_id, cmd->sam_task_attr,
-@@ -2169,7 +2169,7 @@ static void transport_generic_request_fa
+@@ -1960,7 +1960,7 @@ static void transport_generic_request_fa
  		" t_transport_active: %d t_transport_stop: %d"
- 		" t_transport_sent: %d\n", T_TASK(cmd)->t_task_cdbs,
- 		atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
--		atomic_read(&T_TASK(cmd)->t_task_cdbs_sent),
-+		atomic_read_unchecked(&T_TASK(cmd)->t_task_cdbs_sent),
- 		atomic_read(&T_TASK(cmd)->t_task_cdbs_ex_left),
- 		atomic_read(&T_TASK(cmd)->t_transport_active),
- 		atomic_read(&T_TASK(cmd)->t_transport_stop),
-@@ -2673,9 +2673,9 @@ check_depth:
- 	spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+ 		" t_transport_sent: %d\n", cmd->t_task_list_num,
+ 		atomic_read(&cmd->t_task_cdbs_left),
+-		atomic_read(&cmd->t_task_cdbs_sent),
++		atomic_read_unchecked(&cmd->t_task_cdbs_sent),
+ 		atomic_read(&cmd->t_task_cdbs_ex_left),
+ 		atomic_read(&cmd->t_transport_active),
+ 		atomic_read(&cmd->t_transport_stop),
+@@ -2460,9 +2460,9 @@ check_depth:
+ 	spin_lock_irqsave(&cmd->t_state_lock, flags);
  	atomic_set(&task->task_active, 1);
  	atomic_set(&task->task_sent, 1);
--	atomic_inc(&T_TASK(cmd)->t_task_cdbs_sent);
-+	atomic_inc_unchecked(&T_TASK(cmd)->t_task_cdbs_sent);
+-	atomic_inc(&cmd->t_task_cdbs_sent);
++	atomic_inc_unchecked(&cmd->t_task_cdbs_sent);
  
--	if (atomic_read(&T_TASK(cmd)->t_task_cdbs_sent) ==
-+	if (atomic_read_unchecked(&T_TASK(cmd)->t_task_cdbs_sent) ==
- 	    T_TASK(cmd)->t_task_cdbs)
+-	if (atomic_read(&cmd->t_task_cdbs_sent) ==
++	if (atomic_read_unchecked(&cmd->t_task_cdbs_sent) ==
+ 	    cmd->t_task_list_num)
  		atomic_set(&cmd->transport_sent, 1);
  
-@@ -5568,7 +5568,7 @@ static void transport_generic_wait_for_t
- 		atomic_set(&T_TASK(cmd)->transport_lun_stop, 0);
+@@ -4665,7 +4665,7 @@ static void transport_generic_wait_for_t
+ 		atomic_set(&cmd->transport_lun_stop, 0);
  	}
- 	if (!atomic_read(&T_TASK(cmd)->t_transport_active) ||
--	     atomic_read(&T_TASK(cmd)->t_transport_aborted))
-+	     atomic_read_unchecked(&T_TASK(cmd)->t_transport_aborted))
+ 	if (!atomic_read(&cmd->t_transport_active) ||
+-	     atomic_read(&cmd->t_transport_aborted))
++	     atomic_read_unchecked(&cmd->t_transport_aborted))
  		goto remove;
  
- 	atomic_set(&T_TASK(cmd)->t_transport_stop, 1);
-@@ -5797,7 +5797,7 @@ int transport_check_aborted_status(struc
+ 	atomic_set(&cmd->t_transport_stop, 1);
+@@ -4900,7 +4900,7 @@ int transport_check_aborted_status(struc
  {
  	int ret = 0;
  
--	if (atomic_read(&T_TASK(cmd)->t_transport_aborted) != 0) {
-+	if (atomic_read_unchecked(&T_TASK(cmd)->t_transport_aborted) != 0) {
- 		if (!(send_status) ||
+-	if (atomic_read(&cmd->t_transport_aborted) != 0) {
++	if (atomic_read_unchecked(&cmd->t_transport_aborted) != 0) {
+ 		if (!send_status ||
  		     (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
  			return 1;
-@@ -5825,7 +5825,7 @@ void transport_send_task_abort(struct se
+@@ -4937,7 +4937,7 @@ void transport_send_task_abort(struct se
  	 */
  	if (cmd->data_direction == DMA_TO_DEVICE) {
- 		if (CMD_TFO(cmd)->write_pending_status(cmd) != 0) {
--			atomic_inc(&T_TASK(cmd)->t_transport_aborted);
-+			atomic_inc_unchecked(&T_TASK(cmd)->t_transport_aborted);
+ 		if (cmd->se_tfo->write_pending_status(cmd) != 0) {
+-			atomic_inc(&cmd->t_transport_aborted);
++			atomic_inc_unchecked(&cmd->t_transport_aborted);
  			smp_mb__after_atomic_inc();
  			cmd->scsi_status = SAM_STAT_TASK_ABORTED;
  			transport_new_cmd_failure(cmd);
-@@ -5949,7 +5949,7 @@ static void transport_processing_shutdow
- 			CMD_TFO(cmd)->get_task_tag(cmd),
- 			T_TASK(cmd)->t_task_cdbs,
- 			atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
--			atomic_read(&T_TASK(cmd)->t_task_cdbs_sent),
-+			atomic_read_unchecked(&T_TASK(cmd)->t_task_cdbs_sent),
- 			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.9/drivers/telephony/ixj.c linux-3.0.9/drivers/telephony/ixj.c
---- linux-3.0.9/drivers/telephony/ixj.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/telephony/ixj.c	2011-11-15 20:02:59.000000000 -0500
+@@ -5051,7 +5051,7 @@ static void transport_processing_shutdow
+ 			cmd->se_tfo->get_task_tag(cmd),
+ 			cmd->t_task_list_num,
+ 			atomic_read(&cmd->t_task_cdbs_left),
+-			atomic_read(&cmd->t_task_cdbs_sent),
++			atomic_read_unchecked(&cmd->t_task_cdbs_sent),
+ 			atomic_read(&cmd->t_transport_active),
+ 			atomic_read(&cmd->t_transport_stop),
+ 			atomic_read(&cmd->t_transport_sent));
+diff -urNp linux-3.1.1/drivers/telephony/ixj.c linux-3.1.1/drivers/telephony/ixj.c
+--- linux-3.1.1/drivers/telephony/ixj.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/telephony/ixj.c	2011-11-16 18:40:29.000000000 -0500
 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
  	bool mContinue;
  	char *pIn, *pOut;
@@ -35495,9 +35484,9 @@ diff -urNp linux-3.0.9/drivers/telephony/ixj.c linux-3.0.9/drivers/telephony/ixj
  	if (!SCI_Prepare(j))
  		return 0;
  
-diff -urNp linux-3.0.9/drivers/tty/hvc/hvcs.c linux-3.0.9/drivers/tty/hvc/hvcs.c
---- linux-3.0.9/drivers/tty/hvc/hvcs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/hvc/hvcs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/hvc/hvcs.c linux-3.1.1/drivers/tty/hvc/hvcs.c
+--- linux-3.1.1/drivers/tty/hvc/hvcs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/hvc/hvcs.c	2011-11-16 18:39:08.000000000 -0500
 @@ -83,6 +83,7 @@
  #include <asm/hvcserver.h>
  #include <asm/uaccess.h>
@@ -35600,9 +35589,9 @@ diff -urNp linux-3.0.9/drivers/tty/hvc/hvcs.c linux-3.0.9/drivers/tty/hvc/hvcs.c
  		return 0;
  
  	return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-3.0.9/drivers/tty/ipwireless/tty.c linux-3.0.9/drivers/tty/ipwireless/tty.c
---- linux-3.0.9/drivers/tty/ipwireless/tty.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/ipwireless/tty.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/ipwireless/tty.c linux-3.1.1/drivers/tty/ipwireless/tty.c
+--- linux-3.1.1/drivers/tty/ipwireless/tty.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/ipwireless/tty.c	2011-11-16 18:39:08.000000000 -0500
 @@ -29,6 +29,7 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_flip.h>
@@ -35725,21 +35714,21 @@ diff -urNp linux-3.0.9/drivers/tty/ipwireless/tty.c linux-3.0.9/drivers/tty/ipwi
  				do_ipw_close(ttyj);
  			ipwireless_disassociate_network_ttys(network,
  							     ttyj->channel_idx);
-diff -urNp linux-3.0.9/drivers/tty/n_gsm.c linux-3.0.9/drivers/tty/n_gsm.c
---- linux-3.0.9/drivers/tty/n_gsm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/n_gsm.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
- 		return NULL;
- 	spin_lock_init(&dlci->lock);
+diff -urNp linux-3.1.1/drivers/tty/n_gsm.c linux-3.1.1/drivers/tty/n_gsm.c
+--- linux-3.1.1/drivers/tty/n_gsm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/n_gsm.c	2011-11-16 18:39:08.000000000 -0500
+@@ -1625,7 +1625,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
+ 	kref_init(&dlci->ref);
+ 	mutex_init(&dlci->mutex);
  	dlci->fifo = &dlci->_fifo;
 -	if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
 +	if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
  		kfree(dlci);
  		return NULL;
  	}
-diff -urNp linux-3.0.9/drivers/tty/n_tty.c linux-3.0.9/drivers/tty/n_tty.c
---- linux-3.0.9/drivers/tty/n_tty.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/n_tty.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/n_tty.c linux-3.1.1/drivers/tty/n_tty.c
+--- linux-3.1.1/drivers/tty/n_tty.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/n_tty.c	2011-11-16 18:39:08.000000000 -0500
 @@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
  {
  	*ops = tty_ldisc_N_TTY;
@@ -35749,9 +35738,9 @@ diff -urNp linux-3.0.9/drivers/tty/n_tty.c linux-3.0.9/drivers/tty/n_tty.c
 +	ops->flags = 0;
  }
  EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-3.0.9/drivers/tty/pty.c linux-3.0.9/drivers/tty/pty.c
---- linux-3.0.9/drivers/tty/pty.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/pty.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/pty.c linux-3.1.1/drivers/tty/pty.c
+--- linux-3.1.1/drivers/tty/pty.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/pty.c	2011-11-16 18:39:08.000000000 -0500
 @@ -773,8 +773,10 @@ static void __init unix98_pty_init(void)
  	register_sysctl_table(pty_root_table);
  
@@ -35764,9 +35753,9 @@ diff -urNp linux-3.0.9/drivers/tty/pty.c linux-3.0.9/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.9/drivers/tty/rocket.c linux-3.0.9/drivers/tty/rocket.c
---- linux-3.0.9/drivers/tty/rocket.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/rocket.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/rocket.c linux-3.1.1/drivers/tty/rocket.c
+--- linux-3.1.1/drivers/tty/rocket.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/rocket.c	2011-11-16 18:40:29.000000000 -0500
 @@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info
  	struct rocket_ports tmp;
  	int board;
@@ -35776,9 +35765,9 @@ diff -urNp linux-3.0.9/drivers/tty/rocket.c linux-3.0.9/drivers/tty/rocket.c
  	if (!retports)
  		return -EFAULT;
  	memset(&tmp, 0, sizeof (tmp));
-diff -urNp linux-3.0.9/drivers/tty/serial/kgdboc.c linux-3.0.9/drivers/tty/serial/kgdboc.c
---- linux-3.0.9/drivers/tty/serial/kgdboc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/serial/kgdboc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/serial/kgdboc.c linux-3.1.1/drivers/tty/serial/kgdboc.c
+--- linux-3.1.1/drivers/tty/serial/kgdboc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/serial/kgdboc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -23,8 +23,9 @@
  #define MAX_CONFIG_LEN		40
  
@@ -35877,9 +35866,9 @@ diff -urNp linux-3.0.9/drivers/tty/serial/kgdboc.c linux-3.0.9/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.9/drivers/tty/serial/mfd.c linux-3.0.9/drivers/tty/serial/mfd.c
---- linux-3.0.9/drivers/tty/serial/mfd.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/serial/mfd.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/serial/mfd.c linux-3.1.1/drivers/tty/serial/mfd.c
+--- linux-3.1.1/drivers/tty/serial/mfd.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/serial/mfd.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1423,7 +1423,7 @@ static void serial_hsu_remove(struct pci
  }
  
@@ -35889,9 +35878,9 @@ diff -urNp linux-3.0.9/drivers/tty/serial/mfd.c linux-3.0.9/drivers/tty/serial/m
  	{ 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.9/drivers/tty/serial/mrst_max3110.c linux-3.0.9/drivers/tty/serial/mrst_max3110.c
---- linux-3.0.9/drivers/tty/serial/mrst_max3110.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/serial/mrst_max3110.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/serial/mrst_max3110.c linux-3.1.1/drivers/tty/serial/mrst_max3110.c
+--- linux-3.1.1/drivers/tty/serial/mrst_max3110.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/serial/mrst_max3110.c	2011-11-16 18:40:29.000000000 -0500
 @@ -393,6 +393,8 @@ static void max3110_con_receive(struct u
  	int loop = 1, num, total = 0;
  	u8 recv_buf[512], *pbuf;
@@ -35901,9 +35890,9 @@ diff -urNp linux-3.0.9/drivers/tty/serial/mrst_max3110.c linux-3.0.9/drivers/tty
  	pbuf = recv_buf;
  	do {
  		num = max3110_read_multi(max, pbuf);
-diff -urNp linux-3.0.9/drivers/tty/tty_io.c linux-3.0.9/drivers/tty/tty_io.c
---- linux-3.0.9/drivers/tty/tty_io.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/tty_io.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/tty_io.c linux-3.1.1/drivers/tty/tty_io.c
+--- linux-3.1.1/drivers/tty/tty_io.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/tty_io.c	2011-11-16 18:39:08.000000000 -0500
 @@ -3238,7 +3238,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
  
  void tty_default_fops(struct file_operations *fops)
@@ -35913,9 +35902,9 @@ diff -urNp linux-3.0.9/drivers/tty/tty_io.c linux-3.0.9/drivers/tty/tty_io.c
  }
  
  /*
-diff -urNp linux-3.0.9/drivers/tty/tty_ldisc.c linux-3.0.9/drivers/tty/tty_ldisc.c
---- linux-3.0.9/drivers/tty/tty_ldisc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/tty_ldisc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/tty_ldisc.c linux-3.1.1/drivers/tty/tty_ldisc.c
+--- linux-3.1.1/drivers/tty/tty_ldisc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/tty_ldisc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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;
@@ -35961,9 +35950,9 @@ diff -urNp linux-3.0.9/drivers/tty/tty_ldisc.c linux-3.0.9/drivers/tty/tty_ldisc
  	module_put(ldops->owner);
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  }
-diff -urNp linux-3.0.9/drivers/tty/vt/keyboard.c linux-3.0.9/drivers/tty/vt/keyboard.c
---- linux-3.0.9/drivers/tty/vt/keyboard.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/vt/keyboard.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/vt/keyboard.c linux-3.1.1/drivers/tty/vt/keyboard.c
+--- linux-3.1.1/drivers/tty/vt/keyboard.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/vt/keyboard.c	2011-11-16 18:40:29.000000000 -0500
 @@ -656,6 +656,16 @@ static void k_spec(struct vc_data *vc, u
  	     kbd->kbdmode == VC_OFF) &&
  	     value != KVAL(K_SAK))
@@ -35981,9 +35970,9 @@ diff -urNp linux-3.0.9/drivers/tty/vt/keyboard.c linux-3.0.9/drivers/tty/vt/keyb
  	fn_handler[value](vc);
  }
  
-diff -urNp linux-3.0.9/drivers/tty/vt/vt.c linux-3.0.9/drivers/tty/vt/vt.c
---- linux-3.0.9/drivers/tty/vt/vt.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/vt/vt.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/vt/vt.c linux-3.1.1/drivers/tty/vt/vt.c
+--- linux-3.1.1/drivers/tty/vt/vt.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/vt/vt.c	2011-11-16 18:39:08.000000000 -0500
 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
  
  static void notify_write(struct vc_data *vc, unsigned int unicode)
@@ -35993,9 +35982,9 @@ diff -urNp linux-3.0.9/drivers/tty/vt/vt.c linux-3.0.9/drivers/tty/vt/vt.c
  	atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
  }
  
-diff -urNp linux-3.0.9/drivers/tty/vt/vt_ioctl.c linux-3.0.9/drivers/tty/vt/vt_ioctl.c
---- linux-3.0.9/drivers/tty/vt/vt_ioctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/vt/vt_ioctl.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/tty/vt/vt_ioctl.c linux-3.1.1/drivers/tty/vt/vt_ioctl.c
+--- linux-3.1.1/drivers/tty/vt/vt_ioctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/vt/vt_ioctl.c	2011-11-16 18:40:29.000000000 -0500
 @@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
  	if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
  		return -EFAULT;
@@ -36036,9 +36025,9 @@ diff -urNp linux-3.0.9/drivers/tty/vt/vt_ioctl.c linux-3.0.9/drivers/tty/vt/vt_i
  		if (!perm) {
  			ret = -EPERM;
  			goto reterr;
-diff -urNp linux-3.0.9/drivers/uio/uio.c linux-3.0.9/drivers/uio/uio.c
---- linux-3.0.9/drivers/uio/uio.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/uio/uio.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/uio/uio.c linux-3.1.1/drivers/uio/uio.c
+--- linux-3.1.1/drivers/uio/uio.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/uio/uio.c	2011-11-16 18:39:08.000000000 -0500
 @@ -25,6 +25,7 @@
  #include <linux/kobject.h>
  #include <linux/cdev.h>
@@ -36130,9 +36119,9 @@ diff -urNp linux-3.0.9/drivers/uio/uio.c linux-3.0.9/drivers/uio/uio.c
  
  	ret = uio_get_minor(idev);
  	if (ret)
-diff -urNp linux-3.0.9/drivers/usb/atm/cxacru.c linux-3.0.9/drivers/usb/atm/cxacru.c
---- linux-3.0.9/drivers/usb/atm/cxacru.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/atm/cxacru.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/usb/atm/cxacru.c linux-3.1.1/drivers/usb/atm/cxacru.c
+--- linux-3.1.1/drivers/usb/atm/cxacru.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/atm/cxacru.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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)
@@ -36142,10 +36131,10 @@ diff -urNp linux-3.0.9/drivers/usb/atm/cxacru.c linux-3.0.9/drivers/usb/atm/cxac
  			return -EINVAL;
  		pos += tmp;
  
-diff -urNp linux-3.0.9/drivers/usb/atm/usbatm.c linux-3.0.9/drivers/usb/atm/usbatm.c
---- linux-3.0.9/drivers/usb/atm/usbatm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/atm/usbatm.c	2011-11-15 20:02:59.000000000 -0500
-@@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru
+diff -urNp linux-3.1.1/drivers/usb/atm/usbatm.c linux-3.1.1/drivers/usb/atm/usbatm.c
+--- linux-3.1.1/drivers/usb/atm/usbatm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/atm/usbatm.c	2011-11-16 18:39:08.000000000 -0500
+@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
  		if (printk_ratelimit())
  			atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
  				__func__, vpi, vci);
@@ -36154,7 +36143,7 @@ diff -urNp linux-3.0.9/drivers/usb/atm/usbatm.c linux-3.0.9/drivers/usb/atm/usba
  		return;
  	}
  
-@@ -360,7 +360,7 @@ static void usbatm_extract_one_cell(stru
+@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(stru
  		if (length > ATM_MAX_AAL5_PDU) {
  			atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
  				  __func__, length, vcc);
@@ -36163,7 +36152,7 @@ diff -urNp linux-3.0.9/drivers/usb/atm/usbatm.c linux-3.0.9/drivers/usb/atm/usba
  			goto out;
  		}
  
-@@ -369,14 +369,14 @@ static void usbatm_extract_one_cell(stru
+@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(stru
  		if (sarb->len < pdu_length) {
  			atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
  				  __func__, pdu_length, sarb->len, vcc);
@@ -36180,7 +36169,7 @@ diff -urNp linux-3.0.9/drivers/usb/atm/usbatm.c linux-3.0.9/drivers/usb/atm/usba
  			goto out;
  		}
  
-@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(stru
+@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(stru
  			if (printk_ratelimit())
  				atm_err(instance, "%s: no memory for skb (length: %u)!\n",
  					__func__, length);
@@ -36189,7 +36178,7 @@ diff -urNp linux-3.0.9/drivers/usb/atm/usbatm.c linux-3.0.9/drivers/usb/atm/usba
  			goto out;
  		}
  
-@@ -411,7 +411,7 @@ static void usbatm_extract_one_cell(stru
+@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(stru
  
  		vcc->push(vcc, skb);
  
@@ -36198,7 +36187,7 @@ diff -urNp linux-3.0.9/drivers/usb/atm/usbatm.c linux-3.0.9/drivers/usb/atm/usba
  	out:
  		skb_trim(sarb, 0);
  	}
-@@ -614,7 +614,7 @@ static void usbatm_tx_process(unsigned l
+@@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned l
  			struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
  
  			usbatm_pop(vcc, skb);
@@ -36224,9 +36213,9 @@ diff -urNp linux-3.0.9/drivers/usb/atm/usbatm.c linux-3.0.9/drivers/usb/atm/usba
  
  	if (!left--) {
  		if (instance->disconnected)
-diff -urNp linux-3.0.9/drivers/usb/core/devices.c linux-3.0.9/drivers/usb/core/devices.c
---- linux-3.0.9/drivers/usb/core/devices.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/core/devices.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/usb/core/devices.c linux-3.1.1/drivers/usb/core/devices.c
+--- linux-3.1.1/drivers/usb/core/devices.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/core/devices.c	2011-11-16 18:39:08.000000000 -0500
 @@ -126,7 +126,7 @@ static const char format_endpt[] =
   * time it gets called.
   */
@@ -36254,9 +36243,9 @@ diff -urNp linux-3.0.9/drivers/usb/core/devices.c linux-3.0.9/drivers/usb/core/d
  	if (file->f_version != event_count) {
  		file->f_version = event_count;
  		return POLLIN | POLLRDNORM;
-diff -urNp linux-3.0.9/drivers/usb/core/message.c linux-3.0.9/drivers/usb/core/message.c
---- linux-3.0.9/drivers/usb/core/message.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/core/message.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/usb/core/message.c linux-3.1.1/drivers/usb/core/message.c
+--- linux-3.1.1/drivers/usb/core/message.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/core/message.c	2011-11-16 18:39:08.000000000 -0500
 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
  	buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
  	if (buf) {
@@ -36268,9 +36257,9 @@ diff -urNp linux-3.0.9/drivers/usb/core/message.c linux-3.0.9/drivers/usb/core/m
  			if (!smallbuf)
  				return buf;
  			memcpy(smallbuf, buf, len);
-diff -urNp linux-3.0.9/drivers/usb/early/ehci-dbgp.c linux-3.0.9/drivers/usb/early/ehci-dbgp.c
---- linux-3.0.9/drivers/usb/early/ehci-dbgp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/early/ehci-dbgp.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/usb/early/ehci-dbgp.c linux-3.1.1/drivers/usb/early/ehci-dbgp.c
+--- linux-3.1.1/drivers/usb/early/ehci-dbgp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/early/ehci-dbgp.c	2011-11-16 18:39:08.000000000 -0500
 @@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x,
  
  #ifdef CONFIG_KGDB
@@ -36308,9 +36297,9 @@ diff -urNp linux-3.0.9/drivers/usb/early/ehci-dbgp.c linux-3.0.9/drivers/usb/ear
  
  	return 0;
  }
-diff -urNp linux-3.0.9/drivers/usb/host/xhci-mem.c linux-3.0.9/drivers/usb/host/xhci-mem.c
---- linux-3.0.9/drivers/usb/host/xhci-mem.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/host/xhci-mem.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/usb/host/xhci-mem.c linux-3.1.1/drivers/usb/host/xhci-mem.c
+--- linux-3.1.1/drivers/usb/host/xhci-mem.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/host/xhci-mem.c	2011-11-16 18:40:29.000000000 -0500
 @@ -1690,6 +1690,8 @@ static int xhci_check_trb_in_td_math(str
  	unsigned int num_tests;
  	int i, ret;
@@ -36320,9 +36309,9 @@ diff -urNp linux-3.0.9/drivers/usb/host/xhci-mem.c linux-3.0.9/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.9/drivers/usb/wusbcore/wa-hc.h linux-3.0.9/drivers/usb/wusbcore/wa-hc.h
---- linux-3.0.9/drivers/usb/wusbcore/wa-hc.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/wusbcore/wa-hc.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/usb/wusbcore/wa-hc.h linux-3.1.1/drivers/usb/wusbcore/wa-hc.h
+--- linux-3.1.1/drivers/usb/wusbcore/wa-hc.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/wusbcore/wa-hc.h	2011-11-16 18:39:08.000000000 -0500
 @@ -192,7 +192,7 @@ struct wahc {
  	struct list_head xfer_delayed_list;
  	spinlock_t xfer_list_lock;
@@ -36341,10 +36330,10 @@ diff -urNp linux-3.0.9/drivers/usb/wusbcore/wa-hc.h linux-3.0.9/drivers/usb/wusb
  }
  
  /**
-diff -urNp linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c
---- linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c	2011-11-15 20:02:59.000000000 -0500
-@@ -294,7 +294,7 @@ out:
+diff -urNp linux-3.1.1/drivers/usb/wusbcore/wa-xfer.c linux-3.1.1/drivers/usb/wusbcore/wa-xfer.c
+--- linux-3.1.1/drivers/usb/wusbcore/wa-xfer.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/wusbcore/wa-xfer.c	2011-11-16 18:39:08.000000000 -0500
+@@ -295,7 +295,7 @@ out:
   */
  static void wa_xfer_id_init(struct wa_xfer *xfer)
  {
@@ -36353,11 +36342,11 @@ diff -urNp linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c linux-3.0.9/drivers/usb/wu
  }
  
  /*
-diff -urNp linux-3.0.9/drivers/vhost/vhost.c linux-3.0.9/drivers/vhost/vhost.c
---- linux-3.0.9/drivers/vhost/vhost.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/vhost/vhost.c	2011-11-15 20:02:59.000000000 -0500
-@@ -589,7 +589,7 @@ static int init_used(struct vhost_virtqu
- 	return get_user(vq->last_used_idx, &used->idx);
+diff -urNp linux-3.1.1/drivers/vhost/vhost.c linux-3.1.1/drivers/vhost/vhost.c
+--- linux-3.1.1/drivers/vhost/vhost.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/vhost/vhost.c	2011-11-16 18:39:08.000000000 -0500
+@@ -629,7 +629,7 @@ static long vhost_set_memory(struct vhos
+ 	return 0;
  }
  
 -static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
@@ -36365,9 +36354,9 @@ diff -urNp linux-3.0.9/drivers/vhost/vhost.c linux-3.0.9/drivers/vhost/vhost.c
  {
  	struct file *eventfp, *filep = NULL,
  		    *pollstart = NULL, *pollstop = NULL;
-diff -urNp linux-3.0.9/drivers/video/aty/aty128fb.c linux-3.0.9/drivers/video/aty/aty128fb.c
---- linux-3.0.9/drivers/video/aty/aty128fb.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/aty/aty128fb.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/video/aty/aty128fb.c linux-3.1.1/drivers/video/aty/aty128fb.c
+--- linux-3.1.1/drivers/video/aty/aty128fb.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/aty/aty128fb.c	2011-11-16 18:39:08.000000000 -0500
 @@ -148,7 +148,7 @@ enum {
  };
  
@@ -36377,9 +36366,9 @@ diff -urNp linux-3.0.9/drivers/video/aty/aty128fb.c linux-3.0.9/drivers/video/at
  	"AGP",
  	"PCI",
  	"PRO AGP",
-diff -urNp linux-3.0.9/drivers/video/fbcmap.c linux-3.0.9/drivers/video/fbcmap.c
---- linux-3.0.9/drivers/video/fbcmap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/fbcmap.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/video/fbcmap.c linux-3.1.1/drivers/video/fbcmap.c
+--- linux-3.1.1/drivers/video/fbcmap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/fbcmap.c	2011-11-16 18:39:08.000000000 -0500
 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
  		rc = -ENODEV;
  		goto out;
@@ -36390,9 +36379,9 @@ diff -urNp linux-3.0.9/drivers/video/fbcmap.c linux-3.0.9/drivers/video/fbcmap.c
  		rc = -EINVAL;
  		goto out1;
  	}
-diff -urNp linux-3.0.9/drivers/video/fbmem.c linux-3.0.9/drivers/video/fbmem.c
---- linux-3.0.9/drivers/video/fbmem.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/fbmem.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/video/fbmem.c linux-3.1.1/drivers/video/fbmem.c
+--- linux-3.1.1/drivers/video/fbmem.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/fbmem.c	2011-11-16 18:40:29.000000000 -0500
 @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in
  			image->dx += image->width + 8;
  		}
@@ -36438,9 +36427,9 @@ diff -urNp linux-3.0.9/drivers/video/fbmem.c linux-3.0.9/drivers/video/fbmem.c
  			return -EINVAL;
  		if (!registered_fb[con2fb.framebuffer])
  			request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-3.0.9/drivers/video/geode/gx1fb_core.c linux-3.0.9/drivers/video/geode/gx1fb_core.c
---- linux-3.0.9/drivers/video/geode/gx1fb_core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/geode/gx1fb_core.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/video/geode/gx1fb_core.c linux-3.1.1/drivers/video/geode/gx1fb_core.c
+--- linux-3.1.1/drivers/video/geode/gx1fb_core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/geode/gx1fb_core.c	2011-11-16 18:39:08.000000000 -0500
 @@ -29,7 +29,7 @@ static int  crt_option = 1;
  static char panel_option[32] = "";
  
@@ -36450,9 +36439,9 @@ diff -urNp linux-3.0.9/drivers/video/geode/gx1fb_core.c linux-3.0.9/drivers/vide
  	/* 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.9/drivers/video/gxt4500.c linux-3.0.9/drivers/video/gxt4500.c
---- linux-3.0.9/drivers/video/gxt4500.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/gxt4500.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/video/gxt4500.c linux-3.1.1/drivers/video/gxt4500.c
+--- linux-3.1.1/drivers/video/gxt4500.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/gxt4500.c	2011-11-16 18:39:08.000000000 -0500
 @@ -156,7 +156,7 @@ struct gxt4500_par {
  static char *mode_option;
  
@@ -36471,9 +36460,9 @@ diff -urNp linux-3.0.9/drivers/video/gxt4500.c linux-3.0.9/drivers/video/gxt4500
  	.id = "IBM GXT4500P",
  	.type = FB_TYPE_PACKED_PIXELS,
  	.visual = FB_VISUAL_PSEUDOCOLOR,
-diff -urNp linux-3.0.9/drivers/video/i810/i810_accel.c linux-3.0.9/drivers/video/i810/i810_accel.c
---- linux-3.0.9/drivers/video/i810/i810_accel.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/i810/i810_accel.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/video/i810/i810_accel.c linux-3.1.1/drivers/video/i810/i810_accel.c
+--- linux-3.1.1/drivers/video/i810/i810_accel.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/i810/i810_accel.c	2011-11-16 18:39:08.000000000 -0500
 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct 
  		}
  	}
@@ -36482,9 +36471,9 @@ diff -urNp linux-3.0.9/drivers/video/i810/i810_accel.c linux-3.0.9/drivers/video
  	i810_report_error(mmio); 
  	par->dev_flags |= LOCKUP;
  	info->pixmap.scan_align = 1;
-diff -urNp linux-3.0.9/drivers/video/i810/i810_main.c linux-3.0.9/drivers/video/i810/i810_main.c
---- linux-3.0.9/drivers/video/i810/i810_main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/i810/i810_main.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/video/i810/i810_main.c linux-3.1.1/drivers/video/i810/i810_main.c
+--- linux-3.1.1/drivers/video/i810/i810_main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/i810/i810_main.c	2011-11-16 18:39:08.000000000 -0500
 @@ -97,7 +97,7 @@ static int i810fb_blank      (int blank_
  static void i810fb_release_resource       (struct fb_info *info, struct i810fb_par *par);
  
@@ -36494,9 +36483,9 @@ diff -urNp linux-3.0.9/drivers/video/i810/i810_main.c linux-3.0.9/drivers/video/
  	"Intel(R) 810 Framebuffer Device"                                 ,
  	"Intel(R) 810-DC100 Framebuffer Device"                           ,
  	"Intel(R) 810E Framebuffer Device"                                ,
-diff -urNp linux-3.0.9/drivers/video/jz4740_fb.c linux-3.0.9/drivers/video/jz4740_fb.c
---- linux-3.0.9/drivers/video/jz4740_fb.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/jz4740_fb.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/video/jz4740_fb.c linux-3.1.1/drivers/video/jz4740_fb.c
+--- linux-3.1.1/drivers/video/jz4740_fb.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/jz4740_fb.c	2011-11-16 18:39:08.000000000 -0500
 @@ -136,7 +136,7 @@ struct jzfb {
  	uint32_t pseudo_palette[16];
  };
@@ -36506,9 +36495,9 @@ diff -urNp linux-3.0.9/drivers/video/jz4740_fb.c linux-3.0.9/drivers/video/jz474
  	.id		= "JZ4740 FB",
  	.type		= FB_TYPE_PACKED_PIXELS,
  	.visual		= FB_VISUAL_TRUECOLOR,
-diff -urNp linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm
---- linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/video/logo/logo_linux_clut224.ppm linux-3.1.1/drivers/video/logo/logo_linux_clut224.ppm
+--- linux-3.1.1/drivers/video/logo/logo_linux_clut224.ppm	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/logo/logo_linux_clut224.ppm	2011-11-16 18:40:29.000000000 -0500
 @@ -1,1604 +1,1123 @@
  P3
 -# Standard 224-color Linux logo
@@ -39234,10 +39223,10 @@ diff -urNp linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.9/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.9/drivers/video/udlfb.c linux-3.0.9/drivers/video/udlfb.c
---- linux-3.0.9/drivers/video/udlfb.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/udlfb.c	2011-11-15 20:02:59.000000000 -0500
-@@ -586,11 +586,11 @@ int dlfb_handle_damage(struct dlfb_data 
+diff -urNp linux-3.1.1/drivers/video/udlfb.c linux-3.1.1/drivers/video/udlfb.c
+--- linux-3.1.1/drivers/video/udlfb.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/udlfb.c	2011-11-16 18:39:08.000000000 -0500
+@@ -585,11 +585,11 @@ int dlfb_handle_damage(struct dlfb_data 
  		dlfb_urb_completion(urb);
  
  error:
@@ -39253,7 +39242,7 @@ diff -urNp linux-3.0.9/drivers/video/udlfb.c linux-3.0.9/drivers/video/udlfb.c
  		    >> 10)), /* Kcycles */
  		   &dev->cpu_kcycles_used);
  
-@@ -711,11 +711,11 @@ static void dlfb_dpy_deferred_io(struct 
+@@ -710,11 +710,11 @@ static void dlfb_dpy_deferred_io(struct 
  		dlfb_urb_completion(urb);
  
  error:
@@ -39269,7 +39258,7 @@ diff -urNp linux-3.0.9/drivers/video/udlfb.c linux-3.0.9/drivers/video/udlfb.c
  		    >> 10)), /* Kcycles */
  		   &dev->cpu_kcycles_used);
  }
-@@ -1307,7 +1307,7 @@ static ssize_t metrics_bytes_rendered_sh
+@@ -1306,7 +1306,7 @@ static ssize_t metrics_bytes_rendered_sh
  	struct fb_info *fb_info = dev_get_drvdata(fbdev);
  	struct dlfb_data *dev = fb_info->par;
  	return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -39278,7 +39267,7 @@ diff -urNp linux-3.0.9/drivers/video/udlfb.c linux-3.0.9/drivers/video/udlfb.c
  }
  
  static ssize_t metrics_bytes_identical_show(struct device *fbdev,
-@@ -1315,7 +1315,7 @@ static ssize_t metrics_bytes_identical_s
+@@ -1314,7 +1314,7 @@ static ssize_t metrics_bytes_identical_s
  	struct fb_info *fb_info = dev_get_drvdata(fbdev);
  	struct dlfb_data *dev = fb_info->par;
  	return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -39287,7 +39276,7 @@ diff -urNp linux-3.0.9/drivers/video/udlfb.c linux-3.0.9/drivers/video/udlfb.c
  }
  
  static ssize_t metrics_bytes_sent_show(struct device *fbdev,
-@@ -1323,7 +1323,7 @@ static ssize_t metrics_bytes_sent_show(s
+@@ -1322,7 +1322,7 @@ static ssize_t metrics_bytes_sent_show(s
  	struct fb_info *fb_info = dev_get_drvdata(fbdev);
  	struct dlfb_data *dev = fb_info->par;
  	return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -39296,7 +39285,7 @@ diff -urNp linux-3.0.9/drivers/video/udlfb.c linux-3.0.9/drivers/video/udlfb.c
  }
  
  static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
-@@ -1331,7 +1331,7 @@ static ssize_t metrics_cpu_kcycles_used_
+@@ -1330,7 +1330,7 @@ static ssize_t metrics_cpu_kcycles_used_
  	struct fb_info *fb_info = dev_get_drvdata(fbdev);
  	struct dlfb_data *dev = fb_info->par;
  	return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -39305,7 +39294,7 @@ diff -urNp linux-3.0.9/drivers/video/udlfb.c linux-3.0.9/drivers/video/udlfb.c
  }
  
  static ssize_t edid_show(
-@@ -1388,10 +1388,10 @@ static ssize_t metrics_reset_store(struc
+@@ -1387,10 +1387,10 @@ static ssize_t metrics_reset_store(struc
  	struct fb_info *fb_info = dev_get_drvdata(fbdev);
  	struct dlfb_data *dev = fb_info->par;
  
@@ -39320,9 +39309,9 @@ diff -urNp linux-3.0.9/drivers/video/udlfb.c linux-3.0.9/drivers/video/udlfb.c
  
  	return count;
  }
-diff -urNp linux-3.0.9/drivers/video/uvesafb.c linux-3.0.9/drivers/video/uvesafb.c
---- linux-3.0.9/drivers/video/uvesafb.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/uvesafb.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/video/uvesafb.c linux-3.1.1/drivers/video/uvesafb.c
+--- linux-3.1.1/drivers/video/uvesafb.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/uvesafb.c	2011-11-16 18:39:08.000000000 -0500
 @@ -19,6 +19,7 @@
  #include <linux/io.h>
  #include <linux/mutex.h>
@@ -39398,9 +39387,9 @@ diff -urNp linux-3.0.9/drivers/video/uvesafb.c linux-3.0.9/drivers/video/uvesafb
  		}
  
  		framebuffer_release(info);
-diff -urNp linux-3.0.9/drivers/video/vesafb.c linux-3.0.9/drivers/video/vesafb.c
---- linux-3.0.9/drivers/video/vesafb.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/vesafb.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/video/vesafb.c linux-3.1.1/drivers/video/vesafb.c
+--- linux-3.1.1/drivers/video/vesafb.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/vesafb.c	2011-11-16 18:39:08.000000000 -0500
 @@ -9,6 +9,7 @@
   */
  
@@ -39503,9 +39492,9 @@ diff -urNp linux-3.0.9/drivers/video/vesafb.c linux-3.0.9/drivers/video/vesafb.c
  	if (info->screen_base)
  		iounmap(info->screen_base);
  	framebuffer_release(info);
-diff -urNp linux-3.0.9/drivers/video/via/via_clock.h linux-3.0.9/drivers/video/via/via_clock.h
---- linux-3.0.9/drivers/video/via/via_clock.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/via/via_clock.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/video/via/via_clock.h linux-3.1.1/drivers/video/via/via_clock.h
+--- linux-3.1.1/drivers/video/via/via_clock.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/via/via_clock.h	2011-11-16 18:39:08.000000000 -0500
 @@ -56,7 +56,7 @@ struct via_clock {
  
  	void (*set_engine_pll_state)(u8 state);
@@ -39515,9 +39504,9 @@ diff -urNp linux-3.0.9/drivers/video/via/via_clock.h linux-3.0.9/drivers/video/v
  
  
  static inline u32 get_pll_internal_frequency(u32 ref_freq,
-diff -urNp linux-3.0.9/drivers/virtio/virtio_balloon.c linux-3.0.9/drivers/virtio/virtio_balloon.c
---- linux-3.0.9/drivers/virtio/virtio_balloon.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/virtio/virtio_balloon.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/drivers/virtio/virtio_balloon.c linux-3.1.1/drivers/virtio/virtio_balloon.c
+--- linux-3.1.1/drivers/virtio/virtio_balloon.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/virtio/virtio_balloon.c	2011-11-16 18:40:29.000000000 -0500
 @@ -174,6 +174,8 @@ static void update_balloon_stats(struct 
  	struct sysinfo i;
  	int idx = 0;
@@ -39527,10 +39516,32 @@ diff -urNp linux-3.0.9/drivers/virtio/virtio_balloon.c linux-3.0.9/drivers/virti
  	all_vm_events(events);
  	si_meminfo(&i);
  
-diff -urNp linux-3.0.9/fs/9p/vfs_inode.c linux-3.0.9/fs/9p/vfs_inode.c
---- linux-3.0.9/fs/9p/vfs_inode.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/9p/vfs_inode.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1264,7 +1264,7 @@ static void *v9fs_vfs_follow_link(struct
+diff -urNp linux-3.1.1/drivers/xen/xen-pciback/conf_space.h linux-3.1.1/drivers/xen/xen-pciback/conf_space.h
+--- linux-3.1.1/drivers/xen/xen-pciback/conf_space.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/xen/xen-pciback/conf_space.h	2011-11-16 18:39:08.000000000 -0500
+@@ -44,15 +44,15 @@ struct config_field {
+ 		struct {
+ 			conf_dword_write write;
+ 			conf_dword_read read;
+-		} dw;
++		} __no_const dw;
+ 		struct {
+ 			conf_word_write write;
+ 			conf_word_read read;
+-		} w;
++		} __no_const w;
+ 		struct {
+ 			conf_byte_write write;
+ 			conf_byte_read read;
+-		} b;
++		} __no_const b;
+ 	} u;
+ 	struct list_head list;
+ };
+diff -urNp linux-3.1.1/fs/9p/vfs_inode.c linux-3.1.1/fs/9p/vfs_inode.c
+--- linux-3.1.1/fs/9p/vfs_inode.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/9p/vfs_inode.c	2011-11-16 18:39:08.000000000 -0500
+@@ -1288,7 +1288,7 @@ static void *v9fs_vfs_follow_link(struct
  void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -39539,9 +39550,9 @@ diff -urNp linux-3.0.9/fs/9p/vfs_inode.c linux-3.0.9/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.9/fs/aio.c linux-3.0.9/fs/aio.c
---- linux-3.0.9/fs/aio.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/aio.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/aio.c linux-3.1.1/fs/aio.c
+--- linux-3.1.1/fs/aio.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/aio.c	2011-11-16 18:40:29.000000000 -0500
 @@ -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;
@@ -39590,9 +39601,9 @@ diff -urNp linux-3.0.9/fs/aio.c linux-3.0.9/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.9/fs/attr.c linux-3.0.9/fs/attr.c
---- linux-3.0.9/fs/attr.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/attr.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/attr.c linux-3.1.1/fs/attr.c
+--- linux-3.1.1/fs/attr.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/attr.c	2011-11-16 18:40:29.000000000 -0500
 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode 
  		unsigned long limit;
  
@@ -39601,9 +39612,9 @@ diff -urNp linux-3.0.9/fs/attr.c linux-3.0.9/fs/attr.c
  		if (limit != RLIM_INFINITY && offset > limit)
  			goto out_sig;
  		if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-3.0.9/fs/autofs4/waitq.c linux-3.0.9/fs/autofs4/waitq.c
---- linux-3.0.9/fs/autofs4/waitq.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/autofs4/waitq.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/autofs4/waitq.c linux-3.1.1/fs/autofs4/waitq.c
+--- linux-3.1.1/fs/autofs4/waitq.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/autofs4/waitq.c	2011-11-16 18:39:08.000000000 -0500
 @@ -60,7 +60,7 @@ static int autofs4_write(struct file *fi
  {
  	unsigned long sigpipe, flags;
@@ -39613,9 +39624,9 @@ diff -urNp linux-3.0.9/fs/autofs4/waitq.c linux-3.0.9/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.9/fs/befs/linuxvfs.c linux-3.0.9/fs/befs/linuxvfs.c
---- linux-3.0.9/fs/befs/linuxvfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/befs/linuxvfs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/befs/linuxvfs.c linux-3.1.1/fs/befs/linuxvfs.c
+--- linux-3.1.1/fs/befs/linuxvfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/befs/linuxvfs.c	2011-11-16 18:39:08.000000000 -0500
 @@ -503,7 +503,7 @@ static void befs_put_link(struct dentry 
  {
  	befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -39625,9 +39636,9 @@ diff -urNp linux-3.0.9/fs/befs/linuxvfs.c linux-3.0.9/fs/befs/linuxvfs.c
  		if (!IS_ERR(link))
  			kfree(link);
  	}
-diff -urNp linux-3.0.9/fs/binfmt_aout.c linux-3.0.9/fs/binfmt_aout.c
---- linux-3.0.9/fs/binfmt_aout.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/binfmt_aout.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/binfmt_aout.c linux-3.1.1/fs/binfmt_aout.c
+--- linux-3.1.1/fs/binfmt_aout.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/binfmt_aout.c	2011-11-16 18:40:29.000000000 -0500
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -39704,9 +39715,9 @@ diff -urNp linux-3.0.9/fs/binfmt_aout.c linux-3.0.9/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.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
---- linux-3.0.9/fs/binfmt_elf.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/binfmt_elf.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/binfmt_elf.c linux-3.1.1/fs/binfmt_elf.c
+--- linux-3.1.1/fs/binfmt_elf.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/binfmt_elf.c	2011-11-16 18:40:29.000000000 -0500
 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
  #define elf_core_dump	NULL
  #endif
@@ -40057,7 +40068,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  
  	loc = kmalloc(sizeof(*loc), GFP_KERNEL);
  	if (!loc) {
-@@ -714,11 +931,81 @@ static int load_elf_binary(struct linux_
+@@ -713,11 +930,81 @@ static int load_elf_binary(struct linux_
  
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
@@ -40140,7 +40151,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  	if (elf_read_implies_exec(loc->elf_ex, executable_stack))
  		current->personality |= READ_IMPLIES_EXEC;
  
-@@ -809,6 +1096,20 @@ static int load_elf_binary(struct linux_
+@@ -808,6 +1095,20 @@ static int load_elf_binary(struct linux_
  #else
  			load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
  #endif
@@ -40161,7 +40172,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  		}
  
  		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
-@@ -841,9 +1142,9 @@ static int load_elf_binary(struct linux_
+@@ -840,9 +1141,9 @@ static int load_elf_binary(struct linux_
  		 * allowed task size. Note that p_filesz must always be
  		 * <= p_memsz so it is only necessary to check p_memsz.
  		 */
@@ -40174,7 +40185,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  			/* set_brk can never work. Avoid overflows. */
  			send_sig(SIGKILL, current, 0);
  			retval = -EINVAL;
-@@ -871,6 +1172,11 @@ static int load_elf_binary(struct linux_
+@@ -870,6 +1171,11 @@ static int load_elf_binary(struct linux_
  	start_data += load_bias;
  	end_data += load_bias;
  
@@ -40186,7 +40197,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  	/* Calling set_brk effectively mmaps the pages that we need
  	 * for the bss and break sections.  We must do this before
  	 * mapping in the interpreter, to make sure it doesn't wind
-@@ -882,9 +1188,11 @@ static int load_elf_binary(struct linux_
+@@ -881,9 +1187,11 @@ static int load_elf_binary(struct linux_
  		goto out_free_dentry;
  	}
  	if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
@@ -40201,7 +40212,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  	}
  
  	if (elf_interpreter) {
-@@ -1099,7 +1407,7 @@ out:
+@@ -1098,7 +1406,7 @@ out:
   * Decide what to dump of a segment, part, all or none.
   */
  static unsigned long vma_dump_size(struct vm_area_struct *vma,
@@ -40210,7 +40221,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  {
  #define FILTER(type)	(mm_flags & (1UL << MMF_DUMP_##type))
  
-@@ -1133,7 +1441,7 @@ static unsigned long vma_dump_size(struc
+@@ -1132,7 +1440,7 @@ static unsigned long vma_dump_size(struc
  	if (vma->vm_file == NULL)
  		return 0;
  
@@ -40219,7 +40230,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  		goto whole;
  
  	/*
-@@ -1355,9 +1663,9 @@ static void fill_auxv_note(struct memelf
+@@ -1354,9 +1662,9 @@ static void fill_auxv_note(struct memelf
  {
  	elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
  	int i = 0;
@@ -40231,7 +40242,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  	fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
  }
  
-@@ -1863,14 +2171,14 @@ static void fill_extnum_info(struct elfh
+@@ -1862,14 +2170,14 @@ static void fill_extnum_info(struct elfh
  }
  
  static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
@@ -40248,7 +40259,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  	return size;
  }
  
-@@ -1964,7 +2272,7 @@ static int elf_core_dump(struct coredump
+@@ -1963,7 +2271,7 @@ static int elf_core_dump(struct coredump
  
  	dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
  
@@ -40257,7 +40268,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  	offset += elf_core_extra_data_size();
  	e_shoff = offset;
  
-@@ -1978,10 +2286,12 @@ static int elf_core_dump(struct coredump
+@@ -1977,10 +2285,12 @@ static int elf_core_dump(struct coredump
  	offset = dataoff;
  
  	size += sizeof(*elf);
@@ -40270,7 +40281,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  	if (size > cprm->limit
  	    || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
  		goto end_coredump;
-@@ -1995,7 +2305,7 @@ static int elf_core_dump(struct coredump
+@@ -1994,7 +2304,7 @@ static int elf_core_dump(struct coredump
  		phdr.p_offset = offset;
  		phdr.p_vaddr = vma->vm_start;
  		phdr.p_paddr = 0;
@@ -40279,7 +40290,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  		phdr.p_memsz = vma->vm_end - vma->vm_start;
  		offset += phdr.p_filesz;
  		phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
-@@ -2006,6 +2316,7 @@ static int elf_core_dump(struct coredump
+@@ -2005,6 +2315,7 @@ static int elf_core_dump(struct coredump
  		phdr.p_align = ELF_EXEC_PAGESIZE;
  
  		size += sizeof(phdr);
@@ -40287,7 +40298,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  		if (size > cprm->limit
  		    || !dump_write(cprm->file, &phdr, sizeof(phdr)))
  			goto end_coredump;
-@@ -2030,7 +2341,7 @@ static int elf_core_dump(struct coredump
+@@ -2029,7 +2340,7 @@ static int elf_core_dump(struct coredump
  		unsigned long addr;
  		unsigned long end;
  
@@ -40296,7 +40307,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  
  		for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
  			struct page *page;
-@@ -2039,6 +2350,7 @@ static int elf_core_dump(struct coredump
+@@ -2038,6 +2349,7 @@ static int elf_core_dump(struct coredump
  			page = get_dump_page(addr);
  			if (page) {
  				void *kaddr = kmap(page);
@@ -40304,7 +40315,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  				stop = ((size += PAGE_SIZE) > cprm->limit) ||
  					!dump_write(cprm->file, kaddr,
  						    PAGE_SIZE);
-@@ -2056,6 +2368,7 @@ static int elf_core_dump(struct coredump
+@@ -2055,6 +2367,7 @@ static int elf_core_dump(struct coredump
  
  	if (e_phnum == PN_XNUM) {
  		size += sizeof(*shdr4extnum);
@@ -40312,7 +40323,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  		if (size > cprm->limit
  		    || !dump_write(cprm->file, shdr4extnum,
  				   sizeof(*shdr4extnum)))
-@@ -2076,6 +2389,97 @@ out:
+@@ -2075,6 +2388,97 @@ out:
  
  #endif		/* CONFIG_ELF_CORE */
  
@@ -40410,9 +40421,9 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
  static int __init init_elf_binfmt(void)
  {
  	return register_binfmt(&elf_format);
-diff -urNp linux-3.0.9/fs/binfmt_flat.c linux-3.0.9/fs/binfmt_flat.c
---- linux-3.0.9/fs/binfmt_flat.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/binfmt_flat.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/binfmt_flat.c linux-3.1.1/fs/binfmt_flat.c
+--- linux-3.1.1/fs/binfmt_flat.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/binfmt_flat.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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",
@@ -40445,9 +40456,9 @@ diff -urNp linux-3.0.9/fs/binfmt_flat.c linux-3.0.9/fs/binfmt_flat.c
  			ret = result;
  			goto err;
  		}
-diff -urNp linux-3.0.9/fs/bio.c linux-3.0.9/fs/bio.c
---- linux-3.0.9/fs/bio.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/bio.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/bio.c linux-3.1.1/fs/bio.c
+--- linux-3.1.1/fs/bio.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/bio.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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;
@@ -40457,10 +40468,10 @@ diff -urNp linux-3.0.9/fs/bio.c linux-3.0.9/fs/bio.c
  
  	__bio_for_each_segment(bvec, bio, i, 0) {
  		char *addr = page_address(bvec->bv_page);
-diff -urNp linux-3.0.9/fs/block_dev.c linux-3.0.9/fs/block_dev.c
---- linux-3.0.9/fs/block_dev.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/block_dev.c	2011-11-15 20:02:59.000000000 -0500
-@@ -671,7 +671,7 @@ static bool bd_may_claim(struct block_de
+diff -urNp linux-3.1.1/fs/block_dev.c linux-3.1.1/fs/block_dev.c
+--- linux-3.1.1/fs/block_dev.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/block_dev.c	2011-11-16 18:39:08.000000000 -0500
+@@ -681,7 +681,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 */
  
@@ -40469,10 +40480,10 @@ diff -urNp linux-3.0.9/fs/block_dev.c linux-3.0.9/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.9/fs/btrfs/ctree.c linux-3.0.9/fs/btrfs/ctree.c
---- linux-3.0.9/fs/btrfs/ctree.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/btrfs/ctree.c	2011-11-15 20:02:59.000000000 -0500
-@@ -454,9 +454,12 @@ static noinline int __btrfs_cow_block(st
+diff -urNp linux-3.1.1/fs/btrfs/ctree.c linux-3.1.1/fs/btrfs/ctree.c
+--- linux-3.1.1/fs/btrfs/ctree.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/btrfs/ctree.c	2011-11-16 18:39:08.000000000 -0500
+@@ -488,9 +488,12 @@ static noinline int __btrfs_cow_block(st
  		free_extent_buffer(buf);
  		add_root_to_dirty_list(root);
  	} else {
@@ -40488,10 +40499,10 @@ diff -urNp linux-3.0.9/fs/btrfs/ctree.c linux-3.0.9/fs/btrfs/ctree.c
  			parent_start = 0;
  
  		WARN_ON(trans->transid != btrfs_header_generation(parent));
-diff -urNp linux-3.0.9/fs/btrfs/inode.c linux-3.0.9/fs/btrfs/inode.c
---- linux-3.0.9/fs/btrfs/inode.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/btrfs/inode.c	2011-11-15 20:02:59.000000000 -0500
-@@ -6896,7 +6896,7 @@ fail:
+diff -urNp linux-3.1.1/fs/btrfs/inode.c linux-3.1.1/fs/btrfs/inode.c
+--- linux-3.1.1/fs/btrfs/inode.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/btrfs/inode.c	2011-11-16 18:40:29.000000000 -0500
+@@ -6922,7 +6922,7 @@ fail:
  	return -ENOMEM;
  }
  
@@ -40500,7 +40511,7 @@ diff -urNp linux-3.0.9/fs/btrfs/inode.c linux-3.0.9/fs/btrfs/inode.c
  			 struct dentry *dentry, struct kstat *stat)
  {
  	struct inode *inode = dentry->d_inode;
-@@ -6908,6 +6908,14 @@ static int btrfs_getattr(struct vfsmount
+@@ -6934,6 +6934,14 @@ static int btrfs_getattr(struct vfsmount
  	return 0;
  }
  
@@ -40515,10 +40526,10 @@ diff -urNp linux-3.0.9/fs/btrfs/inode.c linux-3.0.9/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.9/fs/btrfs/ioctl.c linux-3.0.9/fs/btrfs/ioctl.c
---- linux-3.0.9/fs/btrfs/ioctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/btrfs/ioctl.c	2011-11-15 20:02:59.000000000 -0500
-@@ -2676,9 +2676,12 @@ long btrfs_ioctl_space_info(struct btrfs
+diff -urNp linux-3.1.1/fs/btrfs/ioctl.c linux-3.1.1/fs/btrfs/ioctl.c
+--- linux-3.1.1/fs/btrfs/ioctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/btrfs/ioctl.c	2011-11-16 18:40:29.000000000 -0500
+@@ -2704,9 +2704,12 @@ long btrfs_ioctl_space_info(struct btrfs
  	for (i = 0; i < num_types; i++) {
  		struct btrfs_space_info *tmp;
  
@@ -40531,7 +40542,7 @@ diff -urNp linux-3.0.9/fs/btrfs/ioctl.c linux-3.0.9/fs/btrfs/ioctl.c
  		info = NULL;
  		rcu_read_lock();
  		list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
-@@ -2700,15 +2703,12 @@ long btrfs_ioctl_space_info(struct btrfs
+@@ -2728,15 +2731,12 @@ long btrfs_ioctl_space_info(struct btrfs
  				memcpy(dest, &space, sizeof(space));
  				dest++;
  				space_args.total_spaces++;
@@ -40548,9 +40559,9 @@ diff -urNp linux-3.0.9/fs/btrfs/ioctl.c linux-3.0.9/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.9/fs/btrfs/relocation.c linux-3.0.9/fs/btrfs/relocation.c
---- linux-3.0.9/fs/btrfs/relocation.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/btrfs/relocation.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/btrfs/relocation.c linux-3.1.1/fs/btrfs/relocation.c
+--- linux-3.1.1/fs/btrfs/relocation.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/btrfs/relocation.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1242,7 +1242,7 @@ static int __update_reloc_root(struct bt
  	}
  	spin_unlock(&rc->reloc_root_tree.lock);
@@ -40560,9 +40571,9 @@ diff -urNp linux-3.0.9/fs/btrfs/relocation.c linux-3.0.9/fs/btrfs/relocation.c
  
  	if (!del) {
  		spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-3.0.9/fs/cachefiles/bind.c linux-3.0.9/fs/cachefiles/bind.c
---- linux-3.0.9/fs/cachefiles/bind.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cachefiles/bind.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/cachefiles/bind.c linux-3.1.1/fs/cachefiles/bind.c
+--- linux-3.1.1/fs/cachefiles/bind.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cachefiles/bind.c	2011-11-16 18:39:08.000000000 -0500
 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
  	       args);
  
@@ -40579,9 +40590,9 @@ diff -urNp linux-3.0.9/fs/cachefiles/bind.c linux-3.0.9/fs/cachefiles/bind.c
  	       cache->bcull_percent < cache->brun_percent &&
  	       cache->brun_percent  < 100);
  
-diff -urNp linux-3.0.9/fs/cachefiles/daemon.c linux-3.0.9/fs/cachefiles/daemon.c
---- linux-3.0.9/fs/cachefiles/daemon.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cachefiles/daemon.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/cachefiles/daemon.c linux-3.1.1/fs/cachefiles/daemon.c
+--- linux-3.1.1/fs/cachefiles/daemon.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cachefiles/daemon.c	2011-11-16 18:39:08.000000000 -0500
 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
  	if (n > buflen)
  		return -EMSGSIZE;
@@ -40618,9 +40629,9 @@ diff -urNp linux-3.0.9/fs/cachefiles/daemon.c linux-3.0.9/fs/cachefiles/daemon.c
  		return cachefiles_daemon_range_error(cache, args);
  
  	cache->bstop_percent = bstop;
-diff -urNp linux-3.0.9/fs/cachefiles/internal.h linux-3.0.9/fs/cachefiles/internal.h
---- linux-3.0.9/fs/cachefiles/internal.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cachefiles/internal.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/cachefiles/internal.h linux-3.1.1/fs/cachefiles/internal.h
+--- linux-3.1.1/fs/cachefiles/internal.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cachefiles/internal.h	2011-11-16 18:39:08.000000000 -0500
 @@ -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) */
@@ -40655,9 +40666,9 @@ diff -urNp linux-3.0.9/fs/cachefiles/internal.h linux-3.0.9/fs/cachefiles/intern
  }
  
  #else
-diff -urNp linux-3.0.9/fs/cachefiles/namei.c linux-3.0.9/fs/cachefiles/namei.c
---- linux-3.0.9/fs/cachefiles/namei.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cachefiles/namei.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/cachefiles/namei.c linux-3.1.1/fs/cachefiles/namei.c
+--- linux-3.1.1/fs/cachefiles/namei.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cachefiles/namei.c	2011-11-16 18:39:08.000000000 -0500
 @@ -318,7 +318,7 @@ try_again:
  	/* first step is to make up a grave dentry in the graveyard */
  	sprintf(nbuffer, "%08x%08x",
@@ -40667,9 +40678,9 @@ diff -urNp linux-3.0.9/fs/cachefiles/namei.c linux-3.0.9/fs/cachefiles/namei.c
  
  	/* do the multiway lock magic */
  	trap = lock_rename(cache->graveyard, dir);
-diff -urNp linux-3.0.9/fs/cachefiles/proc.c linux-3.0.9/fs/cachefiles/proc.c
---- linux-3.0.9/fs/cachefiles/proc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cachefiles/proc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/cachefiles/proc.c linux-3.1.1/fs/cachefiles/proc.c
+--- linux-3.1.1/fs/cachefiles/proc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cachefiles/proc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -14,9 +14,9 @@
  #include <linux/seq_file.h>
  #include "internal.h"
@@ -40696,9 +40707,9 @@ diff -urNp linux-3.0.9/fs/cachefiles/proc.c linux-3.0.9/fs/cachefiles/proc.c
  		if (x == 0 && y == 0 && z == 0)
  			return 0;
  
-diff -urNp linux-3.0.9/fs/cachefiles/rdwr.c linux-3.0.9/fs/cachefiles/rdwr.c
---- linux-3.0.9/fs/cachefiles/rdwr.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cachefiles/rdwr.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/cachefiles/rdwr.c linux-3.1.1/fs/cachefiles/rdwr.c
+--- linux-3.1.1/fs/cachefiles/rdwr.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cachefiles/rdwr.c	2011-11-16 18:39:08.000000000 -0500
 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
  			old_fs = get_fs();
  			set_fs(KERNEL_DS);
@@ -40708,10 +40719,10 @@ diff -urNp linux-3.0.9/fs/cachefiles/rdwr.c linux-3.0.9/fs/cachefiles/rdwr.c
  			set_fs(old_fs);
  			kunmap(page);
  			if (ret != len)
-diff -urNp linux-3.0.9/fs/ceph/dir.c linux-3.0.9/fs/ceph/dir.c
---- linux-3.0.9/fs/ceph/dir.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ceph/dir.c	2011-11-15 20:02:59.000000000 -0500
-@@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil
+diff -urNp linux-3.1.1/fs/ceph/dir.c linux-3.1.1/fs/ceph/dir.c
+--- linux-3.1.1/fs/ceph/dir.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ceph/dir.c	2011-11-16 18:39:08.000000000 -0500
+@@ -244,7 +244,7 @@ static int ceph_readdir(struct file *fil
  	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
  	struct ceph_mds_client *mdsc = fsc->mdsc;
  	unsigned frag = fpos_frag(filp->f_pos);
@@ -40720,9 +40731,9 @@ diff -urNp linux-3.0.9/fs/ceph/dir.c linux-3.0.9/fs/ceph/dir.c
  	int err;
  	u32 ftype;
  	struct ceph_mds_reply_info_parsed *rinfo;
-diff -urNp linux-3.0.9/fs/cifs/cifs_debug.c linux-3.0.9/fs/cifs/cifs_debug.c
---- linux-3.0.9/fs/cifs/cifs_debug.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cifs/cifs_debug.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/cifs/cifs_debug.c linux-3.1.1/fs/cifs/cifs_debug.c
+--- linux-3.1.1/fs/cifs/cifs_debug.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cifs/cifs_debug.c	2011-11-16 18:39:08.000000000 -0500
 @@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(str
  
  	if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
@@ -40852,10 +40863,10 @@ diff -urNp linux-3.0.9/fs/cifs/cifs_debug.c linux-3.0.9/fs/cifs/cifs_debug.c
  			}
  		}
  	}
-diff -urNp linux-3.0.9/fs/cifs/cifsfs.c linux-3.0.9/fs/cifs/cifsfs.c
---- linux-3.0.9/fs/cifs/cifsfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cifs/cifsfs.c	2011-11-15 20:02:59.000000000 -0500
-@@ -996,7 +996,7 @@ cifs_init_request_bufs(void)
+diff -urNp linux-3.1.1/fs/cifs/cifsfs.c linux-3.1.1/fs/cifs/cifsfs.c
+--- linux-3.1.1/fs/cifs/cifsfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cifs/cifsfs.c	2011-11-16 18:39:08.000000000 -0500
+@@ -981,7 +981,7 @@ cifs_init_request_bufs(void)
  	cifs_req_cachep = kmem_cache_create("cifs_request",
  					    CIFSMaxBufSize +
  					    MAX_CIFS_HDR_SIZE, 0,
@@ -40864,7 +40875,7 @@ diff -urNp linux-3.0.9/fs/cifs/cifsfs.c linux-3.0.9/fs/cifs/cifsfs.c
  	if (cifs_req_cachep == NULL)
  		return -ENOMEM;
  
-@@ -1023,7 +1023,7 @@ cifs_init_request_bufs(void)
+@@ -1008,7 +1008,7 @@ cifs_init_request_bufs(void)
  	efficient to alloc 1 per page off the slab compared to 17K (5page)
  	alloc of large cifs buffers even when page debugging is on */
  	cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
@@ -40873,7 +40884,7 @@ diff -urNp linux-3.0.9/fs/cifs/cifsfs.c linux-3.0.9/fs/cifs/cifsfs.c
  			NULL);
  	if (cifs_sm_req_cachep == NULL) {
  		mempool_destroy(cifs_req_poolp);
-@@ -1108,8 +1108,8 @@ init_cifs(void)
+@@ -1093,8 +1093,8 @@ init_cifs(void)
  	atomic_set(&bufAllocCount, 0);
  	atomic_set(&smBufAllocCount, 0);
  #ifdef CONFIG_CIFS_STATS2
@@ -40884,9 +40895,9 @@ diff -urNp linux-3.0.9/fs/cifs/cifsfs.c linux-3.0.9/fs/cifs/cifsfs.c
  #endif /* CONFIG_CIFS_STATS2 */
  
  	atomic_set(&midCount, 0);
-diff -urNp linux-3.0.9/fs/cifs/cifsglob.h linux-3.0.9/fs/cifs/cifsglob.h
---- linux-3.0.9/fs/cifs/cifsglob.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cifs/cifsglob.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/cifs/cifsglob.h linux-3.1.1/fs/cifs/cifsglob.h
+--- linux-3.1.1/fs/cifs/cifsglob.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cifs/cifsglob.h	2011-11-16 18:39:08.000000000 -0500
 @@ -381,28 +381,28 @@ struct cifs_tcon {
  	__u16 Flags;		/* optional support bits */
  	enum statusEnum tidStatus;
@@ -40947,7 +40958,7 @@ diff -urNp linux-3.0.9/fs/cifs/cifsglob.h linux-3.0.9/fs/cifs/cifsglob.h
  
  static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
  					    unsigned int bytes)
-@@ -911,8 +911,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnect
+@@ -953,8 +953,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnect
  /* Various Debug counters */
  GLOBAL_EXTERN atomic_t bufAllocCount;    /* current number allocated  */
  #ifdef CONFIG_CIFS_STATS2
@@ -40958,10 +40969,10 @@ diff -urNp linux-3.0.9/fs/cifs/cifsglob.h linux-3.0.9/fs/cifs/cifsglob.h
  #endif
  GLOBAL_EXTERN atomic_t smBufAllocCount;
  GLOBAL_EXTERN atomic_t midCount;
-diff -urNp linux-3.0.9/fs/cifs/link.c linux-3.0.9/fs/cifs/link.c
---- linux-3.0.9/fs/cifs/link.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cifs/link.c	2011-11-15 20:02:59.000000000 -0500
-@@ -587,7 +587,7 @@ symlink_exit:
+diff -urNp linux-3.1.1/fs/cifs/link.c linux-3.1.1/fs/cifs/link.c
+--- linux-3.1.1/fs/cifs/link.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cifs/link.c	2011-11-16 18:39:08.000000000 -0500
+@@ -593,7 +593,7 @@ symlink_exit:
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
  {
@@ -40970,9 +40981,9 @@ diff -urNp linux-3.0.9/fs/cifs/link.c linux-3.0.9/fs/cifs/link.c
  	if (!IS_ERR(p))
  		kfree(p);
  }
-diff -urNp linux-3.0.9/fs/cifs/misc.c linux-3.0.9/fs/cifs/misc.c
---- linux-3.0.9/fs/cifs/misc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cifs/misc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/cifs/misc.c linux-3.1.1/fs/cifs/misc.c
+--- linux-3.1.1/fs/cifs/misc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cifs/misc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -156,7 +156,7 @@ cifs_buf_get(void)
  		memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
  		atomic_inc(&bufAllocCount);
@@ -40991,9 +41002,9 @@ diff -urNp linux-3.0.9/fs/cifs/misc.c linux-3.0.9/fs/cifs/misc.c
  #endif /* CONFIG_CIFS_STATS2 */
  
  	}
-diff -urNp linux-3.0.9/fs/coda/cache.c linux-3.0.9/fs/coda/cache.c
---- linux-3.0.9/fs/coda/cache.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/coda/cache.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/coda/cache.c linux-3.1.1/fs/coda/cache.c
+--- linux-3.1.1/fs/coda/cache.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/coda/cache.c	2011-11-16 18:39:08.000000000 -0500
 @@ -24,7 +24,7 @@
  #include "coda_linux.h"
  #include "coda_cache.h"
@@ -41038,9 +41049,9 @@ diff -urNp linux-3.0.9/fs/coda/cache.c linux-3.0.9/fs/coda/cache.c
  	spin_unlock(&cii->c_lock);
  
  	return hit;
-diff -urNp linux-3.0.9/fs/compat_binfmt_elf.c linux-3.0.9/fs/compat_binfmt_elf.c
---- linux-3.0.9/fs/compat_binfmt_elf.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/compat_binfmt_elf.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/compat_binfmt_elf.c linux-3.1.1/fs/compat_binfmt_elf.c
+--- linux-3.1.1/fs/compat_binfmt_elf.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/compat_binfmt_elf.c	2011-11-16 18:39:08.000000000 -0500
 @@ -30,11 +30,13 @@
  #undef	elf_phdr
  #undef	elf_shdr
@@ -41055,9 +41066,9 @@ diff -urNp linux-3.0.9/fs/compat_binfmt_elf.c linux-3.0.9/fs/compat_binfmt_elf.c
  #define elf_addr_t	Elf32_Addr
  
  /*
-diff -urNp linux-3.0.9/fs/compat.c linux-3.0.9/fs/compat.c
---- linux-3.0.9/fs/compat.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/compat.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/compat.c linux-3.1.1/fs/compat.c
+--- linux-3.1.1/fs/compat.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/compat.c	2011-11-16 18:40:29.000000000 -0500
 @@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(const 
  static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
  {
@@ -41185,19 +41196,10 @@ diff -urNp linux-3.0.9/fs/compat.c linux-3.0.9/fs/compat.c
  	if (n < 0)
  		goto out_nofds;
  
-@@ -1904,7 +1924,7 @@ asmlinkage long compat_sys_nfsservctl(in
- 	oldfs = get_fs();
- 	set_fs(KERNEL_DS);
- 	/* The __user pointer casts are valid because of the set_fs() */
--	err = sys_nfsservctl(cmd, (void __user *) karg, (void __user *) kres);
-+	err = sys_nfsservctl(cmd, (void __force_user *) karg, (void __force_user *) kres);
- 	set_fs(oldfs);
- 
- 	if (err)
-diff -urNp linux-3.0.9/fs/compat_ioctl.c linux-3.0.9/fs/compat_ioctl.c
---- linux-3.0.9/fs/compat_ioctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/compat_ioctl.c	2011-11-15 20:02:59.000000000 -0500
-@@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
+diff -urNp linux-3.1.1/fs/compat_ioctl.c linux-3.1.1/fs/compat_ioctl.c
+--- linux-3.1.1/fs/compat_ioctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/compat_ioctl.c	2011-11-16 18:39:08.000000000 -0500
+@@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsi
  
  	err  = get_user(palp, &up->palette);
  	err |= get_user(length, &up->length);
@@ -41206,7 +41208,7 @@ diff -urNp linux-3.0.9/fs/compat_ioctl.c linux-3.0.9/fs/compat_ioctl.c
  
  	up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
  	err  = put_user(compat_ptr(palp), &up_native->palette);
-@@ -619,7 +621,7 @@ static int serial_struct_ioctl(unsigned 
+@@ -621,7 +623,7 @@ static int serial_struct_ioctl(unsigned 
  			return -EFAULT;
                  if (__get_user(udata, &ss32->iomem_base))
  			return -EFAULT;
@@ -41215,7 +41217,7 @@ diff -urNp linux-3.0.9/fs/compat_ioctl.c linux-3.0.9/fs/compat_ioctl.c
                  if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
  		    __get_user(ss.port_high, &ss32->port_high))
  			return -EFAULT;
-@@ -794,7 +796,7 @@ static int compat_ioctl_preallocate(stru
+@@ -796,7 +798,7 @@ static int compat_ioctl_preallocate(stru
  	    copy_in_user(&p->l_len,	&p32->l_len,	sizeof(s64)) ||
  	    copy_in_user(&p->l_sysid,	&p32->l_sysid,	sizeof(s32)) ||
  	    copy_in_user(&p->l_pid,	&p32->l_pid,	sizeof(u32)) ||
@@ -41224,7 +41226,7 @@ diff -urNp linux-3.0.9/fs/compat_ioctl.c linux-3.0.9/fs/compat_ioctl.c
  		return -EFAULT;
  
  	return ioctl_preallocate(file, p);
-@@ -1638,8 +1640,8 @@ asmlinkage long compat_sys_ioctl(unsigne
+@@ -1644,8 +1646,8 @@ asmlinkage long compat_sys_ioctl(unsigne
  static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
  {
  	unsigned int a, b;
@@ -41235,9 +41237,9 @@ diff -urNp linux-3.0.9/fs/compat_ioctl.c linux-3.0.9/fs/compat_ioctl.c
  	if (a > b)
  		return 1;
  	if (a < b)
-diff -urNp linux-3.0.9/fs/configfs/dir.c linux-3.0.9/fs/configfs/dir.c
---- linux-3.0.9/fs/configfs/dir.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/configfs/dir.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/configfs/dir.c linux-3.1.1/fs/configfs/dir.c
+--- linux-3.1.1/fs/configfs/dir.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/configfs/dir.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file 
  			}
  			for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
@@ -41262,10 +41264,10 @@ diff -urNp linux-3.0.9/fs/configfs/dir.c linux-3.0.9/fs/configfs/dir.c
  
  				/*
  				 * We'll have a dentry and an inode for
-diff -urNp linux-3.0.9/fs/dcache.c linux-3.0.9/fs/dcache.c
---- linux-3.0.9/fs/dcache.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/dcache.c	2011-11-15 20:02:59.000000000 -0500
-@@ -3089,7 +3089,7 @@ void __init vfs_caches_init(unsigned lon
+diff -urNp linux-3.1.1/fs/dcache.c linux-3.1.1/fs/dcache.c
+--- linux-3.1.1/fs/dcache.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/dcache.c	2011-11-16 18:39:08.000000000 -0500
+@@ -2998,7 +2998,7 @@ void __init vfs_caches_init(unsigned lon
  	mempages -= reserve;
  
  	names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
@@ -41274,10 +41276,10 @@ diff -urNp linux-3.0.9/fs/dcache.c linux-3.0.9/fs/dcache.c
  
  	dcache_init();
  	inode_init();
-diff -urNp linux-3.0.9/fs/ecryptfs/inode.c linux-3.0.9/fs/ecryptfs/inode.c
---- linux-3.0.9/fs/ecryptfs/inode.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ecryptfs/inode.c	2011-11-15 20:02:59.000000000 -0500
-@@ -704,7 +704,7 @@ static int ecryptfs_readlink_lower(struc
+diff -urNp linux-3.1.1/fs/ecryptfs/inode.c linux-3.1.1/fs/ecryptfs/inode.c
+--- linux-3.1.1/fs/ecryptfs/inode.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ecryptfs/inode.c	2011-11-16 18:39:08.000000000 -0500
+@@ -681,7 +681,7 @@ static int ecryptfs_readlink_lower(struc
  	old_fs = get_fs();
  	set_fs(get_ds());
  	rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
@@ -41286,7 +41288,7 @@ diff -urNp linux-3.0.9/fs/ecryptfs/inode.c linux-3.0.9/fs/ecryptfs/inode.c
  						   lower_bufsiz);
  	set_fs(old_fs);
  	if (rc < 0)
-@@ -750,7 +750,7 @@ static void *ecryptfs_follow_link(struct
+@@ -727,7 +727,7 @@ static void *ecryptfs_follow_link(struct
  	}
  	old_fs = get_fs();
  	set_fs(get_ds());
@@ -41295,7 +41297,7 @@ diff -urNp linux-3.0.9/fs/ecryptfs/inode.c linux-3.0.9/fs/ecryptfs/inode.c
  	set_fs(old_fs);
  	if (rc < 0) {
  		kfree(buf);
-@@ -765,7 +765,7 @@ out:
+@@ -742,7 +742,7 @@ out:
  static void
  ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
  {
@@ -41304,9 +41306,9 @@ diff -urNp linux-3.0.9/fs/ecryptfs/inode.c linux-3.0.9/fs/ecryptfs/inode.c
  	if (!IS_ERR(buf)) {
  		/* Free the char* */
  		kfree(buf);
-diff -urNp linux-3.0.9/fs/ecryptfs/miscdev.c linux-3.0.9/fs/ecryptfs/miscdev.c
---- linux-3.0.9/fs/ecryptfs/miscdev.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ecryptfs/miscdev.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ecryptfs/miscdev.c linux-3.1.1/fs/ecryptfs/miscdev.c
+--- linux-3.1.1/fs/ecryptfs/miscdev.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ecryptfs/miscdev.c	2011-11-16 18:39:08.000000000 -0500
 @@ -328,7 +328,7 @@ check_list:
  		goto out_unlock_msg_ctx;
  	i = 5;
@@ -41316,9 +41318,9 @@ diff -urNp linux-3.0.9/fs/ecryptfs/miscdev.c linux-3.0.9/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.9/fs/ecryptfs/read_write.c linux-3.0.9/fs/ecryptfs/read_write.c
---- linux-3.0.9/fs/ecryptfs/read_write.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ecryptfs/read_write.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ecryptfs/read_write.c linux-3.1.1/fs/ecryptfs/read_write.c
+--- linux-3.1.1/fs/ecryptfs/read_write.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ecryptfs/read_write.c	2011-11-16 18:39:08.000000000 -0500
 @@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *e
  		return -EIO;
  	fs_save = get_fs();
@@ -41337,9 +41339,9 @@ diff -urNp linux-3.0.9/fs/ecryptfs/read_write.c linux-3.0.9/fs/ecryptfs/read_wri
  	set_fs(fs_save);
  	return rc;
  }
-diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
---- linux-3.0.9/fs/exec.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/exec.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/exec.c linux-3.1.1/fs/exec.c
+--- linux-3.1.1/fs/exec.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/exec.c	2011-11-16 23:41:58.000000000 -0500
 @@ -55,12 +55,24 @@
  #include <linux/pipe_fs_i.h>
  #include <linux/oom.h>
@@ -41374,16 +41376,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  
  /* The maximal length of core_pattern is also specified in sysctl.c */
  
-@@ -116,7 +128,7 @@ SYSCALL_DEFINE1(uselib, const char __use
- 	char *tmp = getname(library);
- 	int error = PTR_ERR(tmp);
- 	static const struct open_flags uselib_flags = {
--		.open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,
-+		.open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC | FMODE_GREXEC,
- 		.acc_mode = MAY_READ | MAY_EXEC | MAY_OPEN,
- 		.intent = LOOKUP_OPEN
- 	};
-@@ -195,18 +207,10 @@ static struct page *get_arg_page(struct 
+@@ -188,18 +200,10 @@ static struct page *get_arg_page(struct 
  		int write)
  {
  	struct page *page;
@@ -41405,7 +41398,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  		return NULL;
  
  	if (write) {
-@@ -281,6 +285,11 @@ static int __bprm_mm_init(struct linux_b
+@@ -274,6 +278,11 @@ static int __bprm_mm_init(struct linux_b
  	vma->vm_end = STACK_TOP_MAX;
  	vma->vm_start = vma->vm_end - PAGE_SIZE;
  	vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
@@ -41417,7 +41410,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  	INIT_LIST_HEAD(&vma->anon_vma_chain);
  
-@@ -295,6 +304,12 @@ static int __bprm_mm_init(struct linux_b
+@@ -288,6 +297,12 @@ static int __bprm_mm_init(struct linux_b
  	mm->stack_vm = mm->total_vm = 1;
  	up_write(&mm->mmap_sem);
  	bprm->p = vma->vm_end - sizeof(void *);
@@ -41430,7 +41423,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	return 0;
  err:
  	up_write(&mm->mmap_sem);
-@@ -403,19 +418,7 @@ err:
+@@ -396,19 +411,7 @@ err:
  	return err;
  }
  
@@ -41451,7 +41444,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  {
  	const char __user *native;
  
-@@ -424,14 +427,14 @@ static const char __user *get_user_arg_p
+@@ -417,14 +420,14 @@ static const char __user *get_user_arg_p
  		compat_uptr_t compat;
  
  		if (get_user(compat, argv.ptr.compat + nr))
@@ -41468,7 +41461,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  
  	return native;
  }
-@@ -450,7 +453,7 @@ static int count(struct user_arg_ptr arg
+@@ -443,7 +446,7 @@ static int count(struct user_arg_ptr arg
  			if (!p)
  				break;
  
@@ -41477,7 +41470,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  				return -EFAULT;
  
  			if (i++ >= max)
-@@ -484,7 +487,7 @@ static int copy_strings(int argc, struct
+@@ -477,7 +480,7 @@ static int copy_strings(int argc, struct
  
  		ret = -EFAULT;
  		str = get_user_arg_ptr(argv, argc);
@@ -41486,7 +41479,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  			goto out;
  
  		len = strnlen_user(str, MAX_ARG_STRLEN);
-@@ -566,7 +569,7 @@ int copy_strings_kernel(int argc, const 
+@@ -559,7 +562,7 @@ int copy_strings_kernel(int argc, const 
  	int r;
  	mm_segment_t oldfs = get_fs();
  	struct user_arg_ptr argv = {
@@ -41495,7 +41488,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	};
  
  	set_fs(KERNEL_DS);
-@@ -601,7 +604,8 @@ static int shift_arg_pages(struct vm_are
+@@ -594,7 +597,8 @@ static int shift_arg_pages(struct vm_are
  	unsigned long new_end = old_end - shift;
  	struct mmu_gather tlb;
  
@@ -41505,7 +41498,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  
  	/*
  	 * ensure there are no vmas between where we want to go
-@@ -610,6 +614,10 @@ static int shift_arg_pages(struct vm_are
+@@ -603,6 +607,10 @@ static int shift_arg_pages(struct vm_are
  	if (vma != find_vma(mm, new_start))
  		return -EFAULT;
  
@@ -41516,7 +41509,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	/*
  	 * cover the whole range: [new_start, old_end)
  	 */
-@@ -690,10 +698,6 @@ int setup_arg_pages(struct linux_binprm 
+@@ -683,10 +691,6 @@ int setup_arg_pages(struct linux_binprm 
  	stack_top = arch_align_stack(stack_top);
  	stack_top = PAGE_ALIGN(stack_top);
  
@@ -41527,7 +41520,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	stack_shift = vma->vm_end - stack_top;
  
  	bprm->p -= stack_shift;
-@@ -705,8 +709,28 @@ int setup_arg_pages(struct linux_binprm 
+@@ -698,8 +702,28 @@ int setup_arg_pages(struct linux_binprm 
  	bprm->exec -= stack_shift;
  
  	down_write(&mm->mmap_sem);
@@ -41556,7 +41549,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	/*
  	 * Adjust stack execute permissions; explicitly enable for
  	 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
-@@ -725,13 +749,6 @@ int setup_arg_pages(struct linux_binprm 
+@@ -718,13 +742,6 @@ int setup_arg_pages(struct linux_binprm 
  		goto out_unlock;
  	BUG_ON(prev != vma);
  
@@ -41570,16 +41563,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	/* mprotect_fixup is overkill to remove the temporary stack flags */
  	vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
  
-@@ -771,7 +788,7 @@ struct file *open_exec(const char *name)
- 	struct file *file;
- 	int err;
- 	static const struct open_flags open_exec_flags = {
--		.open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,
-+		.open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC | FMODE_GREXEC,
- 		.acc_mode = MAY_EXEC | MAY_OPEN,
- 		.intent = LOOKUP_OPEN
- 	};
-@@ -812,7 +829,7 @@ int kernel_read(struct file *file, loff_
+@@ -805,7 +822,7 @@ int kernel_read(struct file *file, loff_
  	old_fs = get_fs();
  	set_fs(get_ds());
  	/* The cast to a user pointer is valid due to the set_fs() */
@@ -41588,7 +41572,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	set_fs(old_fs);
  	return result;
  }
-@@ -1236,7 +1253,7 @@ int check_unsafe_exec(struct linux_binpr
+@@ -1251,7 +1268,7 @@ int check_unsafe_exec(struct linux_binpr
  	}
  	rcu_read_unlock();
  
@@ -41597,7 +41581,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  		bprm->unsafe |= LSM_UNSAFE_SHARE;
  	} else {
  		res = -EAGAIN;
-@@ -1430,11 +1447,35 @@ static int do_execve_common(const char *
+@@ -1454,6 +1471,11 @@ static int do_execve_common(const char *
  				struct user_arg_ptr envp,
  				struct pt_regs *regs)
  {
@@ -41609,31 +41593,16 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	struct linux_binprm *bprm;
  	struct file *file;
  	struct files_struct *displaced;
- 	bool clear_in_exec;
+@@ -1461,6 +1483,8 @@ static int do_execve_common(const char *
  	int retval;
-+	const struct cred *cred = current_cred();
-+
+ 	const struct cred *cred = current_cred();
+ 
 +	gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
 +
-+	/*
-+	 * We move the actual failure in case of RLIMIT_NPROC excess from
-+	 * set*uid() to execve() because too many poorly written programs
-+	 * don't check setuid() return code.  Here we additionally recheck
-+	 * whether NPROC limit is still exceeded.
-+	 */
-+	if ((current->flags & PF_NPROC_EXCEEDED) &&
-+	    atomic_read(&cred->user->processes) > rlimit(RLIMIT_NPROC)) {
-+		retval = -EAGAIN;
-+		goto out_ret;
-+	}
-+
-+	/* We're below the limit (still or again), so we don't want to make
-+	 * further execve() calls fail. */
-+	current->flags &= ~PF_NPROC_EXCEEDED;
- 
- 	retval = unshare_files(&displaced);
- 	if (retval)
-@@ -1466,6 +1507,16 @@ static int do_execve_common(const char *
+ 	/*
+ 	 * We move the actual failure in case of RLIMIT_NPROC excess from
+ 	 * set*uid() to execve() because too many poorly written programs
+@@ -1507,6 +1531,16 @@ static int do_execve_common(const char *
  	bprm->filename = filename;
  	bprm->interp = filename;
  
@@ -41650,7 +41619,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	retval = bprm_mm_init(bprm);
  	if (retval)
  		goto out_file;
-@@ -1495,9 +1546,40 @@ static int do_execve_common(const char *
+@@ -1536,9 +1570,40 @@ static int do_execve_common(const char *
  	if (retval < 0)
  		goto out;
  
@@ -41692,7 +41661,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  
  	/* execve succeeded */
  	current->fs->in_exec = 0;
-@@ -1508,6 +1590,14 @@ static int do_execve_common(const char *
+@@ -1549,6 +1614,14 @@ static int do_execve_common(const char *
  		put_files_struct(displaced);
  	return retval;
  
@@ -41707,7 +41676,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  out:
  	if (bprm->mm) {
  		acct_arg_size(bprm, 0);
-@@ -1581,7 +1671,7 @@ static int expand_corename(struct core_n
+@@ -1622,7 +1695,7 @@ static int expand_corename(struct core_n
  {
  	char *old_corename = cn->corename;
  
@@ -41716,7 +41685,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
  
  	if (!cn->corename) {
-@@ -1669,7 +1759,7 @@ static int format_corename(struct core_n
+@@ -1719,7 +1792,7 @@ static int format_corename(struct core_n
  	int pid_in_pattern = 0;
  	int err = 0;
  
@@ -41725,7 +41694,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	cn->corename = kmalloc(cn->size, GFP_KERNEL);
  	cn->used = 0;
  
-@@ -1760,6 +1850,219 @@ out:
+@@ -1816,6 +1889,219 @@ out:
  	return ispipe;
  }
  
@@ -41848,7 +41817,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
 +			task_uid(tsk), task_euid(tsk), pc, sp);
 +	free_page((unsigned long)buffer_exec);
 +	free_page((unsigned long)buffer_fault);
-+	pax_report_insns(pc, sp);
++	pax_report_insns(regs, pc, sp);
 +	do_coredump(SIGKILL, SIGKILL, regs);
 +}
 +#endif
@@ -41945,7 +41914,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  static int zap_process(struct task_struct *start, int exit_code)
  {
  	struct task_struct *t;
-@@ -1971,17 +2274,17 @@ static void wait_for_dump_helpers(struct
+@@ -2027,17 +2313,17 @@ static void wait_for_dump_helpers(struct
  	pipe = file->f_path.dentry->d_inode->i_pipe;
  
  	pipe_lock(pipe);
@@ -41968,7 +41937,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	pipe_unlock(pipe);
  
  }
-@@ -2042,7 +2345,7 @@ void do_coredump(long signr, int exit_co
+@@ -2098,7 +2384,7 @@ void do_coredump(long signr, int exit_co
  	int retval = 0;
  	int flag = 0;
  	int ispipe;
@@ -41977,7 +41946,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	struct coredump_params cprm = {
  		.signr = signr,
  		.regs = regs,
-@@ -2057,6 +2360,9 @@ void do_coredump(long signr, int exit_co
+@@ -2113,6 +2399,9 @@ void do_coredump(long signr, int exit_co
  
  	audit_core_dumps(signr);
  
@@ -41987,16 +41956,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  	binfmt = mm->binfmt;
  	if (!binfmt || !binfmt->core_dump)
  		goto fail;
-@@ -2097,6 +2403,8 @@ void do_coredump(long signr, int exit_co
- 		goto fail_corename;
- 	}
- 
-+	gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
-+
-  	if (ispipe) {
- 		int dump_count;
- 		char **helper_argv;
-@@ -2124,7 +2432,7 @@ void do_coredump(long signr, int exit_co
+@@ -2180,7 +2469,7 @@ void do_coredump(long signr, int exit_co
  		}
  		cprm.limit = RLIM_INFINITY;
  
@@ -42005,7 +41965,16 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/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);
-@@ -2194,7 +2502,7 @@ close_fail:
+@@ -2207,6 +2496,8 @@ void do_coredump(long signr, int exit_co
+ 	} else {
+ 		struct inode *inode;
+ 
++		gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
++
+ 		if (cprm.limit < binfmt->min_coredump)
+ 			goto fail_unlock;
+ 
+@@ -2250,7 +2541,7 @@ close_fail:
  		filp_close(cprm.file, NULL);
  fail_dropcount:
  	if (ispipe)
@@ -42014,7 +41983,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  fail_unlock:
  	kfree(cn.corename);
  fail_corename:
-@@ -2213,7 +2521,7 @@ fail:
+@@ -2269,7 +2560,7 @@ fail:
   */
  int dump_write(struct file *file, const void *addr, int nr)
  {
@@ -42023,9 +41992,9 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
  }
  EXPORT_SYMBOL(dump_write);
  
-diff -urNp linux-3.0.9/fs/ext2/balloc.c linux-3.0.9/fs/ext2/balloc.c
---- linux-3.0.9/fs/ext2/balloc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext2/balloc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ext2/balloc.c linux-3.1.1/fs/ext2/balloc.c
+--- linux-3.1.1/fs/ext2/balloc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext2/balloc.c	2011-11-16 18:40:29.000000000 -0500
 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -42035,10 +42004,10 @@ diff -urNp linux-3.0.9/fs/ext2/balloc.c linux-3.0.9/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.9/fs/ext3/balloc.c linux-3.0.9/fs/ext3/balloc.c
---- linux-3.0.9/fs/ext3/balloc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext3/balloc.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e
+diff -urNp linux-3.1.1/fs/ext3/balloc.c linux-3.1.1/fs/ext3/balloc.c
+--- linux-3.1.1/fs/ext3/balloc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext3/balloc.c	2011-11-16 18:40:29.000000000 -0500
+@@ -1446,7 +1446,7 @@ static int ext3_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
  	root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
@@ -42047,30 +42016,9 @@ diff -urNp linux-3.0.9/fs/ext3/balloc.c linux-3.0.9/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.9/fs/ext3/ioctl.c linux-3.0.9/fs/ext3/ioctl.c
---- linux-3.0.9/fs/ext3/ioctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext3/ioctl.c	2011-11-15 20:02:59.000000000 -0500
-@@ -285,7 +285,7 @@ group_add_out:
- 		if (!capable(CAP_SYS_ADMIN))
- 			return -EPERM;
- 
--		if (copy_from_user(&range, (struct fstrim_range *)arg,
-+		if (copy_from_user(&range, (struct fstrim_range __user *)arg,
- 				   sizeof(range)))
- 			return -EFAULT;
- 
-@@ -293,7 +293,7 @@ group_add_out:
- 		if (ret < 0)
- 			return ret;
- 
--		if (copy_to_user((struct fstrim_range *)arg, &range,
-+		if (copy_to_user((struct fstrim_range __user *)arg, &range,
- 				 sizeof(range)))
- 			return -EFAULT;
- 
-diff -urNp linux-3.0.9/fs/ext4/balloc.c linux-3.0.9/fs/ext4/balloc.c
---- linux-3.0.9/fs/ext4/balloc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext4/balloc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ext4/balloc.c linux-3.1.1/fs/ext4/balloc.c
+--- linux-3.1.1/fs/ext4/balloc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext4/balloc.c	2011-11-16 18:40:29.000000000 -0500
 @@ -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() ||
@@ -42082,10 +42030,10 @@ diff -urNp linux-3.0.9/fs/ext4/balloc.c linux-3.0.9/fs/ext4/balloc.c
  
  		if (free_blocks >= (nblocks + dirty_blocks))
  			return 1;
-diff -urNp linux-3.0.9/fs/ext4/ext4.h linux-3.0.9/fs/ext4/ext4.h
---- linux-3.0.9/fs/ext4/ext4.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext4/ext4.h	2011-11-15 20:02:59.000000000 -0500
-@@ -1177,19 +1177,19 @@ struct ext4_sb_info {
+diff -urNp linux-3.1.1/fs/ext4/ext4.h linux-3.1.1/fs/ext4/ext4.h
+--- linux-3.1.1/fs/ext4/ext4.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext4/ext4.h	2011-11-16 18:39:08.000000000 -0500
+@@ -1180,19 +1180,19 @@ struct ext4_sb_info {
  	unsigned long s_mb_last_start;
  
  	/* stats for buddy allocator */
@@ -42115,9 +42063,9 @@ diff -urNp linux-3.0.9/fs/ext4/ext4.h linux-3.0.9/fs/ext4/ext4.h
  	atomic_t s_lock_busy;
  
  	/* locality groups */
-diff -urNp linux-3.0.9/fs/ext4/file.c linux-3.0.9/fs/ext4/file.c
---- linux-3.0.9/fs/ext4/file.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext4/file.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ext4/file.c linux-3.1.1/fs/ext4/file.c
+--- linux-3.1.1/fs/ext4/file.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext4/file.c	2011-11-16 18:40:29.000000000 -0500
 @@ -181,8 +181,8 @@ static int ext4_file_open(struct inode *
  		path.dentry = mnt->mnt_root;
  		cp = d_path(&path, buf, sizeof(buf));
@@ -42129,10 +42077,10 @@ diff -urNp linux-3.0.9/fs/ext4/file.c linux-3.0.9/fs/ext4/file.c
  			ext4_mark_super_dirty(sb);
  		}
  	}
-diff -urNp linux-3.0.9/fs/ext4/ioctl.c linux-3.0.9/fs/ext4/ioctl.c
---- linux-3.0.9/fs/ext4/ioctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext4/ioctl.c	2011-11-15 20:02:59.000000000 -0500
-@@ -344,7 +344,7 @@ mext_out:
+diff -urNp linux-3.1.1/fs/ext4/ioctl.c linux-3.1.1/fs/ext4/ioctl.c
+--- linux-3.1.1/fs/ext4/ioctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext4/ioctl.c	2011-11-16 18:39:08.000000000 -0500
+@@ -348,7 +348,7 @@ mext_out:
  		if (!blk_queue_discard(q))
  			return -EOPNOTSUPP;
  
@@ -42141,7 +42089,7 @@ diff -urNp linux-3.0.9/fs/ext4/ioctl.c linux-3.0.9/fs/ext4/ioctl.c
  		    sizeof(range)))
  			return -EFAULT;
  
-@@ -354,7 +354,7 @@ mext_out:
+@@ -358,7 +358,7 @@ mext_out:
  		if (ret < 0)
  			return ret;
  
@@ -42150,10 +42098,10 @@ diff -urNp linux-3.0.9/fs/ext4/ioctl.c linux-3.0.9/fs/ext4/ioctl.c
  		    sizeof(range)))
  			return -EFAULT;
  
-diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
---- linux-3.0.9/fs/ext4/mballoc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext4/mballoc.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1793,7 +1793,7 @@ void ext4_mb_simple_scan_group(struct ex
+diff -urNp linux-3.1.1/fs/ext4/mballoc.c linux-3.1.1/fs/ext4/mballoc.c
+--- linux-3.1.1/fs/ext4/mballoc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext4/mballoc.c	2011-11-16 18:40:29.000000000 -0500
+@@ -1795,7 +1795,7 @@ void ext4_mb_simple_scan_group(struct ex
  		BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
  
  		if (EXT4_SB(sb)->s_mb_stats)
@@ -42162,7 +42110,7 @@ diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
  
  		break;
  	}
-@@ -2087,7 +2087,7 @@ repeat:
+@@ -2089,7 +2089,7 @@ repeat:
  			ac->ac_status = AC_STATUS_CONTINUE;
  			ac->ac_flags |= EXT4_MB_HINT_FIRST;
  			cr = 3;
@@ -42171,7 +42119,7 @@ diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
  			goto repeat;
  		}
  	}
-@@ -2130,6 +2130,8 @@ static int ext4_mb_seq_groups_show(struc
+@@ -2132,6 +2132,8 @@ static int ext4_mb_seq_groups_show(struc
  		ext4_grpblk_t counters[16];
  	} sg;
  
@@ -42180,19 +42128,19 @@ diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
  	group--;
  	if (group == 0)
  		seq_printf(seq, "#%-5s: %-5s %-5s %-5s "
-@@ -2553,25 +2555,25 @@ int ext4_mb_release(struct super_block *
+@@ -2573,25 +2575,25 @@ int ext4_mb_release(struct super_block *
  	if (sbi->s_mb_stats) {
- 		printk(KERN_INFO
- 		       "EXT4-fs: mballoc: %u blocks %u reqs (%u success)\n",
+ 		ext4_msg(sb, KERN_INFO,
+ 		       "mballoc: %u blocks %u reqs (%u success)",
 -				atomic_read(&sbi->s_bal_allocated),
 -				atomic_read(&sbi->s_bal_reqs),
 -				atomic_read(&sbi->s_bal_success));
 +				atomic_read_unchecked(&sbi->s_bal_allocated),
 +				atomic_read_unchecked(&sbi->s_bal_reqs),
 +				atomic_read_unchecked(&sbi->s_bal_success));
- 		printk(KERN_INFO
- 		      "EXT4-fs: mballoc: %u extents scanned, %u goal hits, "
- 				"%u 2^N hits, %u breaks, %u lost\n",
+ 		ext4_msg(sb, KERN_INFO,
+ 		      "mballoc: %u extents scanned, %u goal hits, "
+ 				"%u 2^N hits, %u breaks, %u lost",
 -				atomic_read(&sbi->s_bal_ex_scanned),
 -				atomic_read(&sbi->s_bal_goals),
 -				atomic_read(&sbi->s_bal_2orders),
@@ -42203,12 +42151,12 @@ diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
 +				atomic_read_unchecked(&sbi->s_bal_2orders),
 +				atomic_read_unchecked(&sbi->s_bal_breaks),
 +				atomic_read_unchecked(&sbi->s_mb_lost_chunks));
- 		printk(KERN_INFO
- 		       "EXT4-fs: mballoc: %lu generated and it took %Lu\n",
- 				sbi->s_mb_buddies_generated++,
+ 		ext4_msg(sb, KERN_INFO,
+ 		       "mballoc: %lu generated and it took %Lu",
+ 				sbi->s_mb_buddies_generated,
  				sbi->s_mb_generation_time);
- 		printk(KERN_INFO
- 		       "EXT4-fs: mballoc: %u preallocated, %u discarded\n",
+ 		ext4_msg(sb, KERN_INFO,
+ 		       "mballoc: %u preallocated, %u discarded",
 -				atomic_read(&sbi->s_mb_preallocated),
 -				atomic_read(&sbi->s_mb_discarded));
 +				atomic_read_unchecked(&sbi->s_mb_preallocated),
@@ -42216,7 +42164,7 @@ diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
  	}
  
  	free_percpu(sbi->s_locality_groups);
-@@ -3041,16 +3043,16 @@ static void ext4_mb_collect_stats(struct
+@@ -3070,16 +3072,16 @@ static void ext4_mb_collect_stats(struct
  	struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
  
  	if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
@@ -42239,7 +42187,7 @@ diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
  	}
  
  	if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
-@@ -3448,7 +3450,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat
+@@ -3477,7 +3479,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat
  	trace_ext4_mb_new_inode_pa(ac, pa);
  
  	ext4_mb_use_inode_pa(ac, pa);
@@ -42248,7 +42196,7 @@ diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
  
  	ei = EXT4_I(ac->ac_inode);
  	grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
-@@ -3508,7 +3510,7 @@ ext4_mb_new_group_pa(struct ext4_allocat
+@@ -3537,7 +3539,7 @@ ext4_mb_new_group_pa(struct ext4_allocat
  	trace_ext4_mb_new_group_pa(ac, pa);
  
  	ext4_mb_use_group_pa(ac, pa);
@@ -42257,7 +42205,7 @@ diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
  
  	grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
  	lg = ac->ac_lg;
-@@ -3595,7 +3597,7 @@ ext4_mb_release_inode_pa(struct ext4_bud
+@@ -3625,7 +3627,7 @@ ext4_mb_release_inode_pa(struct ext4_bud
  		 * from the bitmap and continue.
  		 */
  	}
@@ -42266,7 +42214,7 @@ diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
  
  	return err;
  }
-@@ -3613,7 +3615,7 @@ ext4_mb_release_group_pa(struct ext4_bud
+@@ -3643,7 +3645,7 @@ ext4_mb_release_group_pa(struct ext4_bud
  	ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
  	BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
  	mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
@@ -42275,9 +42223,9 @@ diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
  	trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
  
  	return 0;
-diff -urNp linux-3.0.9/fs/fcntl.c linux-3.0.9/fs/fcntl.c
---- linux-3.0.9/fs/fcntl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fcntl.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/fcntl.c linux-3.1.1/fs/fcntl.c
+--- linux-3.1.1/fs/fcntl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fcntl.c	2011-11-16 23:40:25.000000000 -0500
 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
  	if (err)
  		return err;
@@ -42316,26 +42264,9 @@ diff -urNp linux-3.0.9/fs/fcntl.c linux-3.0.9/fs/fcntl.c
  		if (arg >= rlimit(RLIMIT_NOFILE))
  			break;
  		err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
-@@ -835,14 +841,14 @@ static int __init fcntl_init(void)
- 	 * Exceptions: O_NONBLOCK is a two bit define on parisc; O_NDELAY
- 	 * is defined as O_NONBLOCK on some platforms and not on others.
- 	 */
--	BUILD_BUG_ON(19 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
-+	BUILD_BUG_ON(20 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
- 		O_RDONLY	| O_WRONLY	| O_RDWR	|
- 		O_CREAT		| O_EXCL	| O_NOCTTY	|
- 		O_TRUNC		| O_APPEND	| /* O_NONBLOCK	| */
- 		__O_SYNC	| O_DSYNC	| FASYNC	|
- 		O_DIRECT	| O_LARGEFILE	| O_DIRECTORY	|
- 		O_NOFOLLOW	| O_NOATIME	| O_CLOEXEC	|
--		__FMODE_EXEC	| O_PATH
-+		__FMODE_EXEC	| O_PATH	| FMODE_GREXEC
- 		));
- 
- 	fasync_cache = kmem_cache_create("fasync_cache",
-diff -urNp linux-3.0.9/fs/fifo.c linux-3.0.9/fs/fifo.c
---- linux-3.0.9/fs/fifo.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fifo.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/fifo.c linux-3.1.1/fs/fifo.c
+--- linux-3.1.1/fs/fifo.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fifo.c	2011-11-16 18:39:08.000000000 -0500
 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
  	 */
  		filp->f_op = &read_pipefifo_fops;
@@ -42406,9 +42337,9 @@ diff -urNp linux-3.0.9/fs/fifo.c linux-3.0.9/fs/fifo.c
  		free_pipe_info(inode);
  
  err_nocleanup:
-diff -urNp linux-3.0.9/fs/file.c linux-3.0.9/fs/file.c
---- linux-3.0.9/fs/file.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/file.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/file.c linux-3.1.1/fs/file.c
+--- linux-3.1.1/fs/file.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/file.c	2011-11-16 18:40:29.000000000 -0500
 @@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
@@ -42425,9 +42356,9 @@ diff -urNp linux-3.0.9/fs/file.c linux-3.0.9/fs/file.c
  	if (nr >= rlimit(RLIMIT_NOFILE))
  		return -EMFILE;
  
-diff -urNp linux-3.0.9/fs/filesystems.c linux-3.0.9/fs/filesystems.c
---- linux-3.0.9/fs/filesystems.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/filesystems.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/filesystems.c linux-3.1.1/fs/filesystems.c
+--- linux-3.1.1/fs/filesystems.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/filesystems.c	2011-11-16 18:40:29.000000000 -0500
 @@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con
  	int len = dot ? dot - name : strlen(name);
  
@@ -42441,9 +42372,9 @@ diff -urNp linux-3.0.9/fs/filesystems.c linux-3.0.9/fs/filesystems.c
  		fs = __get_fs_type(name, len);
  
  	if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
-diff -urNp linux-3.0.9/fs/fscache/cookie.c linux-3.0.9/fs/fscache/cookie.c
---- linux-3.0.9/fs/fscache/cookie.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fscache/cookie.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/fscache/cookie.c linux-3.1.1/fs/fscache/cookie.c
+--- linux-3.1.1/fs/fscache/cookie.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fscache/cookie.c	2011-11-16 18:39:08.000000000 -0500
 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
  	       parent ? (char *) parent->def->name : "<no-parent>",
  	       def->name, netfs_data);
@@ -42562,9 +42493,9 @@ diff -urNp linux-3.0.9/fs/fscache/cookie.c linux-3.0.9/fs/fscache/cookie.c
  		wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
  			    fscache_wait_bit, TASK_UNINTERRUPTIBLE);
  	}
-diff -urNp linux-3.0.9/fs/fscache/internal.h linux-3.0.9/fs/fscache/internal.h
---- linux-3.0.9/fs/fscache/internal.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fscache/internal.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/fscache/internal.h linux-3.1.1/fs/fscache/internal.h
+--- linux-3.1.1/fs/fscache/internal.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fscache/internal.h	2011-11-16 18:39:08.000000000 -0500
 @@ -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];
@@ -42768,9 +42699,9 @@ diff -urNp linux-3.0.9/fs/fscache/internal.h linux-3.0.9/fs/fscache/internal.h
  #define fscache_stat_d(stat) do {} while (0)
  #endif
  
-diff -urNp linux-3.0.9/fs/fscache/object.c linux-3.0.9/fs/fscache/object.c
---- linux-3.0.9/fs/fscache/object.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fscache/object.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/fscache/object.c linux-3.1.1/fs/fscache/object.c
+--- linux-3.1.1/fs/fscache/object.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fscache/object.c	2011-11-16 18:39:08.000000000 -0500
 @@ -128,7 +128,7 @@ static void fscache_object_state_machine
  		/* update the object metadata on disk */
  	case FSCACHE_OBJECT_UPDATING:
@@ -42882,9 +42813,9 @@ diff -urNp linux-3.0.9/fs/fscache/object.c linux-3.0.9/fs/fscache/object.c
  		break;
  
  	default:
-diff -urNp linux-3.0.9/fs/fscache/operation.c linux-3.0.9/fs/fscache/operation.c
---- linux-3.0.9/fs/fscache/operation.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fscache/operation.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/fscache/operation.c linux-3.1.1/fs/fscache/operation.c
+--- linux-3.1.1/fs/fscache/operation.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fscache/operation.c	2011-11-16 18:39:08.000000000 -0500
 @@ -17,7 +17,7 @@
  #include <linux/slab.h>
  #include "internal.h"
@@ -43000,9 +42931,9 @@ diff -urNp linux-3.0.9/fs/fscache/operation.c linux-3.0.9/fs/fscache/operation.c
  
  		ASSERTCMP(atomic_read(&op->usage), ==, 0);
  
-diff -urNp linux-3.0.9/fs/fscache/page.c linux-3.0.9/fs/fscache/page.c
---- linux-3.0.9/fs/fscache/page.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fscache/page.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/fscache/page.c linux-3.1.1/fs/fscache/page.c
+--- linux-3.1.1/fs/fscache/page.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fscache/page.c	2011-11-16 18:39:08.000000000 -0500
 @@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct
  	val = radix_tree_lookup(&cookie->stores, page->index);
  	if (!val) {
@@ -43386,9 +43317,9 @@ diff -urNp linux-3.0.9/fs/fscache/page.c linux-3.0.9/fs/fscache/page.c
  #endif
  
  	for (loop = 0; loop < pagevec->nr; loop++) {
-diff -urNp linux-3.0.9/fs/fscache/stats.c linux-3.0.9/fs/fscache/stats.c
---- linux-3.0.9/fs/fscache/stats.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fscache/stats.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/fscache/stats.c linux-3.1.1/fs/fscache/stats.c
+--- linux-3.1.1/fs/fscache/stats.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fscache/stats.c	2011-11-16 18:39:08.000000000 -0500
 @@ -18,95 +18,95 @@
  /*
   * operation counters
@@ -43764,9 +43695,9 @@ diff -urNp linux-3.0.9/fs/fscache/stats.c linux-3.0.9/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.9/fs/fs_struct.c linux-3.0.9/fs/fs_struct.c
---- linux-3.0.9/fs/fs_struct.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fs_struct.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/fs_struct.c linux-3.1.1/fs/fs_struct.c
+--- linux-3.1.1/fs/fs_struct.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fs_struct.c	2011-11-16 18:40:29.000000000 -0500
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -43856,9 +43787,9 @@ diff -urNp linux-3.0.9/fs/fs_struct.c linux-3.0.9/fs/fs_struct.c
  		spin_unlock(&fs->lock);
  
  		task_unlock(current);
-diff -urNp linux-3.0.9/fs/fuse/cuse.c linux-3.0.9/fs/fuse/cuse.c
---- linux-3.0.9/fs/fuse/cuse.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fuse/cuse.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/fuse/cuse.c linux-3.1.1/fs/fuse/cuse.c
+--- linux-3.1.1/fs/fuse/cuse.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fuse/cuse.c	2011-11-16 18:39:08.000000000 -0500
 @@ -586,10 +586,12 @@ static int __init cuse_init(void)
  		INIT_LIST_HEAD(&cuse_conntbl[i]);
  
@@ -43876,9 +43807,9 @@ diff -urNp linux-3.0.9/fs/fuse/cuse.c linux-3.0.9/fs/fuse/cuse.c
  
  	cuse_class = class_create(THIS_MODULE, "cuse");
  	if (IS_ERR(cuse_class))
-diff -urNp linux-3.0.9/fs/fuse/dev.c linux-3.0.9/fs/fuse/dev.c
---- linux-3.0.9/fs/fuse/dev.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fuse/dev.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/fuse/dev.c linux-3.1.1/fs/fuse/dev.c
+--- linux-3.1.1/fs/fuse/dev.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fuse/dev.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(stru
  	ret = 0;
  	pipe_lock(pipe);
@@ -43888,10 +43819,10 @@ diff -urNp linux-3.0.9/fs/fuse/dev.c linux-3.0.9/fs/fuse/dev.c
  		send_sig(SIGPIPE, current, 0);
  		if (!ret)
  			ret = -EPIPE;
-diff -urNp linux-3.0.9/fs/fuse/dir.c linux-3.0.9/fs/fuse/dir.c
---- linux-3.0.9/fs/fuse/dir.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fuse/dir.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1148,7 +1148,7 @@ static char *read_link(struct dentry *de
+diff -urNp linux-3.1.1/fs/fuse/dir.c linux-3.1.1/fs/fuse/dir.c
+--- linux-3.1.1/fs/fuse/dir.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fuse/dir.c	2011-11-16 18:39:08.000000000 -0500
+@@ -1147,7 +1147,7 @@ static char *read_link(struct dentry *de
  	return link;
  }
  
@@ -43900,10 +43831,10 @@ diff -urNp linux-3.0.9/fs/fuse/dir.c linux-3.0.9/fs/fuse/dir.c
  {
  	if (!IS_ERR(link))
  		free_page((unsigned long) link);
-diff -urNp linux-3.0.9/fs/gfs2/inode.c linux-3.0.9/fs/gfs2/inode.c
---- linux-3.0.9/fs/gfs2/inode.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/gfs2/inode.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1525,7 +1525,7 @@ out:
+diff -urNp linux-3.1.1/fs/gfs2/inode.c linux-3.1.1/fs/gfs2/inode.c
+--- linux-3.1.1/fs/gfs2/inode.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/gfs2/inode.c	2011-11-16 18:39:08.000000000 -0500
+@@ -1517,7 +1517,7 @@ out:
  
  static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -43912,9 +43843,9 @@ diff -urNp linux-3.0.9/fs/gfs2/inode.c linux-3.0.9/fs/gfs2/inode.c
  	if (!IS_ERR(s))
  		kfree(s);
  }
-diff -urNp linux-3.0.9/fs/hfsplus/catalog.c linux-3.0.9/fs/hfsplus/catalog.c
---- linux-3.0.9/fs/hfsplus/catalog.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/hfsplus/catalog.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/hfsplus/catalog.c linux-3.1.1/fs/hfsplus/catalog.c
+--- linux-3.1.1/fs/hfsplus/catalog.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/hfsplus/catalog.c	2011-11-16 19:23:09.000000000 -0500
 @@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block 
  	int err;
  	u16 type;
@@ -43932,20 +43863,20 @@ diff -urNp linux-3.0.9/fs/hfsplus/catalog.c linux-3.0.9/fs/hfsplus/catalog.c
 +
  	dprint(DBG_CAT_MOD, "create_cat: %s,%u(%d)\n",
  		str->name, cnid, inode->i_nlink);
- 	hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
-@@ -349,6 +353,8 @@ int hfsplus_rename_cat(u32 cnid,
+ 	err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
+@@ -353,6 +357,8 @@ int hfsplus_rename_cat(u32 cnid,
  	int entry_size, type;
- 	int err = 0;
+ 	int err;
  
 +	pax_track_stack();
 +
  	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.9/fs/hfsplus/dir.c linux-3.0.9/fs/hfsplus/dir.c
---- linux-3.0.9/fs/hfsplus/dir.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/hfsplus/dir.c	2011-11-15 20:02:59.000000000 -0500
-@@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file *
+diff -urNp linux-3.1.1/fs/hfsplus/dir.c linux-3.1.1/fs/hfsplus/dir.c
+--- linux-3.1.1/fs/hfsplus/dir.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/hfsplus/dir.c	2011-11-16 18:40:29.000000000 -0500
+@@ -131,6 +131,8 @@ static int hfsplus_readdir(struct file *
  	struct hfsplus_readdir_data *rd;
  	u16 type;
  
@@ -43954,10 +43885,10 @@ diff -urNp linux-3.0.9/fs/hfsplus/dir.c linux-3.0.9/fs/hfsplus/dir.c
  	if (filp->f_pos >= inode->i_size)
  		return 0;
  
-diff -urNp linux-3.0.9/fs/hfsplus/inode.c linux-3.0.9/fs/hfsplus/inode.c
---- linux-3.0.9/fs/hfsplus/inode.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/hfsplus/inode.c	2011-11-15 20:02:59.000000000 -0500
-@@ -489,6 +489,8 @@ int hfsplus_cat_read_inode(struct inode 
+diff -urNp linux-3.1.1/fs/hfsplus/inode.c linux-3.1.1/fs/hfsplus/inode.c
+--- linux-3.1.1/fs/hfsplus/inode.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/hfsplus/inode.c	2011-11-16 18:40:29.000000000 -0500
+@@ -501,6 +501,8 @@ int hfsplus_cat_read_inode(struct inode 
  	int res = 0;
  	u16 type;
  
@@ -43966,7 +43897,7 @@ diff -urNp linux-3.0.9/fs/hfsplus/inode.c linux-3.0.9/fs/hfsplus/inode.c
  	type = hfs_bnode_read_u16(fd->bnode, fd->entryoffset);
  
  	HFSPLUS_I(inode)->linkid = 0;
-@@ -552,6 +554,8 @@ int hfsplus_cat_write_inode(struct inode
+@@ -564,6 +566,8 @@ int hfsplus_cat_write_inode(struct inode
  	struct hfs_find_data fd;
  	hfsplus_cat_entry entry;
  
@@ -43975,9 +43906,9 @@ diff -urNp linux-3.0.9/fs/hfsplus/inode.c linux-3.0.9/fs/hfsplus/inode.c
  	if (HFSPLUS_IS_RSRC(inode))
  		main_inode = HFSPLUS_I(inode)->rsrc_inode;
  
-diff -urNp linux-3.0.9/fs/hfsplus/ioctl.c linux-3.0.9/fs/hfsplus/ioctl.c
---- linux-3.0.9/fs/hfsplus/ioctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/hfsplus/ioctl.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/hfsplus/ioctl.c linux-3.1.1/fs/hfsplus/ioctl.c
+--- linux-3.1.1/fs/hfsplus/ioctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/hfsplus/ioctl.c	2011-11-16 18:40:29.000000000 -0500
 @@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent
  	struct hfsplus_cat_file *file;
  	int res;
@@ -43996,11 +43927,11 @@ diff -urNp linux-3.0.9/fs/hfsplus/ioctl.c linux-3.0.9/fs/hfsplus/ioctl.c
  	if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
  		return -EOPNOTSUPP;
  
-diff -urNp linux-3.0.9/fs/hfsplus/super.c linux-3.0.9/fs/hfsplus/super.c
---- linux-3.0.9/fs/hfsplus/super.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/hfsplus/super.c	2011-11-15 20:02:59.000000000 -0500
-@@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct sup
- 	struct nls_table *nls = NULL;
+diff -urNp linux-3.1.1/fs/hfsplus/super.c linux-3.1.1/fs/hfsplus/super.c
+--- linux-3.1.1/fs/hfsplus/super.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/hfsplus/super.c	2011-11-16 19:23:30.000000000 -0500
+@@ -347,6 +347,8 @@ static int hfsplus_fill_super(struct sup
+ 	u64 last_fs_block, last_fs_page;
  	int err;
  
 +	pax_track_stack();
@@ -44008,10 +43939,10 @@ diff -urNp linux-3.0.9/fs/hfsplus/super.c linux-3.0.9/fs/hfsplus/super.c
  	err = -EINVAL;
  	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
  	if (!sbi)
-diff -urNp linux-3.0.9/fs/hugetlbfs/inode.c linux-3.0.9/fs/hugetlbfs/inode.c
---- linux-3.0.9/fs/hugetlbfs/inode.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/hugetlbfs/inode.c	2011-11-15 20:02:59.000000000 -0500
-@@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs
+diff -urNp linux-3.1.1/fs/hugetlbfs/inode.c linux-3.1.1/fs/hugetlbfs/inode.c
+--- linux-3.1.1/fs/hugetlbfs/inode.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/hugetlbfs/inode.c	2011-11-16 18:40:29.000000000 -0500
+@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs
  	.kill_sb	= kill_litter_super,
  };
  
@@ -44020,10 +43951,10 @@ diff -urNp linux-3.0.9/fs/hugetlbfs/inode.c linux-3.0.9/fs/hugetlbfs/inode.c
  
  static int can_do_hugetlb_shm(void)
  {
-diff -urNp linux-3.0.9/fs/inode.c linux-3.0.9/fs/inode.c
---- linux-3.0.9/fs/inode.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/inode.c	2011-11-15 20:02:59.000000000 -0500
-@@ -829,8 +829,8 @@ unsigned int get_next_ino(void)
+diff -urNp linux-3.1.1/fs/inode.c linux-3.1.1/fs/inode.c
+--- linux-3.1.1/fs/inode.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/inode.c	2011-11-16 18:39:08.000000000 -0500
+@@ -787,8 +787,8 @@ unsigned int get_next_ino(void)
  
  #ifdef CONFIG_SMP
  	if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
@@ -44034,10 +43965,10 @@ diff -urNp linux-3.0.9/fs/inode.c linux-3.0.9/fs/inode.c
  
  		res = next - LAST_INO_BATCH;
  	}
-diff -urNp linux-3.0.9/fs/jbd/checkpoint.c linux-3.0.9/fs/jbd/checkpoint.c
---- linux-3.0.9/fs/jbd/checkpoint.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jbd/checkpoint.c	2011-11-15 20:02:59.000000000 -0500
-@@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal
+diff -urNp linux-3.1.1/fs/jbd/checkpoint.c linux-3.1.1/fs/jbd/checkpoint.c
+--- linux-3.1.1/fs/jbd/checkpoint.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jbd/checkpoint.c	2011-11-16 18:40:29.000000000 -0500
+@@ -358,6 +358,8 @@ int log_do_checkpoint(journal_t *journal
  	tid_t this_tid;
  	int result;
  
@@ -44046,9 +43977,9 @@ diff -urNp linux-3.0.9/fs/jbd/checkpoint.c linux-3.0.9/fs/jbd/checkpoint.c
  	jbd_debug(1, "Start checkpoint\n");
  
  	/*
-diff -urNp linux-3.0.9/fs/jffs2/compr_rtime.c linux-3.0.9/fs/jffs2/compr_rtime.c
---- linux-3.0.9/fs/jffs2/compr_rtime.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jffs2/compr_rtime.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/jffs2/compr_rtime.c linux-3.1.1/fs/jffs2/compr_rtime.c
+--- linux-3.1.1/fs/jffs2/compr_rtime.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jffs2/compr_rtime.c	2011-11-16 18:40:29.000000000 -0500
 @@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
  	int outpos = 0;
  	int pos=0;
@@ -44067,9 +43998,9 @@ diff -urNp linux-3.0.9/fs/jffs2/compr_rtime.c linux-3.0.9/fs/jffs2/compr_rtime.c
  	memset(positions,0,sizeof(positions));
  
  	while (outpos<destlen) {
-diff -urNp linux-3.0.9/fs/jffs2/compr_rubin.c linux-3.0.9/fs/jffs2/compr_rubin.c
---- linux-3.0.9/fs/jffs2/compr_rubin.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jffs2/compr_rubin.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/jffs2/compr_rubin.c linux-3.1.1/fs/jffs2/compr_rubin.c
+--- linux-3.1.1/fs/jffs2/compr_rubin.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jffs2/compr_rubin.c	2011-11-16 18:40:29.000000000 -0500
 @@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
  	int ret;
  	uint32_t mysrclen, mydstlen;
@@ -44079,9 +44010,9 @@ diff -urNp linux-3.0.9/fs/jffs2/compr_rubin.c linux-3.0.9/fs/jffs2/compr_rubin.c
  	mysrclen = *sourcelen;
  	mydstlen = *dstlen - 8;
  
-diff -urNp linux-3.0.9/fs/jffs2/erase.c linux-3.0.9/fs/jffs2/erase.c
---- linux-3.0.9/fs/jffs2/erase.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jffs2/erase.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/jffs2/erase.c linux-3.1.1/fs/jffs2/erase.c
+--- linux-3.1.1/fs/jffs2/erase.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jffs2/erase.c	2011-11-16 18:39:08.000000000 -0500
 @@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
  		struct jffs2_unknown_node marker = {
  			.magic =	cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -44092,9 +44023,9 @@ diff -urNp linux-3.0.9/fs/jffs2/erase.c linux-3.0.9/fs/jffs2/erase.c
  		};
  
  		jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-3.0.9/fs/jffs2/wbuf.c linux-3.0.9/fs/jffs2/wbuf.c
---- linux-3.0.9/fs/jffs2/wbuf.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jffs2/wbuf.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/jffs2/wbuf.c linux-3.1.1/fs/jffs2/wbuf.c
+--- linux-3.1.1/fs/jffs2/wbuf.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jffs2/wbuf.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
  {
  	.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -44105,9 +44036,9 @@ diff -urNp linux-3.0.9/fs/jffs2/wbuf.c linux-3.0.9/fs/jffs2/wbuf.c
  };
  
  /*
-diff -urNp linux-3.0.9/fs/jffs2/xattr.c linux-3.0.9/fs/jffs2/xattr.c
---- linux-3.0.9/fs/jffs2/xattr.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jffs2/xattr.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/jffs2/xattr.c linux-3.1.1/fs/jffs2/xattr.c
+--- linux-3.1.1/fs/jffs2/xattr.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jffs2/xattr.c	2011-11-16 18:40:29.000000000 -0500
 @@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct 
  
  	BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
@@ -44117,9 +44048,9 @@ diff -urNp linux-3.0.9/fs/jffs2/xattr.c linux-3.0.9/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.9/fs/jfs/super.c linux-3.0.9/fs/jfs/super.c
---- linux-3.0.9/fs/jfs/super.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jfs/super.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/jfs/super.c linux-3.1.1/fs/jfs/super.c
+--- linux-3.1.1/fs/jfs/super.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jfs/super.c	2011-11-16 18:39:08.000000000 -0500
 @@ -803,7 +803,7 @@ static int __init init_jfs_fs(void)
  
  	jfs_inode_cachep =
@@ -44129,9 +44060,9 @@ diff -urNp linux-3.0.9/fs/jfs/super.c linux-3.0.9/fs/jfs/super.c
  			    init_once);
  	if (jfs_inode_cachep == NULL)
  		return -ENOMEM;
-diff -urNp linux-3.0.9/fs/Kconfig.binfmt linux-3.0.9/fs/Kconfig.binfmt
---- linux-3.0.9/fs/Kconfig.binfmt	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/Kconfig.binfmt	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/Kconfig.binfmt linux-3.1.1/fs/Kconfig.binfmt
+--- linux-3.1.1/fs/Kconfig.binfmt	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/Kconfig.binfmt	2011-11-16 18:39:08.000000000 -0500
 @@ -86,7 +86,7 @@ config HAVE_AOUT
  
  config BINFMT_AOUT
@@ -44141,10 +44072,10 @@ diff -urNp linux-3.0.9/fs/Kconfig.binfmt linux-3.0.9/fs/Kconfig.binfmt
  	---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.9/fs/libfs.c linux-3.0.9/fs/libfs.c
---- linux-3.0.9/fs/libfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/libfs.c	2011-11-15 20:02:59.000000000 -0500
-@@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v
+diff -urNp linux-3.1.1/fs/libfs.c linux-3.1.1/fs/libfs.c
+--- linux-3.1.1/fs/libfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/libfs.c	2011-11-16 18:39:08.000000000 -0500
+@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, v
  
  			for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
  				struct dentry *next;
@@ -44154,7 +44085,7 @@ diff -urNp linux-3.0.9/fs/libfs.c linux-3.0.9/fs/libfs.c
  				next = list_entry(p, struct dentry, d_u.d_child);
  				spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
  				if (!simple_positive(next)) {
-@@ -172,7 +175,12 @@ int dcache_readdir(struct file * filp, v
+@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, v
  
  				spin_unlock(&next->d_lock);
  				spin_unlock(&dentry->d_lock);
@@ -44168,9 +44099,9 @@ diff -urNp linux-3.0.9/fs/libfs.c linux-3.0.9/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.9/fs/lockd/clntproc.c linux-3.0.9/fs/lockd/clntproc.c
---- linux-3.0.9/fs/lockd/clntproc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/lockd/clntproc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/lockd/clntproc.c linux-3.1.1/fs/lockd/clntproc.c
+--- linux-3.1.1/fs/lockd/clntproc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/lockd/clntproc.c	2011-11-16 18:40:29.000000000 -0500
 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
  /*
   * Cookie counter for NLM requests
@@ -44185,7 +44116,7 @@ diff -urNp linux-3.0.9/fs/lockd/clntproc.c linux-3.0.9/fs/lockd/clntproc.c
  
  	memcpy(c->data, &cookie, 4);
  	c->len=4;
-@@ -620,6 +620,8 @@ nlmclnt_reclaim(struct nlm_host *host, s
+@@ -621,6 +621,8 @@ nlmclnt_reclaim(struct nlm_host *host, s
  	struct nlm_rqst reqst, *req;
  	int		status;
  
@@ -44194,10 +44125,10 @@ diff -urNp linux-3.0.9/fs/lockd/clntproc.c linux-3.0.9/fs/lockd/clntproc.c
  	req = &reqst;
  	memset(req, 0, sizeof(*req));
  	locks_init_lock(&req->a_args.lock.fl);
-diff -urNp linux-3.0.9/fs/locks.c linux-3.0.9/fs/locks.c
---- linux-3.0.9/fs/locks.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/locks.c	2011-11-15 20:02:59.000000000 -0500
-@@ -2043,16 +2043,16 @@ void locks_remove_flock(struct file *fil
+diff -urNp linux-3.1.1/fs/locks.c linux-3.1.1/fs/locks.c
+--- linux-3.1.1/fs/locks.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/locks.c	2011-11-16 18:39:08.000000000 -0500
+@@ -2022,16 +2022,16 @@ void locks_remove_flock(struct file *fil
  		return;
  
  	if (filp->f_op && filp->f_op->flock) {
@@ -44218,9 +44149,9 @@ diff -urNp linux-3.0.9/fs/locks.c linux-3.0.9/fs/locks.c
  	}
  
  	lock_flocks();
-diff -urNp linux-3.0.9/fs/logfs/super.c linux-3.0.9/fs/logfs/super.c
---- linux-3.0.9/fs/logfs/super.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/logfs/super.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/logfs/super.c linux-3.1.1/fs/logfs/super.c
+--- linux-3.1.1/fs/logfs/super.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/logfs/super.c	2011-11-16 18:40:29.000000000 -0500
 @@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super
  	struct logfs_disk_super _ds1, *ds1 = &_ds1;
  	int err, valid0, valid1;
@@ -44230,58 +44161,50 @@ diff -urNp linux-3.0.9/fs/logfs/super.c linux-3.0.9/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.9/fs/namei.c linux-3.0.9/fs/namei.c
---- linux-3.0.9/fs/namei.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/namei.c	2011-11-15 20:02:59.000000000 -0500
-@@ -239,21 +239,23 @@ int generic_permission(struct inode *ino
- 		return ret;
+diff -urNp linux-3.1.1/fs/namei.c linux-3.1.1/fs/namei.c
+--- linux-3.1.1/fs/namei.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/namei.c	2011-11-17 00:36:54.000000000 -0500
+@@ -283,14 +283,22 @@ int generic_permission(struct inode *ino
  
+ 	if (S_ISDIR(inode->i_mode)) {
+ 		/* DACs are overridable for directories */
+-		if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
+-			return 0;
+ 		if (!(mask & MAY_WRITE))
+ 			if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
+ 				return 0;
++		if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
++			return 0;
+ 		return -EACCES;
+ 	}
  	/*
--	 * Read/write DACs are always overridable.
--	 * Executable DACs are overridable for all directories and
--	 * for non-directories that have least one exec bit set.
 +	 * Searching includes executable on directories, else just read.
- 	 */
--	if (!(mask & MAY_EXEC) || execute_ok(inode))
--		if (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))) {
++	if (mask == MAY_READ)
 +		if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
++			return 0;
++
++	/*
+ 	 * Read/write DACs are always overridable.
+ 	 * Executable DACs are overridable when there is
+ 	 * at least one exec bit set.
+@@ -299,14 +307,6 @@ int generic_permission(struct inode *ino
+ 		if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
  			return 0;
-+	}
  
- 	/*
+-	/*
 -	 * Searching includes executable on directories, else just read.
-+	 * Read/write DACs are always overridable.
-+	 * Executable DACs are overridable for all directories and
-+	 * for non-directories that have least one exec bit set.
- 	 */
+-	 */
 -	mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
--	if (mask == MAY_READ || (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE)))
+-	if (mask == MAY_READ)
 -		if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
-+	if (!(mask & MAY_EXEC) || execute_ok(inode)) {
-+		if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
- 			return 0;
-+	}
- 
+-			return 0;
+-
  	return -EACCES;
  }
-@@ -595,9 +597,12 @@ static inline int exec_permission(struct
- 	if (ret == -ECHILD)
- 		return ret;
- 
--	if (ns_capable(ns, CAP_DAC_OVERRIDE) ||
--			ns_capable(ns, CAP_DAC_READ_SEARCH))
-+	if (ns_capable_nolog(ns, CAP_DAC_OVERRIDE))
- 		goto ok;
-+	else {
-+		if (ns_capable(ns, CAP_DAC_READ_SEARCH) || ns_capable(ns, CAP_DAC_OVERRIDE))
-+			goto ok;
-+	}
  
- 	return ret;
- ok:
-@@ -705,11 +710,19 @@ follow_link(struct path *link, struct na
+@@ -653,11 +653,19 @@ follow_link(struct path *link, struct na
  		return error;
  	}
  
@@ -44302,7 +44225,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  		error = 0;
  		if (s)
  			error = __vfs_follow_link(nd, s);
-@@ -1606,6 +1619,12 @@ static int path_lookupat(int dfd, const 
+@@ -1622,6 +1630,12 @@ static int path_lookupat(int dfd, const 
  	if (!err)
  		err = complete_walk(nd);
  
@@ -44315,7 +44238,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  	if (!err && nd->flags & LOOKUP_DIRECTORY) {
  		if (!nd->inode->i_op->lookup) {
  			path_put(&nd->path);
-@@ -1633,6 +1652,9 @@ static int do_path_lookup(int dfd, const
+@@ -1649,6 +1663,9 @@ static int do_path_lookup(int dfd, const
  		retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
  
  	if (likely(!retval)) {
@@ -44325,38 +44248,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  		if (unlikely(!audit_dummy_context())) {
  			if (nd->path.dentry && nd->inode)
  				audit_inode(name, nd->path.dentry);
-@@ -1949,6 +1971,30 @@ int vfs_create(struct inode *dir, struct
- 	return error;
- }
- 
-+/*
-+ * Note that while the flag value (low two bits) for sys_open means:
-+ *	00 - read-only
-+ *	01 - write-only
-+ *	10 - read-write
-+ *	11 - special
-+ * it is changed into
-+ *	00 - no permissions needed
-+ *	01 - read-permission
-+ *	10 - write-permission
-+ *	11 - read-write
-+ * for the internal routines (ie open_namei()/follow_link() etc)
-+ * This is more logical, and also allows the 00 "no perm needed"
-+ * to be used for symlinks (where the permissions are checked
-+ * later).
-+ *
-+*/
-+static inline int open_to_namei_flags(int flag)
-+{
-+	if ((flag+1) & O_ACCMODE)
-+		flag++;
-+	return flag;
-+}
-+
- static int may_open(struct path *path, int acc_mode, int flag)
- {
- 	struct dentry *dentry = path->dentry;
-@@ -2001,7 +2047,27 @@ static int may_open(struct path *path, i
+@@ -2049,7 +2066,27 @@ static int may_open(struct path *path, i
  	/*
  	 * Ensure there are no outstanding leases on the file.
  	 */
@@ -44376,7 +44268,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
 +		goto exit;
 +	}
 +
-+	if (!gr_acl_handle_open(dentry, path->mnt, open_to_namei_flags(flag))) {
++	if (!gr_acl_handle_open(dentry, path->mnt, acc_mode)) {
 +		error = -EACCES;
 +		goto exit;
 +	}
@@ -44385,46 +44277,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  }
  
  static int handle_truncate(struct file *filp)
-@@ -2027,30 +2093,6 @@ static int handle_truncate(struct file *
- }
- 
- /*
-- * Note that while the flag value (low two bits) for sys_open means:
-- *	00 - read-only
-- *	01 - write-only
-- *	10 - read-write
-- *	11 - special
-- * it is changed into
-- *	00 - no permissions needed
-- *	01 - read-permission
-- *	10 - write-permission
-- *	11 - read-write
-- * for the internal routines (ie open_namei()/follow_link() etc)
-- * This is more logical, and also allows the 00 "no perm needed"
-- * to be used for symlinks (where the permissions are checked
-- * later).
-- *
--*/
--static inline int open_to_namei_flags(int flag)
--{
--	if ((flag+1) & O_ACCMODE)
--		flag++;
--	return flag;
--}
--
--/*
-  * Handle the last step of open()
-  */
- static struct file *do_last(struct nameidata *nd, struct path *path,
-@@ -2059,6 +2101,7 @@ static struct file *do_last(struct namei
- 	struct dentry *dir = nd->path.dentry;
- 	struct dentry *dentry;
- 	int open_flag = op->open_flag;
-+	int flag = open_to_namei_flags(open_flag);
- 	int will_truncate = open_flag & O_TRUNC;
- 	int want_write = 0;
- 	int acc_mode = op->acc_mode;
-@@ -2079,6 +2122,10 @@ static struct file *do_last(struct namei
+@@ -2110,6 +2147,10 @@ static struct file *do_last(struct namei
  		error = complete_walk(nd);
  		if (error)
  			return ERR_PTR(error);
@@ -44435,7 +44288,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  		audit_inode(pathname, nd->path.dentry);
  		if (open_flag & O_CREAT) {
  			error = -EISDIR;
-@@ -2089,6 +2136,10 @@ static struct file *do_last(struct namei
+@@ -2120,6 +2161,10 @@ static struct file *do_last(struct namei
  		error = complete_walk(nd);
  		if (error)
  			return ERR_PTR(error);
@@ -44446,7 +44299,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  		audit_inode(pathname, dir);
  		goto ok;
  	}
-@@ -2111,6 +2162,11 @@ static struct file *do_last(struct namei
+@@ -2142,6 +2187,11 @@ static struct file *do_last(struct namei
  		if (error)
  			return ERR_PTR(-ECHILD);
  
@@ -44458,12 +44311,12 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  		error = -ENOTDIR;
  		if (nd->flags & LOOKUP_DIRECTORY) {
  			if (!nd->inode->i_op->lookup)
-@@ -2150,6 +2206,12 @@ static struct file *do_last(struct namei
+@@ -2181,6 +2231,12 @@ static struct file *do_last(struct namei
  	/* Negative dentry, just create the file */
  	if (!dentry->d_inode) {
  		int mode = op->mode;
 +
-+		if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, flag, mode)) {
++		if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, open_flag, acc_mode, mode)) {
 +			error = -EACCES;
 +			goto exit_mutex_unlock;
 +		}
@@ -44471,7 +44324,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  		if (!IS_POSIXACL(dir->d_inode))
  			mode &= ~current_umask();
  		/*
-@@ -2173,6 +2235,8 @@ static struct file *do_last(struct namei
+@@ -2204,6 +2260,8 @@ static struct file *do_last(struct namei
  		error = vfs_create(dir->d_inode, dentry, mode, nd);
  		if (error)
  			goto exit_mutex_unlock;
@@ -44480,7 +44333,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  		mutex_unlock(&dir->d_inode->i_mutex);
  		dput(nd->path.dentry);
  		nd->path.dentry = dentry;
-@@ -2182,6 +2246,19 @@ static struct file *do_last(struct namei
+@@ -2213,6 +2271,19 @@ static struct file *do_last(struct namei
  	/*
  	 * It already exists.
  	 */
@@ -44492,7 +44345,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
 +
 +	/* 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)) {
++	if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
 +		error = -EACCES;
 +		goto exit_mutex_unlock;
 +	}
@@ -44500,69 +44353,90 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  	mutex_unlock(&dir->d_inode->i_mutex);
  	audit_inode(pathname, path->dentry);
  
-@@ -2398,6 +2475,10 @@ struct dentry *lookup_create(struct name
- 	}
+@@ -2425,6 +2496,11 @@ struct dentry *kern_path_create(int dfd,
+ 	*path = nd.path;
  	return dentry;
  eexist:
-+	if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
++	if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
 +		dput(dentry);
-+		return ERR_PTR(-ENOENT);
++		dentry = ERR_PTR(-ENOENT);
++		goto fail;
 +	}
  	dput(dentry);
  	dentry = ERR_PTR(-EEXIST);
  fail:
-@@ -2475,6 +2556,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
- 	error = may_mknod(mode);
+@@ -2447,6 +2523,20 @@ struct dentry *user_path_create(int dfd,
+ }
+ EXPORT_SYMBOL(user_path_create);
+ 
++static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
++{
++	char *tmp = getname(pathname);
++	struct dentry *res;
++	if (IS_ERR(tmp))
++		return ERR_CAST(tmp);
++	res = kern_path_create(dfd, tmp, path, is_dir);
++	if (IS_ERR(res))
++		putname(tmp);
++	else
++		*to = tmp;
++	return res;
++}
++
+ int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
+ {
+ 	int error = may_create(dir, dentry);
+@@ -2514,6 +2604,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+ 	error = mnt_want_write(path.mnt);
  	if (error)
  		goto out_dput;
 +
-+	if (gr_handle_chroot_mknod(dentry, nd.path.mnt, mode)) {
++	if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
 +		error = -EPERM;
-+		goto out_dput;
++		goto out_drop_write;
 +	}
 +
-+	if (!gr_acl_handle_mknod(dentry, nd.path.dentry, nd.path.mnt, mode)) {
++	if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
 +		error = -EACCES;
-+		goto out_dput;
++		goto out_drop_write;
 +	}
 +
- 	error = mnt_want_write(nd.path.mnt);
+ 	error = security_path_mknod(&path, dentry, mode, dev);
  	if (error)
- 		goto out_dput;
-@@ -2495,6 +2587,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+ 		goto out_drop_write;
+@@ -2531,6 +2632,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
  	}
  out_drop_write:
- 	mnt_drop_write(nd.path.mnt);
+ 	mnt_drop_write(path.mnt);
 +
 +	if (!error)
-+		gr_handle_create(dentry, nd.path.mnt);
++		gr_handle_create(dentry, path.mnt);
  out_dput:
  	dput(dentry);
- out_unlock:
-@@ -2547,6 +2642,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
- 	if (IS_ERR(dentry))
- 		goto out_unlock;
- 
-+	if (!gr_acl_handle_mkdir(dentry, nd.path.dentry, nd.path.mnt)) {
+ 	mutex_unlock(&path.dentry->d_inode->i_mutex);
+@@ -2580,12 +2684,21 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+ 	error = mnt_want_write(path.mnt);
+ 	if (error)
+ 		goto out_dput;
++
++	if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
 +		error = -EACCES;
-+		goto out_dput;
++		goto out_drop_write;
 +	}
 +
- 	if (!IS_POSIXACL(nd.path.dentry->d_inode))
- 		mode &= ~current_umask();
- 	error = mnt_want_write(nd.path.mnt);
-@@ -2558,6 +2658,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
- 	error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
+ 	error = security_path_mkdir(&path, dentry, mode);
+ 	if (error)
+ 		goto out_drop_write;
+ 	error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
  out_drop_write:
- 	mnt_drop_write(nd.path.mnt);
+ 	mnt_drop_write(path.mnt);
 +
 +	if (!error)
-+		gr_handle_create(dentry, nd.path.mnt);
-+
++		gr_handle_create(dentry, path.mnt);
  out_dput:
  	dput(dentry);
- out_unlock:
-@@ -2640,6 +2744,8 @@ static long do_rmdir(int dfd, const char
+ 	mutex_unlock(&path.dentry->d_inode->i_mutex);
+@@ -2665,6 +2778,8 @@ static long do_rmdir(int dfd, const char
  	char * name;
  	struct dentry *dentry;
  	struct nameidata nd;
@@ -44571,15 +44445,13 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2668,6 +2774,17 @@ static long do_rmdir(int dfd, const char
+@@ -2693,6 +2808,15 @@ static long do_rmdir(int dfd, const char
  		error = -ENOENT;
  		goto exit3;
  	}
 +
-+	if (dentry->d_inode->i_nlink <= 1) {
-+		saved_ino = dentry->d_inode->i_ino;
-+		saved_dev = gr_get_dev_from_dentry(dentry);
-+	}
++	saved_ino = dentry->d_inode->i_ino;
++	saved_dev = gr_get_dev_from_dentry(dentry);
 +
 +	if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
 +		error = -EACCES;
@@ -44589,7 +44461,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto exit3;
-@@ -2675,6 +2792,8 @@ static long do_rmdir(int dfd, const char
+@@ -2700,6 +2824,8 @@ static long do_rmdir(int dfd, const char
  	if (error)
  		goto exit4;
  	error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -44598,7 +44470,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  exit4:
  	mnt_drop_write(nd.path.mnt);
  exit3:
-@@ -2737,6 +2856,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2762,6 +2888,8 @@ static long do_unlinkat(int dfd, const c
  	struct dentry *dentry;
  	struct nameidata nd;
  	struct inode *inode = NULL;
@@ -44607,7 +44479,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2759,6 +2880,16 @@ static long do_unlinkat(int dfd, const c
+@@ -2784,6 +2912,16 @@ static long do_unlinkat(int dfd, const c
  		if (!inode)
  			goto slashes;
  		ihold(inode);
@@ -44624,7 +44496,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  		error = mnt_want_write(nd.path.mnt);
  		if (error)
  			goto exit2;
-@@ -2766,6 +2897,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2791,6 +2929,8 @@ static long do_unlinkat(int dfd, const c
  		if (error)
  			goto exit3;
  		error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -44633,58 +44505,74 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  exit3:
  		mnt_drop_write(nd.path.mnt);
  	exit2:
-@@ -2843,6 +2976,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
- 	if (IS_ERR(dentry))
- 		goto out_unlock;
- 
-+	if (!gr_acl_handle_symlink(dentry, nd.path.dentry, nd.path.mnt, from)) {
+@@ -2866,10 +3006,18 @@ SYSCALL_DEFINE3(symlinkat, const char __
+ 	error = mnt_want_write(path.mnt);
+ 	if (error)
+ 		goto out_dput;
++
++	if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
 +		error = -EACCES;
-+		goto out_dput;
++		goto out_drop_write;
 +	}
 +
- 	error = mnt_want_write(nd.path.mnt);
- 	if (error)
- 		goto out_dput;
-@@ -2850,6 +2988,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+ 	error = security_path_symlink(&path, dentry, from);
  	if (error)
  		goto out_drop_write;
- 	error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
+ 	error = vfs_symlink(path.dentry->d_inode, dentry, from);
 +	if (!error)
-+		gr_handle_create(dentry, nd.path.mnt);
++		gr_handle_create(dentry, path.mnt);
  out_drop_write:
- 	mnt_drop_write(nd.path.mnt);
+ 	mnt_drop_write(path.mnt);
  out_dput:
-@@ -2958,6 +3098,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2941,6 +3089,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+ {
+ 	struct dentry *new_dentry;
+ 	struct path old_path, new_path;
++	char *to;
+ 	int how = 0;
+ 	int error;
+ 
+@@ -2964,7 +3113,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+ 	if (error)
+ 		return error;
+ 
+-	new_dentry = user_path_create(newdfd, newname, &new_path, 0);
++	new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to, 0);
  	error = PTR_ERR(new_dentry);
  	if (IS_ERR(new_dentry))
- 		goto out_unlock;
+ 		goto out;
+@@ -2975,13 +3124,30 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+ 	error = mnt_want_write(new_path.mnt);
+ 	if (error)
+ 		goto out_dput;
 +
 +	if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
 +			       old_path.dentry->d_inode,
 +			       old_path.dentry->d_inode->i_mode, to)) {
 +		error = -EACCES;
-+		goto out_dput;
++		goto out_drop_write;
 +	}
 +
-+	if (!gr_acl_handle_link(new_dentry, nd.path.dentry, nd.path.mnt,
++	if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
 +				old_path.dentry, old_path.mnt, to)) {
 +		error = -EACCES;
-+		goto out_dput;
++		goto out_drop_write;
 +	}
 +
- 	error = mnt_want_write(nd.path.mnt);
- 	if (error)
- 		goto out_dput;
-@@ -2965,6 +3119,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+ 	error = security_path_link(old_path.dentry, &new_path, new_dentry);
  	if (error)
  		goto out_drop_write;
- 	error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
+ 	error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
 +	if (!error)
-+		gr_handle_create(new_dentry, nd.path.mnt);
++		gr_handle_create(new_dentry, new_path.mnt);
  out_drop_write:
- 	mnt_drop_write(nd.path.mnt);
+ 	mnt_drop_write(new_path.mnt);
  out_dput:
-@@ -3142,6 +3298,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
++	putname(to);
+ 	dput(new_dentry);
+ 	mutex_unlock(&new_path.dentry->d_inode->i_mutex);
+ 	path_put(&new_path);
+@@ -3153,6 +3319,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  	char *to;
  	int error;
  
@@ -44693,7 +44581,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  	error = user_path_parent(olddfd, oldname, &oldnd, &from);
  	if (error)
  		goto exit;
-@@ -3198,6 +3356,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3209,6 +3377,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  	if (new_dentry == trap)
  		goto exit5;
  
@@ -44706,7 +44594,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  	error = mnt_want_write(oldnd.path.mnt);
  	if (error)
  		goto exit5;
-@@ -3207,6 +3371,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3218,6 +3392,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  		goto exit6;
  	error = vfs_rename(old_dir->d_inode, old_dentry,
  				   new_dir->d_inode, new_dentry);
@@ -44716,7 +44604,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  exit6:
  	mnt_drop_write(oldnd.path.mnt);
  exit5:
-@@ -3232,6 +3399,8 @@ SYSCALL_DEFINE2(rename, const char __use
+@@ -3243,6 +3420,8 @@ SYSCALL_DEFINE2(rename, const char __use
  
  int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
  {
@@ -44725,7 +44613,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  	int len;
  
  	len = PTR_ERR(link);
-@@ -3241,7 +3410,14 @@ int vfs_readlink(struct dentry *dentry, 
+@@ -3252,7 +3431,14 @@ int vfs_readlink(struct dentry *dentry, 
  	len = strlen(link);
  	if (len > (unsigned) buflen)
  		len = buflen;
@@ -44741,9 +44629,9 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
  		len = -EFAULT;
  out:
  	return len;
-diff -urNp linux-3.0.9/fs/namespace.c linux-3.0.9/fs/namespace.c
---- linux-3.0.9/fs/namespace.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/namespace.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/namespace.c linux-3.1.1/fs/namespace.c
+--- linux-3.1.1/fs/namespace.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/namespace.c	2011-11-16 18:40:29.000000000 -0500
 @@ -1329,6 +1329,9 @@ static int do_umount(struct vfsmount *mn
  		if (!(sb->s_flags & MS_RDONLY))
  			retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -44803,9 +44691,9 @@ diff -urNp linux-3.0.9/fs/namespace.c linux-3.0.9/fs/namespace.c
  	get_fs_root(current->fs, &root);
  	error = lock_mount(&old);
  	if (error)
-diff -urNp linux-3.0.9/fs/ncpfs/dir.c linux-3.0.9/fs/ncpfs/dir.c
---- linux-3.0.9/fs/ncpfs/dir.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ncpfs/dir.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ncpfs/dir.c linux-3.1.1/fs/ncpfs/dir.c
+--- linux-3.1.1/fs/ncpfs/dir.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ncpfs/dir.c	2011-11-16 18:40:29.000000000 -0500
 @@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr
  	int res, val = 0, len;
  	__u8 __name[NCP_MAXPATHLEN + 1];
@@ -44851,9 +44739,9 @@ diff -urNp linux-3.0.9/fs/ncpfs/dir.c linux-3.0.9/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.9/fs/ncpfs/inode.c linux-3.0.9/fs/ncpfs/inode.c
---- linux-3.0.9/fs/ncpfs/inode.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ncpfs/inode.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ncpfs/inode.c linux-3.1.1/fs/ncpfs/inode.c
+--- linux-3.1.1/fs/ncpfs/inode.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ncpfs/inode.c	2011-11-16 18:40:29.000000000 -0500
 @@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b
  #endif
  	struct ncp_entry_info finfo;
@@ -44863,9 +44751,21 @@ diff -urNp linux-3.0.9/fs/ncpfs/inode.c linux-3.0.9/fs/ncpfs/inode.c
  	memset(&data, 0, sizeof(data));
  	server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
  	if (!server)
-diff -urNp linux-3.0.9/fs/nfs/inode.c linux-3.0.9/fs/nfs/inode.c
---- linux-3.0.9/fs/nfs/inode.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/nfs/inode.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/nfs/blocklayout/blocklayout.c linux-3.1.1/fs/nfs/blocklayout/blocklayout.c
+--- linux-3.1.1/fs/nfs/blocklayout/blocklayout.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/nfs/blocklayout/blocklayout.c	2011-11-16 18:39:08.000000000 -0500
+@@ -90,7 +90,7 @@ static int is_writable(struct pnfs_block
+  */
+ struct parallel_io {
+ 	struct kref refcnt;
+-	struct rpc_call_ops call_ops;
++	rpc_call_ops_no_const call_ops;
+ 	void (*pnfs_callback) (void *data);
+ 	void *data;
+ };
+diff -urNp linux-3.1.1/fs/nfs/inode.c linux-3.1.1/fs/nfs/inode.c
+--- linux-3.1.1/fs/nfs/inode.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/nfs/inode.c	2011-11-16 18:39:08.000000000 -0500
 @@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct
  	nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
  	nfsi->attrtimeo_timestamp = jiffies;
@@ -44875,7 +44775,7 @@ diff -urNp linux-3.0.9/fs/nfs/inode.c linux-3.0.9/fs/nfs/inode.c
  	if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
  		nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
  	else
-@@ -1000,16 +1000,16 @@ static int nfs_size_need_update(const st
+@@ -1002,16 +1002,16 @@ static int nfs_size_need_update(const st
  	return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
  }
  
@@ -44895,10 +44795,10 @@ diff -urNp linux-3.0.9/fs/nfs/inode.c linux-3.0.9/fs/nfs/inode.c
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-3.0.9/fs/nfsd/nfs4state.c linux-3.0.9/fs/nfsd/nfs4state.c
---- linux-3.0.9/fs/nfsd/nfs4state.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/nfsd/nfs4state.c	2011-11-15 20:02:59.000000000 -0500
-@@ -3804,6 +3804,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
+diff -urNp linux-3.1.1/fs/nfsd/nfs4state.c linux-3.1.1/fs/nfsd/nfs4state.c
+--- linux-3.1.1/fs/nfsd/nfs4state.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/nfsd/nfs4state.c	2011-11-16 18:40:29.000000000 -0500
+@@ -3999,6 +3999,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
  	unsigned int strhashval;
  	int err;
  
@@ -44907,10 +44807,10 @@ diff -urNp linux-3.0.9/fs/nfsd/nfs4state.c linux-3.0.9/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.9/fs/nfsd/nfs4xdr.c linux-3.0.9/fs/nfsd/nfs4xdr.c
---- linux-3.0.9/fs/nfsd/nfs4xdr.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/nfsd/nfs4xdr.c	2011-11-15 20:02:59.000000000 -0500
-@@ -1800,6 +1800,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
+diff -urNp linux-3.1.1/fs/nfsd/nfs4xdr.c linux-3.1.1/fs/nfsd/nfs4xdr.c
+--- linux-3.1.1/fs/nfsd/nfs4xdr.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/nfsd/nfs4xdr.c	2011-11-16 18:40:29.000000000 -0500
+@@ -1875,6 +1875,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
  		.dentry	= dentry,
  	};
  
@@ -44919,9 +44819,9 @@ diff -urNp linux-3.0.9/fs/nfsd/nfs4xdr.c linux-3.0.9/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.9/fs/nfsd/vfs.c linux-3.0.9/fs/nfsd/vfs.c
---- linux-3.0.9/fs/nfsd/vfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/nfsd/vfs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/nfsd/vfs.c linux-3.1.1/fs/nfsd/vfs.c
+--- linux-3.1.1/fs/nfsd/vfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/nfsd/vfs.c	2011-11-16 18:39:08.000000000 -0500
 @@ -896,7 +896,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
  	} else {
  		oldfs = get_fs();
@@ -44949,9 +44849,9 @@ diff -urNp linux-3.0.9/fs/nfsd/vfs.c linux-3.0.9/fs/nfsd/vfs.c
  	set_fs(oldfs);
  
  	if (host_err < 0)
-diff -urNp linux-3.0.9/fs/notify/fanotify/fanotify_user.c linux-3.0.9/fs/notify/fanotify/fanotify_user.c
---- linux-3.0.9/fs/notify/fanotify/fanotify_user.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/notify/fanotify/fanotify_user.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/notify/fanotify/fanotify_user.c linux-3.1.1/fs/notify/fanotify/fanotify_user.c
+--- linux-3.1.1/fs/notify/fanotify/fanotify_user.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/notify/fanotify/fanotify_user.c	2011-11-16 18:39:08.000000000 -0500
 @@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct
  		goto out_close_fd;
  
@@ -44962,9 +44862,9 @@ diff -urNp linux-3.0.9/fs/notify/fanotify/fanotify_user.c linux-3.0.9/fs/notify/
  			 fanotify_event_metadata.event_len))
  		goto out_kill_access_response;
  
-diff -urNp linux-3.0.9/fs/notify/notification.c linux-3.0.9/fs/notify/notification.c
---- linux-3.0.9/fs/notify/notification.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/notify/notification.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/notify/notification.c linux-3.1.1/fs/notify/notification.c
+--- linux-3.1.1/fs/notify/notification.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/notify/notification.c	2011-11-16 18:39:08.000000000 -0500
 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
   * get set to 0 so it will never get 'freed'
   */
@@ -44983,9 +44883,9 @@ diff -urNp linux-3.0.9/fs/notify/notification.c linux-3.0.9/fs/notify/notificati
  }
  EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
  
-diff -urNp linux-3.0.9/fs/ntfs/dir.c linux-3.0.9/fs/ntfs/dir.c
---- linux-3.0.9/fs/ntfs/dir.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ntfs/dir.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ntfs/dir.c linux-3.1.1/fs/ntfs/dir.c
+--- linux-3.1.1/fs/ntfs/dir.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ntfs/dir.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1329,7 +1329,7 @@ find_next_index_buffer:
  	ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
  			~(s64)(ndir->itype.index.block_size - 1)));
@@ -44995,10 +44895,10 @@ diff -urNp linux-3.0.9/fs/ntfs/dir.c linux-3.0.9/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.9/fs/ntfs/file.c linux-3.0.9/fs/ntfs/file.c
---- linux-3.0.9/fs/ntfs/file.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ntfs/file.c	2011-11-15 20:02:59.000000000 -0500
-@@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_
+diff -urNp linux-3.1.1/fs/ntfs/file.c linux-3.1.1/fs/ntfs/file.c
+--- linux-3.1.1/fs/ntfs/file.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ntfs/file.c	2011-11-16 18:39:08.000000000 -0500
+@@ -2229,6 +2229,6 @@ const struct inode_operations ntfs_file_
  #endif /* NTFS_RW */
  };
  
@@ -45007,9 +44907,9 @@ diff -urNp linux-3.0.9/fs/ntfs/file.c linux-3.0.9/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.9/fs/ocfs2/localalloc.c linux-3.0.9/fs/ocfs2/localalloc.c
---- linux-3.0.9/fs/ocfs2/localalloc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ocfs2/localalloc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ocfs2/localalloc.c linux-3.1.1/fs/ocfs2/localalloc.c
+--- linux-3.1.1/fs/ocfs2/localalloc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ocfs2/localalloc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo
  		goto bail;
  	}
@@ -45019,9 +44919,9 @@ diff -urNp linux-3.0.9/fs/ocfs2/localalloc.c linux-3.0.9/fs/ocfs2/localalloc.c
  
  bail:
  	if (handle)
-diff -urNp linux-3.0.9/fs/ocfs2/namei.c linux-3.0.9/fs/ocfs2/namei.c
---- linux-3.0.9/fs/ocfs2/namei.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ocfs2/namei.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ocfs2/namei.c linux-3.1.1/fs/ocfs2/namei.c
+--- linux-3.1.1/fs/ocfs2/namei.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ocfs2/namei.c	2011-11-16 18:40:29.000000000 -0500
 @@ -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, };
@@ -45031,9 +44931,9 @@ diff -urNp linux-3.0.9/fs/ocfs2/namei.c linux-3.0.9/fs/ocfs2/namei.c
  	/* At some point it might be nice to break this function up a
  	 * bit. */
  
-diff -urNp linux-3.0.9/fs/ocfs2/ocfs2.h linux-3.0.9/fs/ocfs2/ocfs2.h
---- linux-3.0.9/fs/ocfs2/ocfs2.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ocfs2/ocfs2.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ocfs2/ocfs2.h linux-3.1.1/fs/ocfs2/ocfs2.h
+--- linux-3.1.1/fs/ocfs2/ocfs2.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ocfs2/ocfs2.h	2011-11-16 18:39:08.000000000 -0500
 @@ -235,11 +235,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
@@ -45051,9 +44951,9 @@ diff -urNp linux-3.0.9/fs/ocfs2/ocfs2.h linux-3.0.9/fs/ocfs2/ocfs2.h
  };
  
  enum ocfs2_local_alloc_state
-diff -urNp linux-3.0.9/fs/ocfs2/suballoc.c linux-3.0.9/fs/ocfs2/suballoc.c
---- linux-3.0.9/fs/ocfs2/suballoc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ocfs2/suballoc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ocfs2/suballoc.c linux-3.1.1/fs/ocfs2/suballoc.c
+--- linux-3.1.1/fs/ocfs2/suballoc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ocfs2/suballoc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s
  				mlog_errno(status);
  			goto bail;
@@ -45108,9 +45008,9 @@ diff -urNp linux-3.0.9/fs/ocfs2/suballoc.c linux-3.0.9/fs/ocfs2/suballoc.c
  			*num_clusters = res.sr_bits;
  		}
  	}
-diff -urNp linux-3.0.9/fs/ocfs2/super.c linux-3.0.9/fs/ocfs2/super.c
---- linux-3.0.9/fs/ocfs2/super.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ocfs2/super.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ocfs2/super.c linux-3.1.1/fs/ocfs2/super.c
+--- linux-3.1.1/fs/ocfs2/super.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ocfs2/super.c	2011-11-16 18:39:08.000000000 -0500
 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
  			"%10s => GlobalAllocs: %d  LocalAllocs: %d  "
  			"SubAllocs: %d  LAWinMoves: %d  SAExtends: %d\n",
@@ -45145,9 +45045,9 @@ diff -urNp linux-3.0.9/fs/ocfs2/super.c linux-3.0.9/fs/ocfs2/super.c
  
  	/* Copy the blockcheck stats from the superblock probe */
  	osb->osb_ecc_stats = *stats;
-diff -urNp linux-3.0.9/fs/ocfs2/symlink.c linux-3.0.9/fs/ocfs2/symlink.c
---- linux-3.0.9/fs/ocfs2/symlink.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ocfs2/symlink.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/ocfs2/symlink.c linux-3.1.1/fs/ocfs2/symlink.c
+--- linux-3.1.1/fs/ocfs2/symlink.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ocfs2/symlink.c	2011-11-16 18:39:08.000000000 -0500
 @@ -142,7 +142,7 @@ bail:
  
  static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -45157,9 +45057,9 @@ diff -urNp linux-3.0.9/fs/ocfs2/symlink.c linux-3.0.9/fs/ocfs2/symlink.c
  	if (!IS_ERR(link))
  		kfree(link);
  }
-diff -urNp linux-3.0.9/fs/open.c linux-3.0.9/fs/open.c
---- linux-3.0.9/fs/open.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/open.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/open.c linux-3.1.1/fs/open.c
+--- linux-3.1.1/fs/open.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/open.c	2011-11-16 23:40:57.000000000 -0500
 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
  	error = locks_verify_truncate(inode, NULL, length);
  	if (!error)
@@ -45218,59 +45118,24 @@ diff -urNp linux-3.0.9/fs/open.c linux-3.0.9/fs/open.c
  	error = 0;
  dput_and_out:
  	path_put(&path);
-@@ -466,12 +488,25 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
- 	err = mnt_want_write_file(file);
- 	if (err)
- 		goto out_putf;
-+
- 	mutex_lock(&inode->i_mutex);
-+
-+	if (!gr_acl_handle_fchmod(dentry, file->f_vfsmnt, mode)) {
-+		err = -EACCES;
-+		goto out_unlock;
-+	}
-+
- 	err = security_path_chmod(dentry, file->f_vfsmnt, mode);
- 	if (err)
- 		goto out_unlock;
- 	if (mode == (mode_t) -1)
- 		mode = inode->i_mode;
-+
-+	if (gr_handle_chroot_chmod(dentry, file->f_vfsmnt, mode)) {
-+		err = -EACCES;
-+		goto out_unlock;
-+	}
-+
- 	newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
- 	newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
- 	err = notify_change(dentry, &newattrs);
-@@ -499,12 +534,25 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
- 	error = mnt_want_write(path.mnt);
+@@ -456,6 +478,16 @@ static int chmod_common(struct path *pat
  	if (error)
- 		goto dput_and_out;
-+
+ 		return error;
  	mutex_lock(&inode->i_mutex);
 +
-+	if (!gr_acl_handle_chmod(path.dentry, path.mnt, mode)) {
++	if (!gr_acl_handle_fchmod(path->dentry, path->mnt, mode)) {
 +		error = -EACCES;
 +		goto out_unlock;
 +	}
-+
- 	error = security_path_chmod(path.dentry, path.mnt, mode);
- 	if (error)
- 		goto out_unlock;
- 	if (mode == (mode_t) -1)
- 		mode = inode->i_mode;
-+
-+	if (gr_handle_chroot_chmod(path.dentry, path.mnt, mode)) {
++	if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
 +		error = -EACCES;
 +		goto out_unlock;
 +	}
 +
- 	newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
- 	newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
- 	error = notify_change(path.dentry, &newattrs);
-@@ -528,6 +576,9 @@ static int chown_common(struct path *pat
+ 	error = security_path_chmod(path->dentry, path->mnt, mode);
+ 	if (error)
+ 		goto out_unlock;
+@@ -506,6 +538,9 @@ static int chown_common(struct path *pat
  	int error;
  	struct iattr newattrs;
  
@@ -45280,21 +45145,19 @@ diff -urNp linux-3.0.9/fs/open.c linux-3.0.9/fs/open.c
  	newattrs.ia_valid =  ATTR_CTIME;
  	if (user != (uid_t) -1) {
  		newattrs.ia_valid |= ATTR_UID;
-@@ -998,7 +1049,10 @@ long do_sys_open(int dfd, const char __u
+@@ -976,7 +1011,8 @@ long do_sys_open(int dfd, const char __u
  	if (!IS_ERR(tmp)) {
  		fd = get_unused_fd_flags(flags);
  		if (fd >= 0) {
 -			struct file *f = do_filp_open(dfd, tmp, &op, lookup);
 +			struct file *f;
-+			/* don't allow to be set by userland */
-+			flags &= ~FMODE_GREXEC;
 +			f = do_filp_open(dfd, tmp, &op, lookup);
  			if (IS_ERR(f)) {
  				put_unused_fd(fd);
  				fd = PTR_ERR(f);
-diff -urNp linux-3.0.9/fs/partitions/ldm.c linux-3.0.9/fs/partitions/ldm.c
---- linux-3.0.9/fs/partitions/ldm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/partitions/ldm.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/partitions/ldm.c linux-3.1.1/fs/partitions/ldm.c
+--- linux-3.1.1/fs/partitions/ldm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/partitions/ldm.c	2011-11-16 18:40:29.000000000 -0500
 @@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
  		ldm_error ("A VBLK claims to have %d parts.", num);
  		return false;
@@ -45312,9 +45175,9 @@ diff -urNp linux-3.0.9/fs/partitions/ldm.c linux-3.0.9/fs/partitions/ldm.c
  	if (!f) {
  		ldm_crit ("Out of memory.");
  		return false;
-diff -urNp linux-3.0.9/fs/pipe.c linux-3.0.9/fs/pipe.c
---- linux-3.0.9/fs/pipe.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/pipe.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/pipe.c linux-3.1.1/fs/pipe.c
+--- linux-3.1.1/fs/pipe.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/pipe.c	2011-11-16 18:40:29.000000000 -0500
 @@ -420,9 +420,9 @@ redo:
  		}
  		if (bufs)	/* More to do? */
@@ -45438,9 +45301,9 @@ diff -urNp linux-3.0.9/fs/pipe.c linux-3.0.9/fs/pipe.c
  	inode->i_fop = &rdwr_pipefifo_fops;
  
  	/*
-diff -urNp linux-3.0.9/fs/proc/array.c linux-3.0.9/fs/proc/array.c
---- linux-3.0.9/fs/proc/array.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/array.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/array.c linux-3.1.1/fs/proc/array.c
+--- linux-3.1.1/fs/proc/array.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/array.c	2011-11-16 18:40:29.000000000 -0500
 @@ -60,6 +60,7 @@
  #include <linux/tty.h>
  #include <linux/string.h>
@@ -45564,9 +45427,9 @@ diff -urNp linux-3.0.9/fs/proc/array.c linux-3.0.9/fs/proc/array.c
 +	return sprintf(buffer, "%pI4\n", &curr_ip);
 +}
 +#endif
-diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
---- linux-3.0.9/fs/proc/base.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/base.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/base.c linux-3.1.1/fs/proc/base.c
+--- linux-3.1.1/fs/proc/base.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/base.c	2011-11-16 19:25:48.000000000 -0500
 @@ -107,6 +107,22 @@ struct pid_entry {
  	union proc_op op;
  };
@@ -45697,7 +45560,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	ret = -ENOMEM;
  	page = (char *)__get_free_page(GFP_TEMPORARY);
  	if (!page)
-@@ -1614,7 +1658,7 @@ static void *proc_pid_follow_link(struct
+@@ -1613,7 +1657,7 @@ static void *proc_pid_follow_link(struct
  	path_put(&nd->path);
  
  	/* Are we allowed to snoop on the tasks file descriptors? */
@@ -45706,7 +45569,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  		goto out;
  
  	error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
-@@ -1653,8 +1697,18 @@ static int proc_pid_readlink(struct dent
+@@ -1652,8 +1696,18 @@ static int proc_pid_readlink(struct dent
  	struct path path;
  
  	/* Are we allowed to snoop on the tasks file descriptors? */
@@ -45727,7 +45590,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  
  	error = PROC_I(inode)->op.proc_get_link(inode, &path);
  	if (error)
-@@ -1719,7 +1773,11 @@ struct inode *proc_pid_make_inode(struct
+@@ -1718,7 +1772,11 @@ struct inode *proc_pid_make_inode(struct
  		rcu_read_lock();
  		cred = __task_cred(task);
  		inode->i_uid = cred->euid;
@@ -45739,7 +45602,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  		rcu_read_unlock();
  	}
  	security_task_to_inode(task, inode);
-@@ -1737,6 +1795,9 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1736,6 +1794,9 @@ int pid_getattr(struct vfsmount *mnt, st
  	struct inode *inode = dentry->d_inode;
  	struct task_struct *task;
  	const struct cred *cred;
@@ -45749,7 +45612,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  
  	generic_fillattr(inode, stat);
  
-@@ -1744,13 +1805,41 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1743,13 +1804,41 @@ int pid_getattr(struct vfsmount *mnt, st
  	stat->uid = 0;
  	stat->gid = 0;
  	task = pid_task(proc_pid(inode), PIDTYPE_PID);
@@ -45792,7 +45655,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	}
  	rcu_read_unlock();
  	return 0;
-@@ -1787,11 +1876,20 @@ int pid_revalidate(struct dentry *dentry
+@@ -1786,11 +1875,20 @@ int pid_revalidate(struct dentry *dentry
  
  	if (task) {
  		if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
@@ -45813,7 +45676,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  			rcu_read_unlock();
  		} else {
  			inode->i_uid = 0;
-@@ -1909,7 +2007,8 @@ static int proc_fd_info(struct inode *in
+@@ -1908,7 +2006,8 @@ static int proc_fd_info(struct inode *in
  	int fd = proc_fd(inode);
  
  	if (task) {
@@ -45823,12 +45686,12 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  		put_task_struct(task);
  	}
  	if (files) {
-@@ -2177,11 +2276,21 @@ static const struct file_operations proc
+@@ -2176,11 +2275,21 @@ static const struct file_operations proc
   */
- static int proc_fd_permission(struct inode *inode, int mask, unsigned int flags)
+ static int proc_fd_permission(struct inode *inode, int mask)
  {
 +	struct task_struct *task;
- 	int rv = generic_permission(inode, mask, flags, NULL);
+ 	int rv = generic_permission(inode, mask);
 -	if (rv == 0)
 -		return 0;
 +
@@ -45847,7 +45710,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	return rv;
  }
  
-@@ -2291,6 +2400,9 @@ static struct dentry *proc_pident_lookup
+@@ -2290,6 +2399,9 @@ static struct dentry *proc_pident_lookup
  	if (!task)
  		goto out_no_task;
  
@@ -45857,7 +45720,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	/*
  	 * Yes, it does not scale. And it should not. Don't add
  	 * new entries into /proc/<tgid>/ without very good reasons.
-@@ -2335,6 +2447,9 @@ static int proc_pident_readdir(struct fi
+@@ -2334,6 +2446,9 @@ static int proc_pident_readdir(struct fi
  	if (!task)
  		goto out_no_task;
  
@@ -45867,7 +45730,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	ret = 0;
  	i = filp->f_pos;
  	switch (i) {
-@@ -2605,7 +2720,7 @@ static void *proc_self_follow_link(struc
+@@ -2604,7 +2719,7 @@ static void *proc_self_follow_link(struc
  static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
  				void *cookie)
  {
@@ -45876,7 +45739,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	if (!IS_ERR(s))
  		__putname(s);
  }
-@@ -2664,6 +2779,7 @@ static struct dentry *proc_base_instanti
+@@ -2663,6 +2778,7 @@ static struct dentry *proc_base_instanti
  	if (p->fop)
  		inode->i_fop = p->fop;
  	ei->op = p->op;
@@ -45884,7 +45747,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	d_add(dentry, inode);
  	error = NULL;
  out:
-@@ -2803,7 +2919,7 @@ static const struct pid_entry tgid_base_
+@@ -2802,7 +2918,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),
@@ -45893,7 +45756,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	INF("syscall",    S_IRUGO, proc_pid_syscall),
  #endif
  	INF("cmdline",    S_IRUGO, proc_pid_cmdline),
-@@ -2828,10 +2944,10 @@ static const struct pid_entry tgid_base_
+@@ -2827,10 +2943,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
@@ -45906,7 +45769,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-@@ -2865,6 +2981,9 @@ static const struct pid_entry tgid_base_
+@@ -2864,6 +2980,9 @@ static const struct pid_entry tgid_base_
  #ifdef CONFIG_HARDWALL
  	INF("hardwall",   S_IRUGO, proc_pid_hardwall),
  #endif
@@ -45916,7 +45779,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  };
  
  static int proc_tgid_base_readdir(struct file * filp,
-@@ -2990,7 +3109,14 @@ static struct dentry *proc_pid_instantia
+@@ -2989,7 +3108,14 @@ static struct dentry *proc_pid_instantia
  	if (!inode)
  		goto out;
  
@@ -45931,7 +45794,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	inode->i_op = &proc_tgid_base_inode_operations;
  	inode->i_fop = &proc_tgid_base_operations;
  	inode->i_flags|=S_IMMUTABLE;
-@@ -3032,7 +3158,14 @@ struct dentry *proc_pid_lookup(struct in
+@@ -3031,7 +3157,14 @@ struct dentry *proc_pid_lookup(struct in
  	if (!task)
  		goto out;
  
@@ -45946,7 +45809,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	put_task_struct(task);
  out:
  	return result;
-@@ -3097,6 +3230,11 @@ int proc_pid_readdir(struct file * filp,
+@@ -3096,6 +3229,11 @@ int proc_pid_readdir(struct file * filp,
  {
  	unsigned int nr;
  	struct task_struct *reaper;
@@ -45958,7 +45821,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	struct tgid_iter iter;
  	struct pid_namespace *ns;
  
-@@ -3120,8 +3258,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -3119,8 +3257,27 @@ int proc_pid_readdir(struct file * filp,
  	for (iter = next_tgid(ns, iter);
  	     iter.task;
  	     iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -45987,7 +45850,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  			put_task_struct(iter.task);
  			goto out;
  		}
-@@ -3149,7 +3306,7 @@ static const struct pid_entry tid_base_s
+@@ -3148,7 +3305,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),
@@ -45996,7 +45859,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	INF("syscall",   S_IRUGO, proc_pid_syscall),
  #endif
  	INF("cmdline",   S_IRUGO, proc_pid_cmdline),
-@@ -3173,10 +3330,10 @@ static const struct pid_entry tid_base_s
+@@ -3172,10 +3329,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
@@ -46009,9 +45872,9 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
  	ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-3.0.9/fs/proc/cmdline.c linux-3.0.9/fs/proc/cmdline.c
---- linux-3.0.9/fs/proc/cmdline.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/cmdline.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/cmdline.c linux-3.1.1/fs/proc/cmdline.c
+--- linux-3.1.1/fs/proc/cmdline.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/cmdline.c	2011-11-16 18:40:29.000000000 -0500
 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
  
  static int __init proc_cmdline_init(void)
@@ -46024,9 +45887,9 @@ diff -urNp linux-3.0.9/fs/proc/cmdline.c linux-3.0.9/fs/proc/cmdline.c
  	return 0;
  }
  module_init(proc_cmdline_init);
-diff -urNp linux-3.0.9/fs/proc/devices.c linux-3.0.9/fs/proc/devices.c
---- linux-3.0.9/fs/proc/devices.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/devices.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/devices.c linux-3.1.1/fs/proc/devices.c
+--- linux-3.1.1/fs/proc/devices.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/devices.c	2011-11-16 18:40:29.000000000 -0500
 @@ -64,7 +64,11 @@ static const struct file_operations proc
  
  static int __init proc_devices_init(void)
@@ -46039,9 +45902,9 @@ diff -urNp linux-3.0.9/fs/proc/devices.c linux-3.0.9/fs/proc/devices.c
  	return 0;
  }
  module_init(proc_devices_init);
-diff -urNp linux-3.0.9/fs/proc/inode.c linux-3.0.9/fs/proc/inode.c
---- linux-3.0.9/fs/proc/inode.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/inode.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/inode.c linux-3.1.1/fs/proc/inode.c
+--- linux-3.1.1/fs/proc/inode.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/inode.c	2011-11-16 18:40:29.000000000 -0500
 @@ -18,12 +18,18 @@
  #include <linux/module.h>
  #include <linux/sysctl.h>
@@ -46087,9 +45950,9 @@ diff -urNp linux-3.0.9/fs/proc/inode.c linux-3.0.9/fs/proc/inode.c
  		}
  		if (de->size)
  			inode->i_size = de->size;
-diff -urNp linux-3.0.9/fs/proc/internal.h linux-3.0.9/fs/proc/internal.h
---- linux-3.0.9/fs/proc/internal.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/internal.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/internal.h linux-3.1.1/fs/proc/internal.h
+--- linux-3.1.1/fs/proc/internal.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/internal.h	2011-11-16 18:40:29.000000000 -0500
 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
  				struct pid *pid, struct task_struct *task);
  extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -46100,9 +45963,9 @@ diff -urNp linux-3.0.9/fs/proc/internal.h linux-3.0.9/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.9/fs/proc/Kconfig linux-3.0.9/fs/proc/Kconfig
---- linux-3.0.9/fs/proc/Kconfig	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/Kconfig	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/Kconfig linux-3.1.1/fs/proc/Kconfig
+--- linux-3.1.1/fs/proc/Kconfig	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/Kconfig	2011-11-16 18:40:29.000000000 -0500
 @@ -30,12 +30,12 @@ config PROC_FS
  
  config PROC_KCORE
@@ -46130,9 +45993,9 @@ diff -urNp linux-3.0.9/fs/proc/Kconfig linux-3.0.9/fs/proc/Kconfig
  	bool "Enable /proc page monitoring" if EXPERT
   	help
  	  Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-3.0.9/fs/proc/kcore.c linux-3.0.9/fs/proc/kcore.c
---- linux-3.0.9/fs/proc/kcore.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/kcore.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/kcore.c linux-3.1.1/fs/proc/kcore.c
+--- linux-3.1.1/fs/proc/kcore.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/kcore.c	2011-11-16 18:40:29.000000000 -0500
 @@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu
  	off_t offset = 0;
  	struct kcore_list *m;
@@ -46200,9 +46063,9 @@ diff -urNp linux-3.0.9/fs/proc/kcore.c linux-3.0.9/fs/proc/kcore.c
  	if (!capable(CAP_SYS_RAWIO))
  		return -EPERM;
  	if (kcore_need_update)
-diff -urNp linux-3.0.9/fs/proc/meminfo.c linux-3.0.9/fs/proc/meminfo.c
---- linux-3.0.9/fs/proc/meminfo.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/meminfo.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/meminfo.c linux-3.1.1/fs/proc/meminfo.c
+--- linux-3.1.1/fs/proc/meminfo.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/meminfo.c	2011-11-16 18:40:29.000000000 -0500
 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
  	unsigned long pages[NR_LRU_LISTS];
  	int lru;
@@ -46221,9 +46084,9 @@ diff -urNp linux-3.0.9/fs/proc/meminfo.c linux-3.0.9/fs/proc/meminfo.c
  #endif
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
  		,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-diff -urNp linux-3.0.9/fs/proc/nommu.c linux-3.0.9/fs/proc/nommu.c
---- linux-3.0.9/fs/proc/nommu.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/nommu.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/nommu.c linux-3.1.1/fs/proc/nommu.c
+--- linux-3.1.1/fs/proc/nommu.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/nommu.c	2011-11-16 18:39:08.000000000 -0500
 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
  		if (len < 1)
  			len = 1;
@@ -46233,9 +46096,9 @@ diff -urNp linux-3.0.9/fs/proc/nommu.c linux-3.0.9/fs/proc/nommu.c
  	}
  
  	seq_putc(m, '\n');
-diff -urNp linux-3.0.9/fs/proc/proc_net.c linux-3.0.9/fs/proc/proc_net.c
---- linux-3.0.9/fs/proc/proc_net.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/proc_net.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/proc_net.c linux-3.1.1/fs/proc/proc_net.c
+--- linux-3.1.1/fs/proc/proc_net.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/proc_net.c	2011-11-16 18:40:29.000000000 -0500
 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
  	struct task_struct *task;
  	struct nsproxy *ns;
@@ -46254,9 +46117,9 @@ diff -urNp linux-3.0.9/fs/proc/proc_net.c linux-3.0.9/fs/proc/proc_net.c
  
  	rcu_read_lock();
  	task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-3.0.9/fs/proc/proc_sysctl.c linux-3.0.9/fs/proc/proc_sysctl.c
---- linux-3.0.9/fs/proc/proc_sysctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/proc_sysctl.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/proc_sysctl.c linux-3.1.1/fs/proc/proc_sysctl.c
+--- linux-3.1.1/fs/proc/proc_sysctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/proc_sysctl.c	2011-11-16 18:40:29.000000000 -0500
 @@ -8,11 +8,13 @@
  #include <linux/namei.h>
  #include "internal.h"
@@ -46334,9 +46197,9 @@ diff -urNp linux-3.0.9/fs/proc/proc_sysctl.c linux-3.0.9/fs/proc/proc_sysctl.c
  	.lookup		= proc_sys_lookup,
  	.permission	= proc_sys_permission,
  	.setattr	= proc_sys_setattr,
-diff -urNp linux-3.0.9/fs/proc/root.c linux-3.0.9/fs/proc/root.c
---- linux-3.0.9/fs/proc/root.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/root.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/root.c linux-3.1.1/fs/proc/root.c
+--- linux-3.1.1/fs/proc/root.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/root.c	2011-11-16 18:40:29.000000000 -0500
 @@ -123,7 +123,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
  	proc_device_tree_init();
@@ -46353,9 +46216,9 @@ diff -urNp linux-3.0.9/fs/proc/root.c linux-3.0.9/fs/proc/root.c
  	proc_sys_init();
  }
  
-diff -urNp linux-3.0.9/fs/proc/task_mmu.c linux-3.0.9/fs/proc/task_mmu.c
---- linux-3.0.9/fs/proc/task_mmu.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/task_mmu.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/task_mmu.c linux-3.1.1/fs/proc/task_mmu.c
+--- linux-3.1.1/fs/proc/task_mmu.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/task_mmu.c	2011-11-16 18:40:29.000000000 -0500
 @@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct
  		"VmExe:\t%8lu kB\n"
  		"VmLib:\t%8lu kB\n"
@@ -46495,9 +46358,9 @@ diff -urNp linux-3.0.9/fs/proc/task_mmu.c linux-3.0.9/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.9/fs/proc/task_nommu.c linux-3.0.9/fs/proc/task_nommu.c
---- linux-3.0.9/fs/proc/task_nommu.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/task_nommu.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/proc/task_nommu.c linux-3.1.1/fs/proc/task_nommu.c
+--- linux-3.1.1/fs/proc/task_nommu.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/task_nommu.c	2011-11-16 18:39:08.000000000 -0500
 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
  	else
  		bytes += kobjsize(mm);
@@ -46516,9 +46379,9 @@ diff -urNp linux-3.0.9/fs/proc/task_nommu.c linux-3.0.9/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.9/fs/quota/netlink.c linux-3.0.9/fs/quota/netlink.c
---- linux-3.0.9/fs/quota/netlink.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/quota/netlink.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/quota/netlink.c linux-3.1.1/fs/quota/netlink.c
+--- linux-3.1.1/fs/quota/netlink.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/quota/netlink.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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)
@@ -46537,9 +46400,9 @@ diff -urNp linux-3.0.9/fs/quota/netlink.c linux-3.0.9/fs/quota/netlink.c
  			&quota_genl_family, 0, QUOTA_NL_C_WARNING);
  	if (!msg_head) {
  		printk(KERN_ERR
-diff -urNp linux-3.0.9/fs/readdir.c linux-3.0.9/fs/readdir.c
---- linux-3.0.9/fs/readdir.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/readdir.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/readdir.c linux-3.1.1/fs/readdir.c
+--- linux-3.1.1/fs/readdir.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/readdir.c	2011-11-16 18:40:29.000000000 -0500
 @@ -17,6 +17,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -46638,10 +46501,10 @@ diff -urNp linux-3.0.9/fs/readdir.c linux-3.0.9/fs/readdir.c
  		if (__put_user(d_off, &lastdirent->d_off))
  			error = -EFAULT;
  		else
-diff -urNp linux-3.0.9/fs/reiserfs/dir.c linux-3.0.9/fs/reiserfs/dir.c
---- linux-3.0.9/fs/reiserfs/dir.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/dir.c	2011-11-15 20:02:59.000000000 -0500
-@@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr
+diff -urNp linux-3.1.1/fs/reiserfs/dir.c linux-3.1.1/fs/reiserfs/dir.c
+--- linux-3.1.1/fs/reiserfs/dir.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/dir.c	2011-11-16 18:40:29.000000000 -0500
+@@ -75,6 +75,8 @@ int reiserfs_readdir_dentry(struct dentr
  	struct reiserfs_dir_entry de;
  	int ret = 0;
  
@@ -46650,9 +46513,9 @@ diff -urNp linux-3.0.9/fs/reiserfs/dir.c linux-3.0.9/fs/reiserfs/dir.c
  	reiserfs_write_lock(inode->i_sb);
  
  	reiserfs_check_lock_depth(inode->i_sb, "readdir");
-diff -urNp linux-3.0.9/fs/reiserfs/do_balan.c linux-3.0.9/fs/reiserfs/do_balan.c
---- linux-3.0.9/fs/reiserfs/do_balan.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/do_balan.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/reiserfs/do_balan.c linux-3.1.1/fs/reiserfs/do_balan.c
+--- linux-3.1.1/fs/reiserfs/do_balan.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/do_balan.c	2011-11-16 18:39:08.000000000 -0500
 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
  		return;
  	}
@@ -46662,10 +46525,10 @@ diff -urNp linux-3.0.9/fs/reiserfs/do_balan.c linux-3.0.9/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.9/fs/reiserfs/journal.c linux-3.0.9/fs/reiserfs/journal.c
---- linux-3.0.9/fs/reiserfs/journal.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/journal.c	2011-11-15 20:02:59.000000000 -0500
-@@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_brea
+diff -urNp linux-3.1.1/fs/reiserfs/journal.c linux-3.1.1/fs/reiserfs/journal.c
+--- linux-3.1.1/fs/reiserfs/journal.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/journal.c	2011-11-16 18:40:29.000000000 -0500
+@@ -2289,6 +2289,8 @@ static struct buffer_head *reiserfs_brea
  	struct buffer_head *bh;
  	int i, j;
  
@@ -46674,9 +46537,9 @@ diff -urNp linux-3.0.9/fs/reiserfs/journal.c linux-3.0.9/fs/reiserfs/journal.c
  	bh = __getblk(dev, block, bufsize);
  	if (buffer_uptodate(bh))
  		return (bh);
-diff -urNp linux-3.0.9/fs/reiserfs/namei.c linux-3.0.9/fs/reiserfs/namei.c
---- linux-3.0.9/fs/reiserfs/namei.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/namei.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/reiserfs/namei.c linux-3.1.1/fs/reiserfs/namei.c
+--- linux-3.1.1/fs/reiserfs/namei.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/namei.c	2011-11-16 18:40:29.000000000 -0500
 @@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode 
  	unsigned long savelink = 1;
  	struct timespec ctime;
@@ -46686,9 +46549,9 @@ diff -urNp linux-3.0.9/fs/reiserfs/namei.c linux-3.0.9/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.9/fs/reiserfs/procfs.c linux-3.0.9/fs/reiserfs/procfs.c
---- linux-3.0.9/fs/reiserfs/procfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/procfs.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/reiserfs/procfs.c linux-3.1.1/fs/reiserfs/procfs.c
+--- linux-3.1.1/fs/reiserfs/procfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/procfs.c	2011-11-16 18:40:29.000000000 -0500
 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
  		   "SMALL_TAILS " : "NO_TAILS ",
  		   replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -46707,9 +46570,9 @@ diff -urNp linux-3.0.9/fs/reiserfs/procfs.c linux-3.0.9/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.9/fs/reiserfs/stree.c linux-3.0.9/fs/reiserfs/stree.c
---- linux-3.0.9/fs/reiserfs/stree.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/stree.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/reiserfs/stree.c linux-3.1.1/fs/reiserfs/stree.c
+--- linux-3.1.1/fs/reiserfs/stree.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/stree.c	2011-11-16 18:40:29.000000000 -0500
 @@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs
  	int iter = 0;
  #endif
@@ -46755,9 +46618,9 @@ diff -urNp linux-3.0.9/fs/reiserfs/stree.c linux-3.0.9/fs/reiserfs/stree.c
  	BUG_ON(!th->t_trans_id);
  
  	if (inode) {		/* Do we count quotas for item? */
-diff -urNp linux-3.0.9/fs/reiserfs/super.c linux-3.0.9/fs/reiserfs/super.c
---- linux-3.0.9/fs/reiserfs/super.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/super.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/reiserfs/super.c linux-3.1.1/fs/reiserfs/super.c
+--- linux-3.1.1/fs/reiserfs/super.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/super.c	2011-11-16 18:40:29.000000000 -0500
 @@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct
  		{.option_name = NULL}
  	};
@@ -46767,9 +46630,9 @@ diff -urNp linux-3.0.9/fs/reiserfs/super.c linux-3.0.9/fs/reiserfs/super.c
  	*blocks = 0;
  	if (!options || !*options)
  		/* use default configuration: create tails, journaling on, no
-diff -urNp linux-3.0.9/fs/select.c linux-3.0.9/fs/select.c
---- linux-3.0.9/fs/select.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/select.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/select.c linux-3.1.1/fs/select.c
+--- linux-3.1.1/fs/select.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/select.c	2011-11-16 18:40:29.000000000 -0500
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -46806,9 +46669,9 @@ diff -urNp linux-3.0.9/fs/select.c linux-3.0.9/fs/select.c
  	if (nfds > rlimit(RLIMIT_NOFILE))
  		return -EINVAL;
  
-diff -urNp linux-3.0.9/fs/seq_file.c linux-3.0.9/fs/seq_file.c
---- linux-3.0.9/fs/seq_file.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/seq_file.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/seq_file.c linux-3.1.1/fs/seq_file.c
+--- linux-3.1.1/fs/seq_file.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/seq_file.c	2011-11-16 18:39:08.000000000 -0500
 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
  		return 0;
  	}
@@ -46858,9 +46721,9 @@ diff -urNp linux-3.0.9/fs/seq_file.c linux-3.0.9/fs/seq_file.c
  	int res = -ENOMEM;
  
  	if (op) {
-diff -urNp linux-3.0.9/fs/splice.c linux-3.0.9/fs/splice.c
---- linux-3.0.9/fs/splice.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/splice.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/splice.c linux-3.1.1/fs/splice.c
+--- linux-3.1.1/fs/splice.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/splice.c	2011-11-16 18:40:29.000000000 -0500
 @@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode
  	pipe_lock(pipe);
  
@@ -47026,9 +46889,9 @@ diff -urNp linux-3.0.9/fs/splice.c linux-3.0.9/fs/splice.c
  		ret = -EAGAIN;
  
  	pipe_unlock(ipipe);
-diff -urNp linux-3.0.9/fs/sysfs/file.c linux-3.0.9/fs/sysfs/file.c
---- linux-3.0.9/fs/sysfs/file.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/sysfs/file.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/sysfs/file.c linux-3.1.1/fs/sysfs/file.c
+--- linux-3.1.1/fs/sysfs/file.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/sysfs/file.c	2011-11-16 18:39:08.000000000 -0500
 @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
  
  struct sysfs_open_dirent {
@@ -47074,9 +46937,9 @@ diff -urNp linux-3.0.9/fs/sysfs/file.c linux-3.0.9/fs/sysfs/file.c
  		wake_up_interruptible(&od->poll);
  	}
  
-diff -urNp linux-3.0.9/fs/sysfs/mount.c linux-3.0.9/fs/sysfs/mount.c
---- linux-3.0.9/fs/sysfs/mount.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/sysfs/mount.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/sysfs/mount.c linux-3.1.1/fs/sysfs/mount.c
+--- linux-3.1.1/fs/sysfs/mount.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/sysfs/mount.c	2011-11-16 18:40:29.000000000 -0500
 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
  	.s_name		= "",
  	.s_count	= ATOMIC_INIT(1),
@@ -47089,9 +46952,9 @@ diff -urNp linux-3.0.9/fs/sysfs/mount.c linux-3.0.9/fs/sysfs/mount.c
  	.s_ino		= 1,
  };
  
-diff -urNp linux-3.0.9/fs/sysfs/symlink.c linux-3.0.9/fs/sysfs/symlink.c
---- linux-3.0.9/fs/sysfs/symlink.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/sysfs/symlink.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/sysfs/symlink.c linux-3.1.1/fs/sysfs/symlink.c
+--- linux-3.1.1/fs/sysfs/symlink.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/sysfs/symlink.c	2011-11-16 18:39:08.000000000 -0500
 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
  
  static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -47101,9 +46964,9 @@ diff -urNp linux-3.0.9/fs/sysfs/symlink.c linux-3.0.9/fs/sysfs/symlink.c
  	if (!IS_ERR(page))
  		free_page((unsigned long)page);
  }
-diff -urNp linux-3.0.9/fs/udf/inode.c linux-3.0.9/fs/udf/inode.c
---- linux-3.0.9/fs/udf/inode.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/udf/inode.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/udf/inode.c linux-3.1.1/fs/udf/inode.c
+--- linux-3.1.1/fs/udf/inode.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/udf/inode.c	2011-11-16 18:40:29.000000000 -0500
 @@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk(
  	int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
  	int lastblock = 0;
@@ -47113,9 +46976,9 @@ diff -urNp linux-3.0.9/fs/udf/inode.c linux-3.0.9/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.9/fs/udf/misc.c linux-3.0.9/fs/udf/misc.c
---- linux-3.0.9/fs/udf/misc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/udf/misc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/udf/misc.c linux-3.1.1/fs/udf/misc.c
+--- linux-3.1.1/fs/udf/misc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/udf/misc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
  
  u8 udf_tag_checksum(const struct tag *t)
@@ -47125,9 +46988,9 @@ diff -urNp linux-3.0.9/fs/udf/misc.c linux-3.0.9/fs/udf/misc.c
  	u8 checksum = 0;
  	int i;
  	for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-3.0.9/fs/utimes.c linux-3.0.9/fs/utimes.c
---- linux-3.0.9/fs/utimes.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/utimes.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/utimes.c linux-3.1.1/fs/utimes.c
+--- linux-3.1.1/fs/utimes.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/utimes.c	2011-11-16 18:40:29.000000000 -0500
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -47149,9 +47012,9 @@ diff -urNp linux-3.0.9/fs/utimes.c linux-3.0.9/fs/utimes.c
  	mutex_lock(&inode->i_mutex);
  	error = notify_change(path->dentry, &newattrs);
  	mutex_unlock(&inode->i_mutex);
-diff -urNp linux-3.0.9/fs/xattr_acl.c linux-3.0.9/fs/xattr_acl.c
---- linux-3.0.9/fs/xattr_acl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xattr_acl.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/xattr_acl.c linux-3.1.1/fs/xattr_acl.c
+--- linux-3.1.1/fs/xattr_acl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/xattr_acl.c	2011-11-16 18:39:08.000000000 -0500
 @@ -17,8 +17,8 @@
  struct posix_acl *
  posix_acl_from_xattr(const void *value, size_t size)
@@ -47163,9 +47026,9 @@ diff -urNp linux-3.0.9/fs/xattr_acl.c linux-3.0.9/fs/xattr_acl.c
  	int count;
  	struct posix_acl *acl;
  	struct posix_acl_entry *acl_e;
-diff -urNp linux-3.0.9/fs/xattr.c linux-3.0.9/fs/xattr.c
---- linux-3.0.9/fs/xattr.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xattr.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/xattr.c linux-3.1.1/fs/xattr.c
+--- linux-3.1.1/fs/xattr.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/xattr.c	2011-11-16 18:40:29.000000000 -0500
 @@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
   * Extended attribute SET operations
   */
@@ -47228,45 +47091,10 @@ diff -urNp linux-3.0.9/fs/xattr.c linux-3.0.9/fs/xattr.c
  		mnt_drop_write(f->f_path.mnt);
  	}
  	fput(f);
-diff -urNp linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-11-15 20:02:59.000000000 -0500
-@@ -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.9/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c	2011-11-15 20:02:59.000000000 -0500
-@@ -128,7 +128,7 @@ xfs_find_handle(
- 	}
- 
- 	error = -EFAULT;
--	if (copy_to_user(hreq->ohandle, &handle, hsize) ||
-+	if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
- 	    copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
- 		goto out_put;
- 
-diff -urNp linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c
---- linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c	2011-11-15 20:02:59.000000000 -0500
-@@ -437,7 +437,7 @@ xfs_vn_put_link(
- 	struct nameidata *nd,
- 	void		*p)
- {
--	char		*s = nd_get_link(nd);
-+	const char	*s = nd_get_link(nd);
- 
- 	if (!IS_ERR(s))
- 		kfree(s);
-diff -urNp linux-3.0.9/fs/xfs/xfs_bmap.c linux-3.0.9/fs/xfs/xfs_bmap.c
---- linux-3.0.9/fs/xfs/xfs_bmap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xfs/xfs_bmap.c	2011-11-15 20:02:59.000000000 -0500
-@@ -253,7 +253,7 @@ xfs_bmap_validate_ret(
+diff -urNp linux-3.1.1/fs/xfs/xfs_bmap.c linux-3.1.1/fs/xfs/xfs_bmap.c
+--- linux-3.1.1/fs/xfs/xfs_bmap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/xfs/xfs_bmap.c	2011-11-16 18:39:08.000000000 -0500
+@@ -250,7 +250,7 @@ xfs_bmap_validate_ret(
  	int			nmap,
  	int			ret_nmap);
  #else
@@ -47275,13 +47103,13 @@ diff -urNp linux-3.0.9/fs/xfs/xfs_bmap.c linux-3.0.9/fs/xfs/xfs_bmap.c
  #endif /* DEBUG */
  
  STATIC int
-diff -urNp linux-3.0.9/fs/xfs/xfs_dir2_sf.c linux-3.0.9/fs/xfs/xfs_dir2_sf.c
---- linux-3.0.9/fs/xfs/xfs_dir2_sf.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xfs/xfs_dir2_sf.c	2011-11-15 20:02:59.000000000 -0500
-@@ -780,7 +780,15 @@ xfs_dir2_sf_getdents(
+diff -urNp linux-3.1.1/fs/xfs/xfs_dir2_sf.c linux-3.1.1/fs/xfs/xfs_dir2_sf.c
+--- linux-3.1.1/fs/xfs/xfs_dir2_sf.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/xfs/xfs_dir2_sf.c	2011-11-16 18:39:08.000000000 -0500
+@@ -852,7 +852,15 @@ xfs_dir2_sf_getdents(
  		}
  
- 		ino = xfs_dir2_sf_get_inumber(sfp, xfs_dir2_sf_inumberp(sfep));
+ 		ino = xfs_dir2_sfe_get_ino(sfp, sfep);
 -		if (filldir(dirent, (char *)sfep->name, sfep->namelen,
 +		if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
 +			char name[sfep->namelen];
@@ -47295,9 +47123,33 @@ diff -urNp linux-3.0.9/fs/xfs/xfs_dir2_sf.c linux-3.0.9/fs/xfs/xfs_dir2_sf.c
  			    off & 0x7fffffff, ino, DT_UNKNOWN)) {
  			*offset = off & 0x7fffffff;
  			return 0;
-diff -urNp linux-3.0.9/grsecurity/gracl_alloc.c linux-3.0.9/grsecurity/gracl_alloc.c
---- linux-3.0.9/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_alloc.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/fs/xfs/xfs_ioctl.c linux-3.1.1/fs/xfs/xfs_ioctl.c
+--- linux-3.1.1/fs/xfs/xfs_ioctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/xfs/xfs_ioctl.c	2011-11-16 18:39:08.000000000 -0500
+@@ -128,7 +128,7 @@ xfs_find_handle(
+ 	}
+ 
+ 	error = -EFAULT;
+-	if (copy_to_user(hreq->ohandle, &handle, hsize) ||
++	if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
+ 	    copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
+ 		goto out_put;
+ 
+diff -urNp linux-3.1.1/fs/xfs/xfs_iops.c linux-3.1.1/fs/xfs/xfs_iops.c
+--- linux-3.1.1/fs/xfs/xfs_iops.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/xfs/xfs_iops.c	2011-11-16 18:39:08.000000000 -0500
+@@ -446,7 +446,7 @@ xfs_vn_put_link(
+ 	struct nameidata *nd,
+ 	void		*p)
+ {
+-	char		*s = nd_get_link(nd);
++	const char	*s = nd_get_link(nd);
+ 
+ 	if (!IS_ERR(s))
+ 		kfree(s);
+diff -urNp linux-3.1.1/grsecurity/gracl_alloc.c linux-3.1.1/grsecurity/gracl_alloc.c
+--- linux-3.1.1/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_alloc.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,105 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -47404,10 +47256,10 @@ diff -urNp linux-3.0.9/grsecurity/gracl_alloc.c linux-3.0.9/grsecurity/gracl_all
 +	else
 +		return 1;
 +}
-diff -urNp linux-3.0.9/grsecurity/gracl.c linux-3.0.9/grsecurity/gracl.c
---- linux-3.0.9/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl.c	2011-11-15 20:02:59.000000000 -0500
-@@ -0,0 +1,4154 @@
+diff -urNp linux-3.1.1/grsecurity/gracl.c linux-3.1.1/grsecurity/gracl.c
+--- linux-3.1.1/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl.c	2011-11-16 19:31:00.000000000 -0500
+@@ -0,0 +1,4156 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -50243,6 +50095,7 @@ diff -urNp linux-3.0.9/grsecurity/gracl.c linux-3.0.9/grsecurity/gracl.c
 +{
 +	struct name_entry *matchn;
 +	struct inodev_entry *inodev;
++	struct inode *inode = new_dentry->d_inode;
 +	ino_t old_ino = old_dentry->d_inode->i_ino;
 +	dev_t old_dev = __get_dev(old_dentry);
 +
@@ -50265,17 +50118,17 @@ diff -urNp linux-3.0.9/grsecurity/gracl.c linux-3.0.9/grsecurity/gracl.c
 +	 */
 +
 +	write_lock(&gr_inode_lock);
-+	if (unlikely(replace && new_dentry->d_inode)) {
-+		ino_t new_ino = new_dentry->d_inode->i_ino;
++	if (unlikely(replace && inode)) {
++		ino_t new_ino = inode->i_ino;
 +		dev_t new_dev = __get_dev(new_dentry);
 +
 +		inodev = lookup_inodev_entry(new_ino, new_dev);
-+		if (inodev != NULL && (new_dentry->d_inode->i_nlink <= 1))
++		if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
 +			do_handle_delete(inodev, new_ino, new_dev);
 +	}
 +
 +	inodev = lookup_inodev_entry(old_ino, old_dev);
-+	if (inodev != NULL && (old_dentry->d_inode->i_nlink <= 1))
++	if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
 +		do_handle_delete(inodev, old_ino, old_dev);
 +
 +	if (unlikely((unsigned long)matchn))
@@ -51265,6 +51118,7 @@ diff -urNp linux-3.0.9/grsecurity/gracl.c linux-3.0.9/grsecurity/gracl.c
 +		
 +	if (retmode & GR_PTRACERD) {
 +		switch (request) {
++		case PTRACE_SEIZE:
 +		case PTRACE_POKETEXT:
 +		case PTRACE_POKEDATA:
 +		case PTRACE_POKEUSR:
@@ -51562,9 +51416,9 @@ diff -urNp linux-3.0.9/grsecurity/gracl.c linux-3.0.9/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff -urNp linux-3.0.9/grsecurity/gracl_cap.c linux-3.0.9/grsecurity/gracl_cap.c
---- linux-3.0.9/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_cap.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/gracl_cap.c linux-3.1.1/grsecurity/gracl_cap.c
+--- linux-3.1.1/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_cap.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,101 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -51667,10 +51521,10 @@ diff -urNp linux-3.0.9/grsecurity/gracl_cap.c linux-3.0.9/grsecurity/gracl_cap.c
 +	return 0;
 +}
 +
-diff -urNp linux-3.0.9/grsecurity/gracl_fs.c linux-3.0.9/grsecurity/gracl_fs.c
---- linux-3.0.9/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_fs.c	2011-11-15 20:02:59.000000000 -0500
-@@ -0,0 +1,431 @@
+diff -urNp linux-3.1.1/grsecurity/gracl_fs.c linux-3.1.1/grsecurity/gracl_fs.c
+--- linux-3.1.1/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_fs.c	2011-11-17 00:25:32.000000000 -0500
+@@ -0,0 +1,433 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/types.h>
@@ -51707,7 +51561,7 @@ diff -urNp linux-3.0.9/grsecurity/gracl_fs.c linux-3.0.9/grsecurity/gracl_fs.c
 +
 +__u32
 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
-+		   const int fmode)
++		   int acc_mode)
 +{
 +	__u32 reqmode = GR_FIND;
 +	__u32 mode;
@@ -51715,14 +51569,13 @@ diff -urNp linux-3.0.9/grsecurity/gracl_fs.c linux-3.0.9/grsecurity/gracl_fs.c
 +	if (unlikely(!dentry->d_inode))
 +		return reqmode;
 +
-+	if (unlikely(fmode & O_APPEND))
++	if (acc_mode & MAY_APPEND)
 +		reqmode |= GR_APPEND;
-+	else if (unlikely(fmode & FMODE_WRITE))
++	else if (acc_mode & MAY_WRITE)
 +		reqmode |= GR_WRITE;
-+	if (likely((fmode & FMODE_READ) && !(fmode & O_DIRECTORY)))
++	if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
 +		reqmode |= GR_READ;
-+	if ((fmode & FMODE_GREXEC) && (fmode & __FMODE_EXEC))
-+		reqmode &= ~GR_READ;
++
 +	mode =
 +	    gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
 +			   mnt);
@@ -51750,17 +51603,20 @@ diff -urNp linux-3.0.9/grsecurity/gracl_fs.c linux-3.0.9/grsecurity/gracl_fs.c
 +__u32
 +gr_acl_handle_creat(const struct dentry * dentry,
 +		    const struct dentry * p_dentry,
-+		    const struct vfsmount * p_mnt, const int fmode,
++		    const struct vfsmount * p_mnt, int open_flags, int acc_mode,
 +		    const int imode)
 +{
 +	__u32 reqmode = GR_WRITE | GR_CREATE;
 +	__u32 mode;
 +
-+	if (unlikely(fmode & O_APPEND))
++	if (acc_mode & MAY_APPEND)
 +		reqmode |= GR_APPEND;
-+	if (unlikely((fmode & FMODE_READ) && !(fmode & O_DIRECTORY)))
++	// if a directory was required or the directory already exists, then
++	// don't count this open as a read
++	if ((acc_mode & MAY_READ) &&
++	    !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
 +		reqmode |= GR_READ;
-+	if (unlikely((fmode & O_CREAT) && (imode & (S_ISUID | S_ISGID))))
++	if ((open_flags & O_CREAT) && (imode & (S_ISUID | S_ISGID)))
 +		reqmode |= GR_SETID;
 +
 +	mode =
@@ -52102,9 +51958,9 @@ diff -urNp linux-3.0.9/grsecurity/gracl_fs.c linux-3.0.9/grsecurity/gracl_fs.c
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.9/grsecurity/gracl_ip.c linux-3.0.9/grsecurity/gracl_ip.c
---- linux-3.0.9/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_ip.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/gracl_ip.c linux-3.1.1/grsecurity/gracl_ip.c
+--- linux-3.1.1/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_ip.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,381 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
@@ -52487,9 +52343,9 @@ diff -urNp linux-3.0.9/grsecurity/gracl_ip.c linux-3.0.9/grsecurity/gracl_ip.c
 +
 +	return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff -urNp linux-3.0.9/grsecurity/gracl_learn.c linux-3.0.9/grsecurity/gracl_learn.c
---- linux-3.0.9/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_learn.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/gracl_learn.c linux-3.1.1/grsecurity/gracl_learn.c
+--- linux-3.1.1/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_learn.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,207 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -52698,9 +52554,9 @@ diff -urNp linux-3.0.9/grsecurity/gracl_learn.c linux-3.0.9/grsecurity/gracl_lea
 +	.release	= close_learn,
 +	.poll		= poll_learn,
 +};
-diff -urNp linux-3.0.9/grsecurity/gracl_res.c linux-3.0.9/grsecurity/gracl_res.c
---- linux-3.0.9/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_res.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/gracl_res.c linux-3.1.1/grsecurity/gracl_res.c
+--- linux-3.1.1/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_res.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,68 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52770,9 +52626,9 @@ diff -urNp linux-3.0.9/grsecurity/gracl_res.c linux-3.0.9/grsecurity/gracl_res.c
 +	rcu_read_unlock();
 +	return;
 +}
-diff -urNp linux-3.0.9/grsecurity/gracl_segv.c linux-3.0.9/grsecurity/gracl_segv.c
---- linux-3.0.9/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_segv.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/gracl_segv.c linux-3.1.1/grsecurity/gracl_segv.c
+--- linux-3.1.1/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_segv.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,299 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -53073,9 +52929,9 @@ diff -urNp linux-3.0.9/grsecurity/gracl_segv.c linux-3.0.9/grsecurity/gracl_segv
 +
 +	return;
 +}
-diff -urNp linux-3.0.9/grsecurity/gracl_shm.c linux-3.0.9/grsecurity/gracl_shm.c
---- linux-3.0.9/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_shm.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/gracl_shm.c linux-3.1.1/grsecurity/gracl_shm.c
+--- linux-3.1.1/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_shm.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -53117,9 +52973,9 @@ diff -urNp linux-3.0.9/grsecurity/gracl_shm.c linux-3.0.9/grsecurity/gracl_shm.c
 +
 +	return 1;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_chdir.c linux-3.0.9/grsecurity/grsec_chdir.c
---- linux-3.0.9/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_chdir.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_chdir.c linux-3.1.1/grsecurity/grsec_chdir.c
+--- linux-3.1.1/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_chdir.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53140,9 +52996,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_chdir.c linux-3.0.9/grsecurity/grsec_chd
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_chroot.c linux-3.0.9/grsecurity/grsec_chroot.c
---- linux-3.0.9/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_chroot.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_chroot.c linux-3.1.1/grsecurity/grsec_chroot.c
+--- linux-3.1.1/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_chroot.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,351 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -53495,9 +53351,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_chroot.c linux-3.0.9/grsecurity/grsec_ch
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_disabled.c linux-3.0.9/grsecurity/grsec_disabled.c
---- linux-3.0.9/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_disabled.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_disabled.c linux-3.1.1/grsecurity/grsec_disabled.c
+--- linux-3.1.1/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_disabled.c	2011-11-17 00:16:25.000000000 -0500
 @@ -0,0 +1,439 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -53693,7 +53549,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_disabled.c linux-3.0.9/grsecurity/grsec_
 +
 +__u32
 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
-+		   const int fmode)
++		   int acc_mode)
 +{
 +	return 1;
 +}
@@ -53862,7 +53718,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_disabled.c linux-3.0.9/grsecurity/grsec_
 +__u32
 +gr_acl_handle_creat(const struct dentry * dentry,
 +		    const struct dentry * p_dentry,
-+		    const struct vfsmount * p_mnt, const int fmode,
++		    const struct vfsmount * p_mnt, int open_flags, int acc_mode,
 +		    const int imode)
 +{
 +	return 1;
@@ -53938,9 +53794,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_disabled.c linux-3.0.9/grsecurity/grsec_
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff -urNp linux-3.0.9/grsecurity/grsec_exec.c linux-3.0.9/grsecurity/grsec_exec.c
---- linux-3.0.9/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_exec.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_exec.c linux-3.1.1/grsecurity/grsec_exec.c
+--- linux-3.1.1/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_exec.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,146 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54088,9 +53944,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_exec.c linux-3.0.9/grsecurity/grsec_exec
 +
 +EXPORT_SYMBOL(gr_is_capable);
 +EXPORT_SYMBOL(gr_is_capable_nolog);
-diff -urNp linux-3.0.9/grsecurity/grsec_fifo.c linux-3.0.9/grsecurity/grsec_fifo.c
---- linux-3.0.9/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_fifo.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_fifo.c linux-3.1.1/grsecurity/grsec_fifo.c
+--- linux-3.1.1/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_fifo.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54116,9 +53972,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_fifo.c linux-3.0.9/grsecurity/grsec_fifo
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_fork.c linux-3.0.9/grsecurity/grsec_fork.c
---- linux-3.0.9/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_fork.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_fork.c linux-3.1.1/grsecurity/grsec_fork.c
+--- linux-3.1.1/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_fork.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,23 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54143,9 +53999,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_fork.c linux-3.0.9/grsecurity/grsec_fork
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_init.c linux-3.0.9/grsecurity/grsec_init.c
---- linux-3.0.9/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_init.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_init.c linux-3.1.1/grsecurity/grsec_init.c
+--- linux-3.1.1/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_init.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,269 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54416,9 +54272,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_init.c linux-3.0.9/grsecurity/grsec_init
 +
 +	return;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_link.c linux-3.0.9/grsecurity/grsec_link.c
---- linux-3.0.9/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_link.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_link.c linux-3.1.1/grsecurity/grsec_link.c
+--- linux-3.1.1/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_link.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54463,9 +54319,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_link.c linux-3.0.9/grsecurity/grsec_link
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_log.c linux-3.0.9/grsecurity/grsec_log.c
---- linux-3.0.9/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_log.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_log.c linux-3.1.1/grsecurity/grsec_log.c
+--- linux-3.1.1/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_log.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,322 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54789,9 +54645,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_log.c linux-3.0.9/grsecurity/grsec_log.c
 +		gr_log_end(audit, 1);
 +	END_LOCKS(audit);
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_mem.c linux-3.0.9/grsecurity/grsec_mem.c
---- linux-3.0.9/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_mem.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_mem.c linux-3.1.1/grsecurity/grsec_mem.c
+--- linux-3.1.1/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_mem.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,33 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54826,9 +54682,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_mem.c linux-3.0.9/grsecurity/grsec_mem.c
 +	gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +	return;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_mount.c linux-3.0.9/grsecurity/grsec_mount.c
---- linux-3.0.9/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_mount.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_mount.c linux-3.1.1/grsecurity/grsec_mount.c
+--- linux-3.1.1/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_mount.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54892,9 +54748,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_mount.c linux-3.0.9/grsecurity/grsec_mou
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_pax.c linux-3.0.9/grsecurity/grsec_pax.c
---- linux-3.0.9/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_pax.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_pax.c linux-3.1.1/grsecurity/grsec_pax.c
+--- linux-3.1.1/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_pax.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,36 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54932,9 +54788,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_pax.c linux-3.0.9/grsecurity/grsec_pax.c
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_ptrace.c linux-3.0.9/grsecurity/grsec_ptrace.c
---- linux-3.0.9/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_ptrace.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_ptrace.c linux-3.1.1/grsecurity/grsec_ptrace.c
+--- linux-3.1.1/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_ptrace.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54950,9 +54806,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_ptrace.c linux-3.0.9/grsecurity/grsec_pt
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_sig.c linux-3.0.9/grsecurity/grsec_sig.c
---- linux-3.0.9/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_sig.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_sig.c linux-3.1.1/grsecurity/grsec_sig.c
+--- linux-3.1.1/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_sig.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,206 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -55160,9 +55016,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_sig.c linux-3.0.9/grsecurity/grsec_sig.c
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_sock.c linux-3.0.9/grsecurity/grsec_sock.c
---- linux-3.0.9/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_sock.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_sock.c linux-3.1.1/grsecurity/grsec_sock.c
+--- linux-3.1.1/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_sock.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,244 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -55408,9 +55264,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_sock.c linux-3.0.9/grsecurity/grsec_sock
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsec_sysctl.c linux-3.0.9/grsecurity/grsec_sysctl.c
---- linux-3.0.9/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_sysctl.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_sysctl.c linux-3.1.1/grsecurity/grsec_sysctl.c
+--- linux-3.1.1/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_sysctl.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,433 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -55845,9 +55701,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_sysctl.c linux-3.0.9/grsecurity/grsec_sy
 +	{ }
 +};
 +#endif
-diff -urNp linux-3.0.9/grsecurity/grsec_time.c linux-3.0.9/grsecurity/grsec_time.c
---- linux-3.0.9/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_time.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_time.c linux-3.1.1/grsecurity/grsec_time.c
+--- linux-3.1.1/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_time.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,16 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -55865,9 +55721,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_time.c linux-3.0.9/grsecurity/grsec_time
 +}
 +
 +EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-3.0.9/grsecurity/grsec_tpe.c linux-3.0.9/grsecurity/grsec_tpe.c
---- linux-3.0.9/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_tpe.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsec_tpe.c linux-3.1.1/grsecurity/grsec_tpe.c
+--- linux-3.1.1/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_tpe.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,39 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -55908,9 +55764,9 @@ diff -urNp linux-3.0.9/grsecurity/grsec_tpe.c linux-3.0.9/grsecurity/grsec_tpe.c
 +#endif
 +	return 1;
 +}
-diff -urNp linux-3.0.9/grsecurity/grsum.c linux-3.0.9/grsecurity/grsum.c
---- linux-3.0.9/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsum.c	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/grsum.c linux-3.1.1/grsecurity/grsum.c
+--- linux-3.1.1/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsum.c	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
@@ -55973,9 +55829,9 @@ diff -urNp linux-3.0.9/grsecurity/grsum.c linux-3.0.9/grsecurity/grsum.c
 +
 +	return retval;
 +}
-diff -urNp linux-3.0.9/grsecurity/Kconfig linux-3.0.9/grsecurity/Kconfig
---- linux-3.0.9/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/Kconfig	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/Kconfig linux-3.1.1/grsecurity/Kconfig
+--- linux-3.1.1/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/Kconfig	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,1037 @@
 +#
 +# grecurity configuration
@@ -57014,9 +56870,9 @@ diff -urNp linux-3.0.9/grsecurity/Kconfig linux-3.0.9/grsecurity/Kconfig
 +endmenu
 +
 +endmenu
-diff -urNp linux-3.0.9/grsecurity/Makefile linux-3.0.9/grsecurity/Makefile
---- linux-3.0.9/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/Makefile	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/grsecurity/Makefile linux-3.1.1/grsecurity/Makefile
+--- linux-3.1.1/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/Makefile	2011-11-16 18:40:31.000000000 -0500
 @@ -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
@@ -57054,9 +56910,9 @@ diff -urNp linux-3.0.9/grsecurity/Makefile linux-3.0.9/grsecurity/Makefile
 +	@-chmod -f 700 .
 +	@echo '  grsec: protected kernel image paths'
 +endif
-diff -urNp linux-3.0.9/include/acpi/acpi_bus.h linux-3.0.9/include/acpi/acpi_bus.h
---- linux-3.0.9/include/acpi/acpi_bus.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/acpi/acpi_bus.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/acpi/acpi_bus.h linux-3.1.1/include/acpi/acpi_bus.h
+--- linux-3.1.1/include/acpi/acpi_bus.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/acpi/acpi_bus.h	2011-11-16 18:39:08.000000000 -0500
 @@ -107,7 +107,7 @@ struct acpi_device_ops {
  	acpi_op_bind bind;
  	acpi_op_unbind unbind;
@@ -57066,9 +56922,9 @@ diff -urNp linux-3.0.9/include/acpi/acpi_bus.h linux-3.0.9/include/acpi/acpi_bus
  
  #define ACPI_DRIVER_ALL_NOTIFY_EVENTS	0x1	/* system AND device events */
  
-diff -urNp linux-3.0.9/include/asm-generic/atomic-long.h linux-3.0.9/include/asm-generic/atomic-long.h
---- linux-3.0.9/include/asm-generic/atomic-long.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/atomic-long.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/asm-generic/atomic-long.h linux-3.1.1/include/asm-generic/atomic-long.h
+--- linux-3.1.1/include/asm-generic/atomic-long.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/atomic-long.h	2011-11-16 18:39:08.000000000 -0500
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -57369,9 +57225,9 @@ diff -urNp linux-3.0.9/include/asm-generic/atomic-long.h linux-3.0.9/include/asm
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff -urNp linux-3.0.9/include/asm-generic/cache.h linux-3.0.9/include/asm-generic/cache.h
---- linux-3.0.9/include/asm-generic/cache.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/cache.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/asm-generic/cache.h linux-3.1.1/include/asm-generic/cache.h
+--- linux-3.1.1/include/asm-generic/cache.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/cache.h	2011-11-16 18:39:08.000000000 -0500
 @@ -6,7 +6,7 @@
   * cache lines need to provide their own cache.h.
   */
@@ -57382,9 +57238,9 @@ diff -urNp linux-3.0.9/include/asm-generic/cache.h linux-3.0.9/include/asm-gener
 +#define L1_CACHE_BYTES		(1UL << L1_CACHE_SHIFT)
  
  #endif /* __ASM_GENERIC_CACHE_H */
-diff -urNp linux-3.0.9/include/asm-generic/int-l64.h linux-3.0.9/include/asm-generic/int-l64.h
---- linux-3.0.9/include/asm-generic/int-l64.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/int-l64.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/asm-generic/int-l64.h linux-3.1.1/include/asm-generic/int-l64.h
+--- linux-3.1.1/include/asm-generic/int-l64.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/int-l64.h	2011-11-16 18:39:08.000000000 -0500
 @@ -46,6 +46,8 @@ typedef unsigned int u32;
  typedef signed long s64;
  typedef unsigned long u64;
@@ -57394,9 +57250,9 @@ diff -urNp linux-3.0.9/include/asm-generic/int-l64.h linux-3.0.9/include/asm-gen
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-3.0.9/include/asm-generic/int-ll64.h linux-3.0.9/include/asm-generic/int-ll64.h
---- linux-3.0.9/include/asm-generic/int-ll64.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/int-ll64.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/asm-generic/int-ll64.h linux-3.1.1/include/asm-generic/int-ll64.h
+--- linux-3.1.1/include/asm-generic/int-ll64.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/int-ll64.h	2011-11-16 18:39:08.000000000 -0500
 @@ -51,6 +51,8 @@ typedef unsigned int u32;
  typedef signed long long s64;
  typedef unsigned long long u64;
@@ -57406,9 +57262,9 @@ diff -urNp linux-3.0.9/include/asm-generic/int-ll64.h linux-3.0.9/include/asm-ge
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-3.0.9/include/asm-generic/kmap_types.h linux-3.0.9/include/asm-generic/kmap_types.h
---- linux-3.0.9/include/asm-generic/kmap_types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/kmap_types.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/asm-generic/kmap_types.h linux-3.1.1/include/asm-generic/kmap_types.h
+--- linux-3.1.1/include/asm-generic/kmap_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/kmap_types.h	2011-11-16 18:39:08.000000000 -0500
 @@ -29,10 +29,11 @@ KMAP_D(16)	KM_IRQ_PTE,
  KMAP_D(17)	KM_NMI,
  KMAP_D(18)	KM_NMI_PTE,
@@ -57422,9 +57278,9 @@ diff -urNp linux-3.0.9/include/asm-generic/kmap_types.h linux-3.0.9/include/asm-
  };
  
  #undef KMAP_D
-diff -urNp linux-3.0.9/include/asm-generic/pgtable.h linux-3.0.9/include/asm-generic/pgtable.h
---- linux-3.0.9/include/asm-generic/pgtable.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/pgtable.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/asm-generic/pgtable.h linux-3.1.1/include/asm-generic/pgtable.h
+--- linux-3.1.1/include/asm-generic/pgtable.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/pgtable.h	2011-11-16 18:39:08.000000000 -0500
 @@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
  #endif /* __HAVE_ARCH_PMD_WRITE */
  #endif
@@ -57440,9 +57296,9 @@ diff -urNp linux-3.0.9/include/asm-generic/pgtable.h linux-3.0.9/include/asm-gen
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-3.0.9/include/asm-generic/pgtable-nopmd.h linux-3.0.9/include/asm-generic/pgtable-nopmd.h
---- linux-3.0.9/include/asm-generic/pgtable-nopmd.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/pgtable-nopmd.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/asm-generic/pgtable-nopmd.h linux-3.1.1/include/asm-generic/pgtable-nopmd.h
+--- linux-3.1.1/include/asm-generic/pgtable-nopmd.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/pgtable-nopmd.h	2011-11-16 18:39:08.000000000 -0500
 @@ -1,14 +1,19 @@
  #ifndef _PGTABLE_NOPMD_H
  #define _PGTABLE_NOPMD_H
@@ -57479,9 +57335,9 @@ diff -urNp linux-3.0.9/include/asm-generic/pgtable-nopmd.h linux-3.0.9/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.9/include/asm-generic/pgtable-nopud.h linux-3.0.9/include/asm-generic/pgtable-nopud.h
---- linux-3.0.9/include/asm-generic/pgtable-nopud.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/pgtable-nopud.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/asm-generic/pgtable-nopud.h linux-3.1.1/include/asm-generic/pgtable-nopud.h
+--- linux-3.1.1/include/asm-generic/pgtable-nopud.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/pgtable-nopud.h	2011-11-16 18:39:08.000000000 -0500
 @@ -1,10 +1,15 @@
  #ifndef _PGTABLE_NOPUD_H
  #define _PGTABLE_NOPUD_H
@@ -57512,9 +57368,9 @@ diff -urNp linux-3.0.9/include/asm-generic/pgtable-nopud.h linux-3.0.9/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.9/include/asm-generic/vmlinux.lds.h linux-3.0.9/include/asm-generic/vmlinux.lds.h
---- linux-3.0.9/include/asm-generic/vmlinux.lds.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/vmlinux.lds.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/asm-generic/vmlinux.lds.h linux-3.1.1/include/asm-generic/vmlinux.lds.h
+--- linux-3.1.1/include/asm-generic/vmlinux.lds.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/vmlinux.lds.h	2011-11-16 18:39:08.000000000 -0500
 @@ -217,6 +217,7 @@
  	.rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {		\
  		VMLINUX_SYMBOL(__start_rodata) = .;			\
@@ -57546,9 +57402,9 @@ diff -urNp linux-3.0.9/include/asm-generic/vmlinux.lds.h linux-3.0.9/include/asm
  
  /**
   * PERCPU_SECTION - define output section for percpu area, simple version
-diff -urNp linux-3.0.9/include/drm/drm_crtc_helper.h linux-3.0.9/include/drm/drm_crtc_helper.h
---- linux-3.0.9/include/drm/drm_crtc_helper.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/drm/drm_crtc_helper.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/drm/drm_crtc_helper.h linux-3.1.1/include/drm/drm_crtc_helper.h
+--- linux-3.1.1/include/drm/drm_crtc_helper.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/drm/drm_crtc_helper.h	2011-11-16 18:39:08.000000000 -0500
 @@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
  
  	/* disable crtc when not in use - more explicit than dpms off */
@@ -57567,9 +57423,9 @@ diff -urNp linux-3.0.9/include/drm/drm_crtc_helper.h linux-3.0.9/include/drm/drm
  
  struct drm_connector_helper_funcs {
  	int (*get_modes)(struct drm_connector *connector);
-diff -urNp linux-3.0.9/include/drm/drmP.h linux-3.0.9/include/drm/drmP.h
---- linux-3.0.9/include/drm/drmP.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/drm/drmP.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/drm/drmP.h linux-3.1.1/include/drm/drmP.h
+--- linux-3.1.1/include/drm/drmP.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/drm/drmP.h	2011-11-16 18:39:08.000000000 -0500
 @@ -73,6 +73,7 @@
  #include <linux/workqueue.h>
  #include <linux/poll.h>
@@ -57578,7 +57434,7 @@ diff -urNp linux-3.0.9/include/drm/drmP.h linux-3.0.9/include/drm/drmP.h
  #include "drm.h"
  
  #include <linux/idr.h>
-@@ -1033,7 +1034,7 @@ struct drm_device {
+@@ -1035,7 +1036,7 @@ struct drm_device {
  
  	/** \name Usage Counters */
  	/*@{ */
@@ -57587,7 +57443,7 @@ diff -urNp linux-3.0.9/include/drm/drmP.h linux-3.0.9/include/drm/drmP.h
  	atomic_t ioctl_count;		/**< Outstanding IOCTLs pending */
  	atomic_t vma_count;		/**< Outstanding vma areas open */
  	int buf_use;			/**< Buffers in use -- cannot alloc */
-@@ -1044,7 +1045,7 @@ struct drm_device {
+@@ -1046,7 +1047,7 @@ struct drm_device {
  	/*@{ */
  	unsigned long counters;
  	enum drm_stat_type types[15];
@@ -57596,9 +57452,9 @@ diff -urNp linux-3.0.9/include/drm/drmP.h linux-3.0.9/include/drm/drmP.h
  	/*@} */
  
  	struct list_head filelist;
-diff -urNp linux-3.0.9/include/drm/ttm/ttm_memory.h linux-3.0.9/include/drm/ttm/ttm_memory.h
---- linux-3.0.9/include/drm/ttm/ttm_memory.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/drm/ttm/ttm_memory.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/drm/ttm/ttm_memory.h linux-3.1.1/include/drm/ttm/ttm_memory.h
+--- linux-3.1.1/include/drm/ttm/ttm_memory.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/drm/ttm/ttm_memory.h	2011-11-16 18:39:08.000000000 -0500
 @@ -47,7 +47,7 @@
  
  struct ttm_mem_shrink {
@@ -57608,9 +57464,9 @@ diff -urNp linux-3.0.9/include/drm/ttm/ttm_memory.h linux-3.0.9/include/drm/ttm/
  
  /**
   * struct ttm_mem_global - Global memory accounting structure.
-diff -urNp linux-3.0.9/include/linux/a.out.h linux-3.0.9/include/linux/a.out.h
---- linux-3.0.9/include/linux/a.out.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/a.out.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/a.out.h linux-3.1.1/include/linux/a.out.h
+--- linux-3.1.1/include/linux/a.out.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/a.out.h	2011-11-16 18:39:08.000000000 -0500
 @@ -39,6 +39,14 @@ enum machine_type {
    M_MIPS2 = 152		/* MIPS R6000/R4000 binary */
  };
@@ -57626,9 +57482,9 @@ diff -urNp linux-3.0.9/include/linux/a.out.h linux-3.0.9/include/linux/a.out.h
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urNp linux-3.0.9/include/linux/atmdev.h linux-3.0.9/include/linux/atmdev.h
---- linux-3.0.9/include/linux/atmdev.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/atmdev.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/atmdev.h linux-3.1.1/include/linux/atmdev.h
+--- linux-3.1.1/include/linux/atmdev.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/atmdev.h	2011-11-16 18:39:08.000000000 -0500
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -57638,9 +57494,9 @@ diff -urNp linux-3.0.9/include/linux/atmdev.h linux-3.0.9/include/linux/atmdev.h
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-3.0.9/include/linux/binfmts.h linux-3.0.9/include/linux/binfmts.h
---- linux-3.0.9/include/linux/binfmts.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/binfmts.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/binfmts.h linux-3.1.1/include/linux/binfmts.h
+--- linux-3.1.1/include/linux/binfmts.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/binfmts.h	2011-11-16 18:39:08.000000000 -0500
 @@ -88,6 +88,7 @@ struct linux_binfmt {
  	int (*load_binary)(struct linux_binprm *, struct  pt_regs * regs);
  	int (*load_shlib)(struct file *);
@@ -57649,10 +57505,10 @@ diff -urNp linux-3.0.9/include/linux/binfmts.h linux-3.0.9/include/linux/binfmts
  	unsigned long min_coredump;	/* minimal dump size */
  };
  
-diff -urNp linux-3.0.9/include/linux/blkdev.h linux-3.0.9/include/linux/blkdev.h
---- linux-3.0.9/include/linux/blkdev.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/blkdev.h	2011-11-15 20:02:59.000000000 -0500
-@@ -1308,7 +1308,7 @@ struct block_device_operations {
+diff -urNp linux-3.1.1/include/linux/blkdev.h linux-3.1.1/include/linux/blkdev.h
+--- linux-3.1.1/include/linux/blkdev.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/blkdev.h	2011-11-16 18:39:08.000000000 -0500
+@@ -1321,7 +1321,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);
  	struct module *owner;
@@ -57661,10 +57517,10 @@ diff -urNp linux-3.0.9/include/linux/blkdev.h linux-3.0.9/include/linux/blkdev.h
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
  				 unsigned long);
-diff -urNp linux-3.0.9/include/linux/blktrace_api.h linux-3.0.9/include/linux/blktrace_api.h
---- linux-3.0.9/include/linux/blktrace_api.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/blktrace_api.h	2011-11-15 20:02:59.000000000 -0500
-@@ -161,7 +161,7 @@ struct blk_trace {
+diff -urNp linux-3.1.1/include/linux/blktrace_api.h linux-3.1.1/include/linux/blktrace_api.h
+--- linux-3.1.1/include/linux/blktrace_api.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/blktrace_api.h	2011-11-16 18:39:08.000000000 -0500
+@@ -162,7 +162,7 @@ struct blk_trace {
  	struct dentry *dir;
  	struct dentry *dropped_file;
  	struct dentry *msg_file;
@@ -57673,9 +57529,9 @@ diff -urNp linux-3.0.9/include/linux/blktrace_api.h linux-3.0.9/include/linux/bl
  };
  
  extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-diff -urNp linux-3.0.9/include/linux/byteorder/little_endian.h linux-3.0.9/include/linux/byteorder/little_endian.h
---- linux-3.0.9/include/linux/byteorder/little_endian.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/byteorder/little_endian.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/byteorder/little_endian.h linux-3.1.1/include/linux/byteorder/little_endian.h
+--- linux-3.1.1/include/linux/byteorder/little_endian.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/byteorder/little_endian.h	2011-11-16 18:39:08.000000000 -0500
 @@ -42,51 +42,51 @@
  
  static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -57740,9 +57596,9 @@ diff -urNp linux-3.0.9/include/linux/byteorder/little_endian.h linux-3.0.9/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.9/include/linux/cache.h linux-3.0.9/include/linux/cache.h
---- linux-3.0.9/include/linux/cache.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/cache.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/cache.h linux-3.1.1/include/linux/cache.h
+--- linux-3.1.1/include/linux/cache.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/cache.h	2011-11-16 18:39:08.000000000 -0500
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -57754,9 +57610,9 @@ diff -urNp linux-3.0.9/include/linux/cache.h linux-3.0.9/include/linux/cache.h
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff -urNp linux-3.0.9/include/linux/capability.h linux-3.0.9/include/linux/capability.h
---- linux-3.0.9/include/linux/capability.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/capability.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/capability.h linux-3.1.1/include/linux/capability.h
+--- linux-3.1.1/include/linux/capability.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/capability.h	2011-11-16 18:40:31.000000000 -0500
 @@ -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);
@@ -57767,9 +57623,9 @@ diff -urNp linux-3.0.9/include/linux/capability.h linux-3.0.9/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.9/include/linux/cleancache.h linux-3.0.9/include/linux/cleancache.h
---- linux-3.0.9/include/linux/cleancache.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/cleancache.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/cleancache.h linux-3.1.1/include/linux/cleancache.h
+--- linux-3.1.1/include/linux/cleancache.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/cleancache.h	2011-11-16 18:39:08.000000000 -0500
 @@ -31,7 +31,7 @@ struct cleancache_ops {
  	void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
  	void (*flush_inode)(int, struct cleancache_filekey);
@@ -57779,9 +57635,9 @@ diff -urNp linux-3.0.9/include/linux/cleancache.h linux-3.0.9/include/linux/clea
  
  extern struct cleancache_ops
  	cleancache_register_ops(struct cleancache_ops *ops);
-diff -urNp linux-3.0.9/include/linux/compiler-gcc4.h linux-3.0.9/include/linux/compiler-gcc4.h
---- linux-3.0.9/include/linux/compiler-gcc4.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/compiler-gcc4.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/compiler-gcc4.h linux-3.1.1/include/linux/compiler-gcc4.h
+--- linux-3.1.1/include/linux/compiler-gcc4.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/compiler-gcc4.h	2011-11-16 18:39:08.000000000 -0500
 @@ -31,6 +31,12 @@
  
  
@@ -57807,9 +57663,9 @@ diff -urNp linux-3.0.9/include/linux/compiler-gcc4.h linux-3.0.9/include/linux/c
  #endif
  
  #if __GNUC_MINOR__ > 0
-diff -urNp linux-3.0.9/include/linux/compiler.h linux-3.0.9/include/linux/compiler.h
---- linux-3.0.9/include/linux/compiler.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/compiler.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/compiler.h linux-3.1.1/include/linux/compiler.h
+--- linux-3.1.1/include/linux/compiler.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/compiler.h	2011-11-16 18:39:08.000000000 -0500
 @@ -5,31 +5,62 @@
  
  #ifdef __CHECKER__
@@ -57930,9 +57786,9 @@ diff -urNp linux-3.0.9/include/linux/compiler.h linux-3.0.9/include/linux/compil
 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
  
  #endif /* __LINUX_COMPILER_H */
-diff -urNp linux-3.0.9/include/linux/cpuset.h linux-3.0.9/include/linux/cpuset.h
---- linux-3.0.9/include/linux/cpuset.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/cpuset.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/cpuset.h linux-3.1.1/include/linux/cpuset.h
+--- linux-3.1.1/include/linux/cpuset.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/cpuset.h	2011-11-16 18:39:08.000000000 -0500
 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
  	 * nodemask.
  	 */
@@ -57942,9 +57798,9 @@ diff -urNp linux-3.0.9/include/linux/cpuset.h linux-3.0.9/include/linux/cpuset.h
  }
  
  static inline void set_mems_allowed(nodemask_t nodemask)
-diff -urNp linux-3.0.9/include/linux/crypto.h linux-3.0.9/include/linux/crypto.h
---- linux-3.0.9/include/linux/crypto.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/crypto.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/crypto.h linux-3.1.1/include/linux/crypto.h
+--- linux-3.1.1/include/linux/crypto.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/crypto.h	2011-11-16 18:39:08.000000000 -0500
 @@ -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);
@@ -57970,9 +57826,9 @@ diff -urNp linux-3.0.9/include/linux/crypto.h linux-3.0.9/include/linux/crypto.h
  
  #define crt_ablkcipher	crt_u.ablkcipher
  #define crt_aead	crt_u.aead
-diff -urNp linux-3.0.9/include/linux/decompress/mm.h linux-3.0.9/include/linux/decompress/mm.h
---- linux-3.0.9/include/linux/decompress/mm.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/decompress/mm.h	2011-11-15 20:02:59.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/decompress/mm.h linux-3.1.1/include/linux/decompress/mm.h
+--- linux-3.1.1/include/linux/decompress/mm.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/decompress/mm.h	2011-11-16 18:39:08.000000000 -0500
 @@ -77,7 +77,7 @@ static void free(void *where)
   * warnings when not needed (indeed large_malloc / large_free are not
   * needed by inflate */
@@ -57982,10 +57838,10 @@ diff -urNp linux-3.0.9/include/linux/decompress/mm.h linux-3.0.9/include/linux/d
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff -urNp linux-3.0.9/include/linux/dma-mapping.h linux-3.0.9/include/linux/dma-mapping.h
---- linux-3.0.9/include/linux/dma-mapping.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/dma-mapping.h	2011-11-15 20:02:59.000000000 -0500
-@@ -50,7 +50,7 @@ struct dma_map_ops {
+diff -urNp linux-3.1.1/include/linux/dma-mapping.h linux-3.1.1/include/linux/dma-mapping.h
+--- linux-3.1.1/include/linux/dma-mapping.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/dma-mapping.h	2011-11-16 18:39:08.000000000 -0500
+@@ -42,7 +42,7 @@ struct dma_map_ops {
  	int (*dma_supported)(struct device *dev, u64 mask);
  	int (*set_dma_mask)(struct device *dev, u64 mask);
  	int is_phys;
@@ -57994,10 +57850,10 @@ diff -urNp linux-3.0.9/include/linux/dma-mapping.h linux-3.0.9/include/linux/dma
  
  #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
  
-diff -urNp linux-3.0.9/include/linux/efi.h linux-3.0.9/include/linux/efi.h
---- linux-3.0.9/include/linux/efi.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/efi.h	2011-11-15 20:02:59.000000000 -0500
-@@ -410,7 +410,7 @@ struct efivar_operations {
+diff -urNp linux-3.1.1/include/linux/efi.h linux-3.1.1/include/linux/efi.h
+--- linux-3.1.1/include/linux/efi.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/efi.h	2011-11-16 18:39:08.000000000 -0500
+@@ -446,7 +446,7 @@ struct efivar_operations {
  	efi_get_variable_t *get_variable;
  	efi_get_next_variable_t *get_next_variable;
  	efi_set_variable_t *set_variable;
@@ -58006,9 +57862,9 @@ diff -urNp linux-3.0.9/include/linux/efi.h linux-3.0.9/include/linux/efi.h
  
  struct efivars {
  	/*
-diff -urNp linux-3.0.9/include/linux/elf.h linux-3.0.9/include/linux/elf.h
---- linux-3.0.9/include/linux/elf.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/elf.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/elf.h linux-3.1.1/include/linux/elf.h
+--- linux-3.1.1/include/linux/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/elf.h	2011-11-16 18:39:08.000000000 -0500
 @@ -49,6 +49,17 @@ typedef __s64	Elf64_Sxword;
  #define PT_GNU_EH_FRAME		0x6474e550
  
@@ -58081,9 +57937,9 @@ diff -urNp linux-3.0.9/include/linux/elf.h linux-3.0.9/include/linux/elf.h
  
  #endif
  
-diff -urNp linux-3.0.9/include/linux/firewire.h linux-3.0.9/include/linux/firewire.h
---- linux-3.0.9/include/linux/firewire.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/firewire.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/firewire.h linux-3.1.1/include/linux/firewire.h
+--- linux-3.1.1/include/linux/firewire.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/firewire.h	2011-11-16 18:39:08.000000000 -0500
 @@ -428,7 +428,7 @@ struct fw_iso_context {
  	union {
  		fw_iso_callback_t sc;
@@ -58093,9 +57949,9 @@ diff -urNp linux-3.0.9/include/linux/firewire.h linux-3.0.9/include/linux/firewi
  	void *callback_data;
  };
  
-diff -urNp linux-3.0.9/include/linux/fscache-cache.h linux-3.0.9/include/linux/fscache-cache.h
---- linux-3.0.9/include/linux/fscache-cache.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/fscache-cache.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/fscache-cache.h linux-3.1.1/include/linux/fscache-cache.h
+--- linux-3.1.1/include/linux/fscache-cache.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/fscache-cache.h	2011-11-16 18:39:08.000000000 -0500
 @@ -102,7 +102,7 @@ struct fscache_operation {
  	fscache_operation_release_t release;
  };
@@ -58114,22 +57970,10 @@ diff -urNp linux-3.0.9/include/linux/fscache-cache.h linux-3.0.9/include/linux/f
  	op->processor = processor;
  	op->release = release;
  	INIT_LIST_HEAD(&op->pend_link);
-diff -urNp linux-3.0.9/include/linux/fs.h linux-3.0.9/include/linux/fs.h
---- linux-3.0.9/include/linux/fs.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/fs.h	2011-11-15 20:03:00.000000000 -0500
-@@ -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)
- 
-+/* Hack for grsec so as not to require read permission simply to execute
-+ * a binary
-+ */
-+#define FMODE_GREXEC		((__force fmode_t)0x2000000)
-+
- /*
-  * The below are the various read and write types that we support. Some of
-  * them include behavioral modifiers that send information down to the
-@@ -1571,7 +1576,8 @@ struct file_operations {
+diff -urNp linux-3.1.1/include/linux/fs.h linux-3.1.1/include/linux/fs.h
+--- linux-3.1.1/include/linux/fs.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/fs.h	2011-11-16 23:39:39.000000000 -0500
+@@ -1588,7 +1588,8 @@ struct file_operations {
  	int (*setlease)(struct file *, long, struct file_lock **);
  	long (*fallocate)(struct file *file, int mode, loff_t offset,
  			  loff_t len);
@@ -58137,11 +57981,11 @@ diff -urNp linux-3.0.9/include/linux/fs.h linux-3.0.9/include/linux/fs.h
 +} __do_const;
 +typedef struct file_operations __no_const file_operations_no_const;
  
- #define IPERM_FLAG_RCU	0x0001
- 
-diff -urNp linux-3.0.9/include/linux/fsnotify.h linux-3.0.9/include/linux/fsnotify.h
---- linux-3.0.9/include/linux/fsnotify.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/fsnotify.h	2011-11-15 20:03:00.000000000 -0500
+ struct inode_operations {
+ 	struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
+diff -urNp linux-3.1.1/include/linux/fsnotify.h linux-3.1.1/include/linux/fsnotify.h
+--- linux-3.1.1/include/linux/fsnotify.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/fsnotify.h	2011-11-16 18:39:08.000000000 -0500
 @@ -314,7 +314,7 @@ static inline void fsnotify_change(struc
   */
  static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
@@ -58151,9 +57995,9 @@ diff -urNp linux-3.0.9/include/linux/fsnotify.h linux-3.0.9/include/linux/fsnoti
  }
  
  /*
-diff -urNp linux-3.0.9/include/linux/fs_struct.h linux-3.0.9/include/linux/fs_struct.h
---- linux-3.0.9/include/linux/fs_struct.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/fs_struct.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/fs_struct.h linux-3.1.1/include/linux/fs_struct.h
+--- linux-3.1.1/include/linux/fs_struct.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/fs_struct.h	2011-11-16 18:39:08.000000000 -0500
 @@ -6,7 +6,7 @@
  #include <linux/seqlock.h>
  
@@ -58163,10 +58007,10 @@ diff -urNp linux-3.0.9/include/linux/fs_struct.h linux-3.0.9/include/linux/fs_st
  	spinlock_t lock;
  	seqcount_t seq;
  	int umask;
-diff -urNp linux-3.0.9/include/linux/ftrace_event.h linux-3.0.9/include/linux/ftrace_event.h
---- linux-3.0.9/include/linux/ftrace_event.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/ftrace_event.h	2011-11-15 20:03:00.000000000 -0500
-@@ -96,7 +96,7 @@ struct trace_event_functions {
+diff -urNp linux-3.1.1/include/linux/ftrace_event.h linux-3.1.1/include/linux/ftrace_event.h
+--- linux-3.1.1/include/linux/ftrace_event.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/ftrace_event.h	2011-11-16 18:39:08.000000000 -0500
+@@ -97,7 +97,7 @@ struct trace_event_functions {
  	trace_print_func	raw;
  	trace_print_func	hex;
  	trace_print_func	binary;
@@ -58175,7 +58019,7 @@ diff -urNp linux-3.0.9/include/linux/ftrace_event.h linux-3.0.9/include/linux/ft
  
  struct trace_event {
  	struct hlist_node		node;
-@@ -247,7 +247,7 @@ extern int trace_define_field(struct ftr
+@@ -252,7 +252,7 @@ extern int trace_define_field(struct ftr
  extern int trace_add_event_call(struct ftrace_event_call *call);
  extern void trace_remove_event_call(struct ftrace_event_call *call);
  
@@ -58184,9 +58028,9 @@ diff -urNp linux-3.0.9/include/linux/ftrace_event.h linux-3.0.9/include/linux/ft
  
  int trace_set_clr_event(const char *system, const char *event, int set);
  
-diff -urNp linux-3.0.9/include/linux/genhd.h linux-3.0.9/include/linux/genhd.h
---- linux-3.0.9/include/linux/genhd.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/genhd.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/genhd.h linux-3.1.1/include/linux/genhd.h
+--- linux-3.1.1/include/linux/genhd.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/genhd.h	2011-11-16 18:39:08.000000000 -0500
 @@ -184,7 +184,7 @@ struct gendisk {
  	struct kobject *slave_dir;
  
@@ -58196,9 +58040,9 @@ diff -urNp linux-3.0.9/include/linux/genhd.h linux-3.0.9/include/linux/genhd.h
  	struct disk_events *ev;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
  	struct blk_integrity *integrity;
-diff -urNp linux-3.0.9/include/linux/gracl.h linux-3.0.9/include/linux/gracl.h
---- linux-3.0.9/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/gracl.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/gracl.h linux-3.1.1/include/linux/gracl.h
+--- linux-3.1.1/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/gracl.h	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,317 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
@@ -58517,9 +58361,9 @@ diff -urNp linux-3.0.9/include/linux/gracl.h linux-3.0.9/include/linux/gracl.h
 +
 +#endif
 +
-diff -urNp linux-3.0.9/include/linux/gralloc.h linux-3.0.9/include/linux/gralloc.h
---- linux-3.0.9/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/gralloc.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/gralloc.h linux-3.1.1/include/linux/gralloc.h
+--- linux-3.1.1/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/gralloc.h	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -58530,9 +58374,9 @@ diff -urNp linux-3.0.9/include/linux/gralloc.h linux-3.0.9/include/linux/gralloc
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff -urNp linux-3.0.9/include/linux/grdefs.h linux-3.0.9/include/linux/grdefs.h
---- linux-3.0.9/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/grdefs.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/grdefs.h linux-3.1.1/include/linux/grdefs.h
+--- linux-3.1.1/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/grdefs.h	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,140 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
@@ -58674,9 +58518,9 @@ diff -urNp linux-3.0.9/include/linux/grdefs.h linux-3.0.9/include/linux/grdefs.h
 +};
 +
 +#endif
-diff -urNp linux-3.0.9/include/linux/grinternal.h linux-3.0.9/include/linux/grinternal.h
---- linux-3.0.9/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/grinternal.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/grinternal.h linux-3.1.1/include/linux/grinternal.h
+--- linux-3.1.1/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/grinternal.h	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,220 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
@@ -58898,9 +58742,9 @@ diff -urNp linux-3.0.9/include/linux/grinternal.h linux-3.0.9/include/linux/grin
 +#endif
 +
 +#endif
-diff -urNp linux-3.0.9/include/linux/grmsg.h linux-3.0.9/include/linux/grmsg.h
---- linux-3.0.9/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/grmsg.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/grmsg.h linux-3.1.1/include/linux/grmsg.h
+--- linux-3.1.1/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/grmsg.h	2011-11-16 18:40:31.000000000 -0500
 @@ -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"
@@ -59010,9 +58854,9 @@ diff -urNp linux-3.0.9/include/linux/grmsg.h linux-3.0.9/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.9/include/linux/grsecurity.h linux-3.0.9/include/linux/grsecurity.h
---- linux-3.0.9/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/grsecurity.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/grsecurity.h linux-3.1.1/include/linux/grsecurity.h
+--- linux-3.1.1/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/grsecurity.h	2011-11-17 00:16:10.000000000 -0500
 @@ -0,0 +1,228 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
@@ -59171,11 +59015,11 @@ diff -urNp linux-3.0.9/include/linux/grsecurity.h linux-3.0.9/include/linux/grse
 +__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
 +				const struct vfsmount *mnt);
 +__u32 gr_acl_handle_open(const struct dentry *dentry,
-+				const struct vfsmount *mnt, const int fmode);
++				const struct vfsmount *mnt, int acc_mode);
 +__u32 gr_acl_handle_creat(const struct dentry *dentry,
 +				 const struct dentry *p_dentry,
-+				 const struct vfsmount *p_mnt, const int fmode,
-+				 const int imode);
++				 const struct vfsmount *p_mnt,
++				 int open_flags, int acc_mode, const int imode);
 +void gr_handle_create(const struct dentry *dentry,
 +			     const struct vfsmount *mnt);
 +void gr_handle_proc_create(const struct dentry *dentry,
@@ -59242,9 +59086,9 @@ diff -urNp linux-3.0.9/include/linux/grsecurity.h linux-3.0.9/include/linux/grse
 +#endif
 +
 +#endif
-diff -urNp linux-3.0.9/include/linux/grsock.h linux-3.0.9/include/linux/grsock.h
---- linux-3.0.9/include/linux/grsock.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/grsock.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/grsock.h linux-3.1.1/include/linux/grsock.h
+--- linux-3.1.1/include/linux/grsock.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/grsock.h	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,19 @@
 +#ifndef __GRSOCK_H
 +#define __GRSOCK_H
@@ -59265,10 +59109,10 @@ diff -urNp linux-3.0.9/include/linux/grsock.h linux-3.0.9/include/linux/grsock.h
 +			    const int protocol);
 +
 +#endif
-diff -urNp linux-3.0.9/include/linux/hid.h linux-3.0.9/include/linux/hid.h
---- linux-3.0.9/include/linux/hid.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/hid.h	2011-11-15 20:03:00.000000000 -0500
-@@ -675,7 +675,7 @@ struct hid_ll_driver {
+diff -urNp linux-3.1.1/include/linux/hid.h linux-3.1.1/include/linux/hid.h
+--- linux-3.1.1/include/linux/hid.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/hid.h	2011-11-16 18:39:08.000000000 -0500
+@@ -676,7 +676,7 @@ struct hid_ll_driver {
  			unsigned int code, int value);
  
  	int (*parse)(struct hid_device *hdev);
@@ -59277,9 +59121,9 @@ diff -urNp linux-3.0.9/include/linux/hid.h linux-3.0.9/include/linux/hid.h
  
  #define	PM_HINT_FULLON	1<<5
  #define PM_HINT_NORMAL	1<<1
-diff -urNp linux-3.0.9/include/linux/highmem.h linux-3.0.9/include/linux/highmem.h
---- linux-3.0.9/include/linux/highmem.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/highmem.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/highmem.h linux-3.1.1/include/linux/highmem.h
+--- linux-3.1.1/include/linux/highmem.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/highmem.h	2011-11-16 18:39:08.000000000 -0500
 @@ -185,6 +185,18 @@ static inline void clear_highpage(struct
  	kunmap_atomic(kaddr, KM_USER0);
  }
@@ -59299,9 +59143,9 @@ diff -urNp linux-3.0.9/include/linux/highmem.h linux-3.0.9/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.9/include/linux/i2c.h linux-3.0.9/include/linux/i2c.h
---- linux-3.0.9/include/linux/i2c.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/i2c.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/i2c.h linux-3.1.1/include/linux/i2c.h
+--- linux-3.1.1/include/linux/i2c.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/i2c.h	2011-11-16 18:39:08.000000000 -0500
 @@ -346,6 +346,7 @@ struct i2c_algorithm {
  	/* To determine what the adapter supports */
  	u32 (*functionality) (struct i2c_adapter *);
@@ -59310,9 +59154,9 @@ diff -urNp linux-3.0.9/include/linux/i2c.h linux-3.0.9/include/linux/i2c.h
  
  /*
   * i2c_adapter is the structure used to identify a physical i2c bus along
-diff -urNp linux-3.0.9/include/linux/i2o.h linux-3.0.9/include/linux/i2o.h
---- linux-3.0.9/include/linux/i2o.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/i2o.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/i2o.h linux-3.1.1/include/linux/i2o.h
+--- linux-3.1.1/include/linux/i2o.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/i2o.h	2011-11-16 18:39:08.000000000 -0500
 @@ -564,7 +564,7 @@ struct i2o_controller {
  	struct i2o_device *exec;	/* Executive */
  #if BITS_PER_LONG == 64
@@ -59322,9 +59166,9 @@ diff -urNp linux-3.0.9/include/linux/i2o.h linux-3.0.9/include/linux/i2o.h
  	struct list_head context_list;	/* list of context id's
  					   and pointers */
  #endif
-diff -urNp linux-3.0.9/include/linux/init.h linux-3.0.9/include/linux/init.h
---- linux-3.0.9/include/linux/init.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/init.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/init.h linux-3.1.1/include/linux/init.h
+--- linux-3.1.1/include/linux/init.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/init.h	2011-11-16 18:39:08.000000000 -0500
 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
  
  /* Each module must use one module_init(). */
@@ -59341,9 +59185,9 @@ diff -urNp linux-3.0.9/include/linux/init.h linux-3.0.9/include/linux/init.h
  	{ return exitfn; }					\
  	void cleanup_module(void) __attribute__((alias(#exitfn)));
  
-diff -urNp linux-3.0.9/include/linux/init_task.h linux-3.0.9/include/linux/init_task.h
---- linux-3.0.9/include/linux/init_task.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/init_task.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/init_task.h linux-3.1.1/include/linux/init_task.h
+--- linux-3.1.1/include/linux/init_task.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/init_task.h	2011-11-16 18:39:08.000000000 -0500
 @@ -126,6 +126,12 @@ extern struct cred init_cred;
  # define INIT_PERF_EVENTS(tsk)
  #endif
@@ -59365,9 +59209,9 @@ diff -urNp linux-3.0.9/include/linux/init_task.h linux-3.0.9/include/linux/init_
  	.fs		= &init_fs,					\
  	.files		= &init_files,					\
  	.signal		= &init_signals,				\
-diff -urNp linux-3.0.9/include/linux/intel-iommu.h linux-3.0.9/include/linux/intel-iommu.h
---- linux-3.0.9/include/linux/intel-iommu.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/intel-iommu.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/intel-iommu.h linux-3.1.1/include/linux/intel-iommu.h
+--- linux-3.1.1/include/linux/intel-iommu.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/intel-iommu.h	2011-11-16 18:39:08.000000000 -0500
 @@ -296,7 +296,7 @@ struct iommu_flush {
  			      u8 fm, u64 type);
  	void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
@@ -59377,9 +59221,9 @@ diff -urNp linux-3.0.9/include/linux/intel-iommu.h linux-3.0.9/include/linux/int
  
  enum {
  	SR_DMAR_FECTL_REG,
-diff -urNp linux-3.0.9/include/linux/interrupt.h linux-3.0.9/include/linux/interrupt.h
---- linux-3.0.9/include/linux/interrupt.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/interrupt.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/interrupt.h linux-3.1.1/include/linux/interrupt.h
+--- linux-3.1.1/include/linux/interrupt.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/interrupt.h	2011-11-16 18:39:08.000000000 -0500
 @@ -425,7 +425,7 @@ enum
  /* map softirq index to softirq name. update 'softirq_to_name' in
   * kernel/softirq.c when adding a new softirq.
@@ -59404,9 +59248,9 @@ diff -urNp linux-3.0.9/include/linux/interrupt.h linux-3.0.9/include/linux/inter
  extern void softirq_init(void);
  static inline void __raise_softirq_irqoff(unsigned int nr)
  {
-diff -urNp linux-3.0.9/include/linux/kallsyms.h linux-3.0.9/include/linux/kallsyms.h
---- linux-3.0.9/include/linux/kallsyms.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/kallsyms.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/kallsyms.h linux-3.1.1/include/linux/kallsyms.h
+--- linux-3.1.1/include/linux/kallsyms.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/kallsyms.h	2011-11-16 18:40:31.000000000 -0500
 @@ -15,7 +15,8 @@
  
  struct module;
@@ -59434,9 +59278,9 @@ diff -urNp linux-3.0.9/include/linux/kallsyms.h linux-3.0.9/include/linux/kallsy
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-3.0.9/include/linux/kgdb.h linux-3.0.9/include/linux/kgdb.h
---- linux-3.0.9/include/linux/kgdb.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/kgdb.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/kgdb.h linux-3.1.1/include/linux/kgdb.h
+--- linux-3.1.1/include/linux/kgdb.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/kgdb.h	2011-11-16 18:39:08.000000000 -0500
 @@ -53,7 +53,7 @@ extern int kgdb_connected;
  extern int kgdb_io_module_registered;
  
@@ -59464,9 +59308,9 @@ diff -urNp linux-3.0.9/include/linux/kgdb.h linux-3.0.9/include/linux/kgdb.h
  
  extern struct kgdb_arch		arch_kgdb_ops;
  
-diff -urNp linux-3.0.9/include/linux/kmod.h linux-3.0.9/include/linux/kmod.h
---- linux-3.0.9/include/linux/kmod.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/kmod.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/kmod.h linux-3.1.1/include/linux/kmod.h
+--- linux-3.1.1/include/linux/kmod.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/kmod.h	2011-11-16 18:40:31.000000000 -0500
 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysc
   * usually useless though. */
  extern int __request_module(bool wait, const char *name, ...) \
@@ -59476,10 +59320,10 @@ diff -urNp linux-3.0.9/include/linux/kmod.h linux-3.0.9/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.9/include/linux/kvm_host.h linux-3.0.9/include/linux/kvm_host.h
---- linux-3.0.9/include/linux/kvm_host.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/kvm_host.h	2011-11-15 20:03:00.000000000 -0500
-@@ -307,7 +307,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
+diff -urNp linux-3.1.1/include/linux/kvm_host.h linux-3.1.1/include/linux/kvm_host.h
+--- linux-3.1.1/include/linux/kvm_host.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/kvm_host.h	2011-11-16 18:39:08.000000000 -0500
+@@ -308,7 +308,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
  void vcpu_load(struct kvm_vcpu *vcpu);
  void vcpu_put(struct kvm_vcpu *vcpu);
  
@@ -59488,7 +59332,7 @@ diff -urNp linux-3.0.9/include/linux/kvm_host.h linux-3.0.9/include/linux/kvm_ho
  		  struct module *module);
  void kvm_exit(void);
  
-@@ -446,7 +446,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
+@@ -454,7 +454,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
  					struct kvm_guest_debug *dbg);
  int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
  
@@ -59497,10 +59341,10 @@ diff -urNp linux-3.0.9/include/linux/kvm_host.h linux-3.0.9/include/linux/kvm_ho
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-3.0.9/include/linux/libata.h linux-3.0.9/include/linux/libata.h
---- linux-3.0.9/include/linux/libata.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/libata.h	2011-11-15 20:03:00.000000000 -0500
-@@ -899,7 +899,7 @@ struct ata_port_operations {
+diff -urNp linux-3.1.1/include/linux/libata.h linux-3.1.1/include/linux/libata.h
+--- linux-3.1.1/include/linux/libata.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/libata.h	2011-11-16 18:39:08.000000000 -0500
+@@ -909,7 +909,7 @@ struct ata_port_operations {
  	 * fields must be pointers.
  	 */
  	const struct ata_port_operations	*inherits;
@@ -59509,9 +59353,9 @@ diff -urNp linux-3.0.9/include/linux/libata.h linux-3.0.9/include/linux/libata.h
  
  struct ata_port_info {
  	unsigned long		flags;
-diff -urNp linux-3.0.9/include/linux/mca.h linux-3.0.9/include/linux/mca.h
---- linux-3.0.9/include/linux/mca.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mca.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/mca.h linux-3.1.1/include/linux/mca.h
+--- linux-3.1.1/include/linux/mca.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mca.h	2011-11-16 18:39:08.000000000 -0500
 @@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
  						  int region);
  	void *		(*mca_transform_memory)(struct mca_device *,
@@ -59521,9 +59365,9 @@ diff -urNp linux-3.0.9/include/linux/mca.h linux-3.0.9/include/linux/mca.h
  
  struct mca_bus {
  	u64			default_dma_mask;
-diff -urNp linux-3.0.9/include/linux/memory.h linux-3.0.9/include/linux/memory.h
---- linux-3.0.9/include/linux/memory.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/memory.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/memory.h linux-3.1.1/include/linux/memory.h
+--- linux-3.1.1/include/linux/memory.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/memory.h	2011-11-16 18:39:08.000000000 -0500
 @@ -144,7 +144,7 @@ struct memory_accessor {
  			size_t count);
  	ssize_t (*write)(struct memory_accessor *, const char *buf,
@@ -59533,9 +59377,9 @@ diff -urNp linux-3.0.9/include/linux/memory.h linux-3.0.9/include/linux/memory.h
  
  /*
   * Kernel text modification mutex, used for code patching. Users of this lock
-diff -urNp linux-3.0.9/include/linux/mfd/abx500.h linux-3.0.9/include/linux/mfd/abx500.h
---- linux-3.0.9/include/linux/mfd/abx500.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mfd/abx500.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/mfd/abx500.h linux-3.1.1/include/linux/mfd/abx500.h
+--- linux-3.1.1/include/linux/mfd/abx500.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mfd/abx500.h	2011-11-16 18:39:08.000000000 -0500
 @@ -234,6 +234,7 @@ struct abx500_ops {
  	int (*event_registers_startup_state_get) (struct device *, u8 *);
  	int (*startup_irq_enabled) (struct device *, unsigned int);
@@ -59544,10 +59388,10 @@ diff -urNp linux-3.0.9/include/linux/mfd/abx500.h linux-3.0.9/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.9/include/linux/mm.h linux-3.0.9/include/linux/mm.h
---- linux-3.0.9/include/linux/mm.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mm.h	2011-11-15 20:03:00.000000000 -0500
-@@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void 
+diff -urNp linux-3.1.1/include/linux/mm.h linux-3.1.1/include/linux/mm.h
+--- linux-3.1.1/include/linux/mm.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mm.h	2011-11-16 18:39:08.000000000 -0500
+@@ -114,7 +114,14 @@ extern unsigned int kobjsize(const void 
  
  #define VM_CAN_NONLINEAR 0x08000000	/* Has ->fault & does nonlinear pages */
  #define VM_MIXEDMAP	0x10000000	/* Can contain "struct page" and pure PFN pages */
@@ -59562,7 +59406,7 @@ diff -urNp linux-3.0.9/include/linux/mm.h linux-3.0.9/include/linux/mm.h
  #define VM_PFN_AT_MMAP	0x40000000	/* PFNMAP vma that is fully mapped at mmap time */
  #define VM_MERGEABLE	0x80000000	/* KSM may merge identical pages */
  
-@@ -1008,34 +1015,6 @@ int set_page_dirty(struct page *page);
+@@ -1011,34 +1018,6 @@ int set_page_dirty(struct page *page);
  int set_page_dirty_lock(struct page *page);
  int clear_page_dirty_for_io(struct page *page);
  
@@ -59597,9 +59441,9 @@ diff -urNp linux-3.0.9/include/linux/mm.h linux-3.0.9/include/linux/mm.h
  extern unsigned long move_page_tables(struct vm_area_struct *vma,
  		unsigned long old_addr, struct vm_area_struct *new_vma,
  		unsigned long new_addr, unsigned long len);
-@@ -1168,6 +1147,15 @@ struct shrinker {
- extern void register_shrinker(struct shrinker *);
- extern void unregister_shrinker(struct shrinker *);
+@@ -1133,6 +1112,15 @@ static inline void sync_mm_rss(struct ta
+ }
+ #endif
  
 +#ifdef CONFIG_MMU
 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
@@ -59613,7 +59457,7 @@ diff -urNp linux-3.0.9/include/linux/mm.h linux-3.0.9/include/linux/mm.h
  int vma_wants_writenotify(struct vm_area_struct *vma);
  
  extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
-@@ -1451,6 +1439,7 @@ out:
+@@ -1417,6 +1405,7 @@ out:
  }
  
  extern int do_munmap(struct mm_struct *, unsigned long, size_t);
@@ -59621,7 +59465,7 @@ diff -urNp linux-3.0.9/include/linux/mm.h linux-3.0.9/include/linux/mm.h
  
  extern unsigned long do_brk(unsigned long, unsigned long);
  
-@@ -1509,6 +1498,10 @@ extern struct vm_area_struct * find_vma(
+@@ -1474,6 +1463,10 @@ extern struct vm_area_struct * find_vma(
  extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
  					     struct vm_area_struct **pprev);
  
@@ -59632,7 +59476,7 @@ diff -urNp linux-3.0.9/include/linux/mm.h linux-3.0.9/include/linux/mm.h
  /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
     NULL if none.  Assume start_addr < end_addr. */
  static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
-@@ -1525,15 +1518,6 @@ static inline unsigned long vma_pages(st
+@@ -1490,15 +1483,6 @@ static inline unsigned long vma_pages(st
  	return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
  }
  
@@ -59648,7 +59492,7 @@ diff -urNp linux-3.0.9/include/linux/mm.h linux-3.0.9/include/linux/mm.h
  struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
  int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
  			unsigned long pfn, unsigned long size, pgprot_t);
-@@ -1646,7 +1630,7 @@ extern int unpoison_memory(unsigned long
+@@ -1612,7 +1596,7 @@ extern int unpoison_memory(unsigned long
  extern int sysctl_memory_failure_early_kill;
  extern int sysctl_memory_failure_recovery;
  extern void shake_page(struct page *p, int access);
@@ -59657,7 +59501,7 @@ diff -urNp linux-3.0.9/include/linux/mm.h linux-3.0.9/include/linux/mm.h
  extern int soft_offline_page(struct page *page, int flags);
  
  extern void dump_page(struct page *page);
-@@ -1660,5 +1644,11 @@ extern void copy_user_huge_page(struct p
+@@ -1626,5 +1610,11 @@ extern void copy_user_huge_page(struct p
  				unsigned int pages_per_huge_page);
  #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
  
@@ -59669,10 +59513,10 @@ diff -urNp linux-3.0.9/include/linux/mm.h linux-3.0.9/include/linux/mm.h
 +
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urNp linux-3.0.9/include/linux/mm_types.h linux-3.0.9/include/linux/mm_types.h
---- linux-3.0.9/include/linux/mm_types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mm_types.h	2011-11-15 20:03:00.000000000 -0500
-@@ -198,6 +198,8 @@ struct vm_area_struct {
+diff -urNp linux-3.1.1/include/linux/mm_types.h linux-3.1.1/include/linux/mm_types.h
+--- linux-3.1.1/include/linux/mm_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mm_types.h	2011-11-16 18:39:08.000000000 -0500
+@@ -230,6 +230,8 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
  	struct mempolicy *vm_policy;	/* NUMA policy for the VMA */
  #endif
@@ -59681,7 +59525,7 @@ diff -urNp linux-3.0.9/include/linux/mm_types.h linux-3.0.9/include/linux/mm_typ
  };
  
  struct core_thread {
-@@ -330,6 +332,24 @@ struct mm_struct {
+@@ -362,6 +364,24 @@ struct mm_struct {
  #ifdef CONFIG_CPUMASK_OFFSTACK
  	struct cpumask cpumask_allocation;
  #endif
@@ -59706,9 +59550,9 @@ diff -urNp linux-3.0.9/include/linux/mm_types.h linux-3.0.9/include/linux/mm_typ
  };
  
  static inline void mm_init_cpumask(struct mm_struct *mm)
-diff -urNp linux-3.0.9/include/linux/mmu_notifier.h linux-3.0.9/include/linux/mmu_notifier.h
---- linux-3.0.9/include/linux/mmu_notifier.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mmu_notifier.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/mmu_notifier.h linux-3.1.1/include/linux/mmu_notifier.h
+--- linux-3.1.1/include/linux/mmu_notifier.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mmu_notifier.h	2011-11-16 18:39:08.000000000 -0500
 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr
   */
  #define ptep_clear_flush_notify(__vma, __address, __ptep)		\
@@ -59725,10 +59569,10 @@ diff -urNp linux-3.0.9/include/linux/mmu_notifier.h linux-3.0.9/include/linux/mm
  })
  
  #define pmdp_clear_flush_notify(__vma, __address, __pmdp)		\
-diff -urNp linux-3.0.9/include/linux/mmzone.h linux-3.0.9/include/linux/mmzone.h
---- linux-3.0.9/include/linux/mmzone.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mmzone.h	2011-11-15 20:03:00.000000000 -0500
-@@ -350,7 +350,7 @@ struct zone {
+diff -urNp linux-3.1.1/include/linux/mmzone.h linux-3.1.1/include/linux/mmzone.h
+--- linux-3.1.1/include/linux/mmzone.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mmzone.h	2011-11-16 18:39:08.000000000 -0500
+@@ -356,7 +356,7 @@ struct zone {
  	unsigned long		flags;		   /* zone flags, see below */
  
  	/* Zone statistics */
@@ -59737,9 +59581,9 @@ diff -urNp linux-3.0.9/include/linux/mmzone.h linux-3.0.9/include/linux/mmzone.h
  
  	/*
  	 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
-diff -urNp linux-3.0.9/include/linux/mod_devicetable.h linux-3.0.9/include/linux/mod_devicetable.h
---- linux-3.0.9/include/linux/mod_devicetable.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mod_devicetable.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/mod_devicetable.h linux-3.1.1/include/linux/mod_devicetable.h
+--- linux-3.1.1/include/linux/mod_devicetable.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mod_devicetable.h	2011-11-16 18:39:08.000000000 -0500
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -59758,9 +59602,9 @@ diff -urNp linux-3.0.9/include/linux/mod_devicetable.h linux-3.0.9/include/linux
  
  struct hid_device_id {
  	__u16 bus;
-diff -urNp linux-3.0.9/include/linux/module.h linux-3.0.9/include/linux/module.h
---- linux-3.0.9/include/linux/module.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/module.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/module.h linux-3.1.1/include/linux/module.h
+--- linux-3.1.1/include/linux/module.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/module.h	2011-11-16 18:39:08.000000000 -0500
 @@ -16,6 +16,7 @@
  #include <linux/kobject.h>
  #include <linux/moduleparam.h>
@@ -59769,7 +59613,7 @@ diff -urNp linux-3.0.9/include/linux/module.h linux-3.0.9/include/linux/module.h
  
  #include <linux/percpu.h>
  #include <asm/module.h>
-@@ -325,19 +326,16 @@ struct module
+@@ -327,19 +328,16 @@ struct module
  	int (*init)(void);
  
  	/* If this is non-NULL, vfree after init() returns */
@@ -59793,7 +59637,7 @@ diff -urNp linux-3.0.9/include/linux/module.h linux-3.0.9/include/linux/module.h
  
  	/* Arch-specific module values */
  	struct mod_arch_specific arch;
-@@ -393,6 +391,10 @@ struct module
+@@ -395,6 +393,10 @@ struct module
  #ifdef CONFIG_EVENT_TRACING
  	struct ftrace_event_call **trace_events;
  	unsigned int num_trace_events;
@@ -59804,7 +59648,7 @@ diff -urNp linux-3.0.9/include/linux/module.h linux-3.0.9/include/linux/module.h
  #endif
  #ifdef CONFIG_FTRACE_MCOUNT_RECORD
  	unsigned int num_ftrace_callsites;
-@@ -443,16 +445,46 @@ bool is_module_address(unsigned long add
+@@ -445,16 +447,46 @@ bool is_module_address(unsigned long add
  bool is_module_percpu_address(unsigned long addr);
  bool is_module_text_address(unsigned long addr);
  
@@ -59855,10 +59699,10 @@ diff -urNp linux-3.0.9/include/linux/module.h linux-3.0.9/include/linux/module.h
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff -urNp linux-3.0.9/include/linux/moduleloader.h linux-3.0.9/include/linux/moduleloader.h
---- linux-3.0.9/include/linux/moduleloader.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/moduleloader.h	2011-11-15 20:03:00.000000000 -0500
-@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
+diff -urNp linux-3.1.1/include/linux/moduleloader.h linux-3.1.1/include/linux/moduleloader.h
+--- linux-3.1.1/include/linux/moduleloader.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/moduleloader.h	2011-11-16 18:39:08.000000000 -0500
+@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(st
     sections.  Returns NULL on failure. */
  void *module_alloc(unsigned long size);
  
@@ -59880,9 +59724,9 @@ diff -urNp linux-3.0.9/include/linux/moduleloader.h linux-3.0.9/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.9/include/linux/moduleparam.h linux-3.0.9/include/linux/moduleparam.h
---- linux-3.0.9/include/linux/moduleparam.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/moduleparam.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/moduleparam.h linux-3.1.1/include/linux/moduleparam.h
+--- linux-3.1.1/include/linux/moduleparam.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/moduleparam.h	2011-11-16 18:39:08.000000000 -0500
 @@ -255,7 +255,7 @@ static inline void __kernel_param_unlock
   * @len is usually just sizeof(string).
   */
@@ -59901,9 +59745,9 @@ diff -urNp linux-3.0.9/include/linux/moduleparam.h linux-3.0.9/include/linux/mod
  	= { .max = ARRAY_SIZE(array), .num = nump,                      \
  	    .ops = &param_ops_##type,					\
  	    .elemsize = sizeof(array[0]), .elem = array };		\
-diff -urNp linux-3.0.9/include/linux/namei.h linux-3.0.9/include/linux/namei.h
---- linux-3.0.9/include/linux/namei.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/namei.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/namei.h linux-3.1.1/include/linux/namei.h
+--- linux-3.1.1/include/linux/namei.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/namei.h	2011-11-16 18:39:08.000000000 -0500
 @@ -24,7 +24,7 @@ struct nameidata {
  	unsigned	seq;
  	int		last_type;
@@ -59913,7 +59757,7 @@ diff -urNp linux-3.0.9/include/linux/namei.h linux-3.0.9/include/linux/namei.h
  
  	/* Intent data */
  	union {
-@@ -93,12 +93,12 @@ extern int follow_up(struct path *);
+@@ -94,12 +94,12 @@ extern int follow_up(struct path *);
  extern struct dentry *lock_rename(struct dentry *, struct dentry *);
  extern void unlock_rename(struct dentry *, struct dentry *);
  
@@ -59928,10 +59772,10 @@ diff -urNp linux-3.0.9/include/linux/namei.h linux-3.0.9/include/linux/namei.h
  {
  	return nd->saved_names[nd->depth];
  }
-diff -urNp linux-3.0.9/include/linux/netdevice.h linux-3.0.9/include/linux/netdevice.h
---- linux-3.0.9/include/linux/netdevice.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/netdevice.h	2011-11-15 20:03:00.000000000 -0500
-@@ -979,6 +979,7 @@ struct net_device_ops {
+diff -urNp linux-3.1.1/include/linux/netdevice.h linux-3.1.1/include/linux/netdevice.h
+--- linux-3.1.1/include/linux/netdevice.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/netdevice.h	2011-11-16 18:39:08.000000000 -0500
+@@ -944,6 +944,7 @@ struct net_device_ops {
  	int			(*ndo_set_features)(struct net_device *dev,
  						    u32 features);
  };
@@ -59939,9 +59783,9 @@ diff -urNp linux-3.0.9/include/linux/netdevice.h linux-3.0.9/include/linux/netde
  
  /*
   *	The DEVICE structure.
-diff -urNp linux-3.0.9/include/linux/netfilter/xt_gradm.h linux-3.0.9/include/linux/netfilter/xt_gradm.h
---- linux-3.0.9/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/netfilter/xt_gradm.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/netfilter/xt_gradm.h linux-3.1.1/include/linux/netfilter/xt_gradm.h
+--- linux-3.1.1/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/netfilter/xt_gradm.h	2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,9 @@
 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
 +#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -59952,9 +59796,9 @@ diff -urNp linux-3.0.9/include/linux/netfilter/xt_gradm.h linux-3.0.9/include/li
 +};
 +
 +#endif
-diff -urNp linux-3.0.9/include/linux/of_pdt.h linux-3.0.9/include/linux/of_pdt.h
---- linux-3.0.9/include/linux/of_pdt.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/of_pdt.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/of_pdt.h linux-3.1.1/include/linux/of_pdt.h
+--- linux-3.1.1/include/linux/of_pdt.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/of_pdt.h	2011-11-16 18:39:08.000000000 -0500
 @@ -32,7 +32,7 @@ struct of_pdt_ops {
  
  	/* return 0 on success; fill in 'len' with number of bytes in path */
@@ -59964,9 +59808,9 @@ diff -urNp linux-3.0.9/include/linux/of_pdt.h linux-3.0.9/include/linux/of_pdt.h
  
  extern void *prom_early_alloc(unsigned long size);
  
-diff -urNp linux-3.0.9/include/linux/oprofile.h linux-3.0.9/include/linux/oprofile.h
---- linux-3.0.9/include/linux/oprofile.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/oprofile.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/oprofile.h linux-3.1.1/include/linux/oprofile.h
+--- linux-3.1.1/include/linux/oprofile.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/oprofile.h	2011-11-16 18:39:08.000000000 -0500
 @@ -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);
@@ -59979,9 +59823,9 @@ diff -urNp linux-3.0.9/include/linux/oprofile.h linux-3.0.9/include/linux/oprofi
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-3.0.9/include/linux/padata.h linux-3.0.9/include/linux/padata.h
---- linux-3.0.9/include/linux/padata.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/padata.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/padata.h linux-3.1.1/include/linux/padata.h
+--- linux-3.1.1/include/linux/padata.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/padata.h	2011-11-16 18:39:08.000000000 -0500
 @@ -129,7 +129,7 @@ struct parallel_data {
  	struct padata_instance		*pinst;
  	struct padata_parallel_queue	__percpu *pqueue;
@@ -59991,10 +59835,10 @@ diff -urNp linux-3.0.9/include/linux/padata.h linux-3.0.9/include/linux/padata.h
  	atomic_t			reorder_objects;
  	atomic_t			refcnt;
  	unsigned int			max_seq_nr;
-diff -urNp linux-3.0.9/include/linux/perf_event.h linux-3.0.9/include/linux/perf_event.h
---- linux-3.0.9/include/linux/perf_event.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/perf_event.h	2011-11-15 20:03:00.000000000 -0500
-@@ -761,8 +761,8 @@ struct perf_event {
+diff -urNp linux-3.1.1/include/linux/perf_event.h linux-3.1.1/include/linux/perf_event.h
+--- linux-3.1.1/include/linux/perf_event.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/perf_event.h	2011-11-16 18:39:08.000000000 -0500
+@@ -745,8 +745,8 @@ struct perf_event {
  
  	enum perf_event_active_state	state;
  	unsigned int			attach_state;
@@ -60005,7 +59849,7 @@ diff -urNp linux-3.0.9/include/linux/perf_event.h linux-3.0.9/include/linux/perf
  
  	/*
  	 * These are the total time in nanoseconds that the event
-@@ -813,8 +813,8 @@ struct perf_event {
+@@ -797,8 +797,8 @@ struct perf_event {
  	 * These accumulate total time (in nanoseconds) that children
  	 * events have been enabled and running, respectively.
  	 */
@@ -60016,9 +59860,9 @@ diff -urNp linux-3.0.9/include/linux/perf_event.h linux-3.0.9/include/linux/perf
  
  	/*
  	 * Protect attach/detach and child_list:
-diff -urNp linux-3.0.9/include/linux/pipe_fs_i.h linux-3.0.9/include/linux/pipe_fs_i.h
---- linux-3.0.9/include/linux/pipe_fs_i.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/pipe_fs_i.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/pipe_fs_i.h linux-3.1.1/include/linux/pipe_fs_i.h
+--- linux-3.1.1/include/linux/pipe_fs_i.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/pipe_fs_i.h	2011-11-16 18:39:08.000000000 -0500
 @@ -46,9 +46,9 @@ struct pipe_buffer {
  struct pipe_inode_info {
  	wait_queue_head_t wait;
@@ -60032,10 +59876,10 @@ diff -urNp linux-3.0.9/include/linux/pipe_fs_i.h linux-3.0.9/include/linux/pipe_
  	unsigned int r_counter;
  	unsigned int w_counter;
  	struct page *tmp_page;
-diff -urNp linux-3.0.9/include/linux/pm_runtime.h linux-3.0.9/include/linux/pm_runtime.h
---- linux-3.0.9/include/linux/pm_runtime.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/pm_runtime.h	2011-11-15 20:03:00.000000000 -0500
-@@ -94,7 +94,7 @@ static inline bool pm_runtime_callbacks_
+diff -urNp linux-3.1.1/include/linux/pm_runtime.h linux-3.1.1/include/linux/pm_runtime.h
+--- linux-3.1.1/include/linux/pm_runtime.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/pm_runtime.h	2011-11-16 18:39:08.000000000 -0500
+@@ -99,7 +99,7 @@ static inline bool pm_runtime_callbacks_
  
  static inline void pm_runtime_mark_last_busy(struct device *dev)
  {
@@ -60044,9 +59888,9 @@ diff -urNp linux-3.0.9/include/linux/pm_runtime.h linux-3.0.9/include/linux/pm_r
  }
  
  #else /* !CONFIG_PM_RUNTIME */
-diff -urNp linux-3.0.9/include/linux/poison.h linux-3.0.9/include/linux/poison.h
---- linux-3.0.9/include/linux/poison.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/poison.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/poison.h linux-3.1.1/include/linux/poison.h
+--- linux-3.1.1/include/linux/poison.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/poison.h	2011-11-16 18:39:08.000000000 -0500
 @@ -19,8 +19,8 @@
   * under normal circumstances, used to verify that nobody uses
   * non-initialized list entries.
@@ -60058,10 +59902,10 @@ diff -urNp linux-3.0.9/include/linux/poison.h linux-3.0.9/include/linux/poison.h
  
  /********** include/linux/timer.h **********/
  /*
-diff -urNp linux-3.0.9/include/linux/preempt.h linux-3.0.9/include/linux/preempt.h
---- linux-3.0.9/include/linux/preempt.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/preempt.h	2011-11-15 20:03:00.000000000 -0500
-@@ -115,7 +115,7 @@ struct preempt_ops {
+diff -urNp linux-3.1.1/include/linux/preempt.h linux-3.1.1/include/linux/preempt.h
+--- linux-3.1.1/include/linux/preempt.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/preempt.h	2011-11-16 18:39:08.000000000 -0500
+@@ -123,7 +123,7 @@ struct preempt_ops {
  	void (*sched_in)(struct preempt_notifier *notifier, int cpu);
  	void (*sched_out)(struct preempt_notifier *notifier,
  			  struct task_struct *next);
@@ -60070,9 +59914,9 @@ diff -urNp linux-3.0.9/include/linux/preempt.h linux-3.0.9/include/linux/preempt
  
  /**
   * preempt_notifier - key for installing preemption notifiers
-diff -urNp linux-3.0.9/include/linux/proc_fs.h linux-3.0.9/include/linux/proc_fs.h
---- linux-3.0.9/include/linux/proc_fs.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/proc_fs.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/proc_fs.h linux-3.1.1/include/linux/proc_fs.h
+--- linux-3.1.1/include/linux/proc_fs.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/proc_fs.h	2011-11-16 18:40:31.000000000 -0500
 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
  	return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
@@ -60102,10 +59946,10 @@ diff -urNp linux-3.0.9/include/linux/proc_fs.h linux-3.0.9/include/linux/proc_fs
  
  struct ctl_table_header;
  struct ctl_table;
-diff -urNp linux-3.0.9/include/linux/ptrace.h linux-3.0.9/include/linux/ptrace.h
---- linux-3.0.9/include/linux/ptrace.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/ptrace.h	2011-11-15 20:03:00.000000000 -0500
-@@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_
+diff -urNp linux-3.1.1/include/linux/ptrace.h linux-3.1.1/include/linux/ptrace.h
+--- linux-3.1.1/include/linux/ptrace.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/ptrace.h	2011-11-16 18:40:31.000000000 -0500
+@@ -129,10 +129,10 @@ extern void __ptrace_unlink(struct task_
  extern void exit_ptrace(struct task_struct *tracer);
  #define PTRACE_MODE_READ   1
  #define PTRACE_MODE_ATTACH 2
@@ -60118,9 +59962,9 @@ diff -urNp linux-3.0.9/include/linux/ptrace.h linux-3.0.9/include/linux/ptrace.h
  
  static inline int ptrace_reparented(struct task_struct *child)
  {
-diff -urNp linux-3.0.9/include/linux/random.h linux-3.0.9/include/linux/random.h
---- linux-3.0.9/include/linux/random.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/random.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/random.h linux-3.1.1/include/linux/random.h
+--- linux-3.1.1/include/linux/random.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/random.h	2011-11-16 18:39:08.000000000 -0500
 @@ -69,12 +69,17 @@ void srandom32(u32 seed);
  
  u32 prandom32(struct rnd_state *);
@@ -60140,10 +59984,10 @@ diff -urNp linux-3.0.9/include/linux/random.h linux-3.0.9/include/linux/random.h
  }
  
  /**
-diff -urNp linux-3.0.9/include/linux/reboot.h linux-3.0.9/include/linux/reboot.h
---- linux-3.0.9/include/linux/reboot.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/reboot.h	2011-11-15 20:03:00.000000000 -0500
-@@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st
+diff -urNp linux-3.1.1/include/linux/reboot.h linux-3.1.1/include/linux/reboot.h
+--- linux-3.1.1/include/linux/reboot.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/reboot.h	2011-11-16 18:39:08.000000000 -0500
+@@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(st
   * Architecture-specific implementations of sys_reboot commands.
   */
  
@@ -60156,7 +60000,7 @@ diff -urNp linux-3.0.9/include/linux/reboot.h linux-3.0.9/include/linux/reboot.h
  
  extern void machine_shutdown(void);
  struct pt_regs;
-@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struc
+@@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struc
   */
  
  extern void kernel_restart_prepare(char *cmd);
@@ -60169,7 +60013,7 @@ diff -urNp linux-3.0.9/include/linux/reboot.h linux-3.0.9/include/linux/reboot.h
  
  extern int C_A_D; /* for sysctl */
  void ctrl_alt_del(void);
-@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
+@@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
   * Emergency restart, callable from an interrupt handler.
   */
  
@@ -60178,9 +60022,9 @@ diff -urNp linux-3.0.9/include/linux/reboot.h linux-3.0.9/include/linux/reboot.h
  #include <asm/emergency-restart.h>
  
  #endif
-diff -urNp linux-3.0.9/include/linux/reiserfs_fs.h linux-3.0.9/include/linux/reiserfs_fs.h
---- linux-3.0.9/include/linux/reiserfs_fs.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/reiserfs_fs.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/reiserfs_fs.h linux-3.1.1/include/linux/reiserfs_fs.h
+--- linux-3.1.1/include/linux/reiserfs_fs.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/reiserfs_fs.h	2011-11-16 18:39:08.000000000 -0500
 @@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset
  #define REISERFS_USER_MEM		1	/* reiserfs user memory mode            */
  
@@ -60190,9 +60034,9 @@ diff -urNp linux-3.0.9/include/linux/reiserfs_fs.h linux-3.0.9/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.9/include/linux/reiserfs_fs_sb.h linux-3.0.9/include/linux/reiserfs_fs_sb.h
---- linux-3.0.9/include/linux/reiserfs_fs_sb.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/reiserfs_fs_sb.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/reiserfs_fs_sb.h linux-3.1.1/include/linux/reiserfs_fs_sb.h
+--- linux-3.1.1/include/linux/reiserfs_fs_sb.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/reiserfs_fs_sb.h	2011-11-16 18:39:08.000000000 -0500
 @@ -386,7 +386,7 @@ struct reiserfs_sb_info {
  	/* Comment? -Hans */
  	wait_queue_head_t s_wait;
@@ -60202,9 +60046,9 @@ diff -urNp linux-3.0.9/include/linux/reiserfs_fs_sb.h linux-3.0.9/include/linux/
  	// tree gets re-balanced
  	unsigned long s_properties;	/* File system properties. Currently holds
  					   on-disk FS format */
-diff -urNp linux-3.0.9/include/linux/relay.h linux-3.0.9/include/linux/relay.h
---- linux-3.0.9/include/linux/relay.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/relay.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/relay.h linux-3.1.1/include/linux/relay.h
+--- linux-3.1.1/include/linux/relay.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/relay.h	2011-11-16 18:39:08.000000000 -0500
 @@ -159,7 +159,7 @@ struct rchan_callbacks
  	 * The callback should return 0 if successful, negative if not.
  	 */
@@ -60214,9 +60058,9 @@ diff -urNp linux-3.0.9/include/linux/relay.h linux-3.0.9/include/linux/relay.h
  
  /*
   * CONFIG_RELAY kernel API, kernel/relay.c
-diff -urNp linux-3.0.9/include/linux/rfkill.h linux-3.0.9/include/linux/rfkill.h
---- linux-3.0.9/include/linux/rfkill.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/rfkill.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/rfkill.h linux-3.1.1/include/linux/rfkill.h
+--- linux-3.1.1/include/linux/rfkill.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/rfkill.h	2011-11-16 18:39:08.000000000 -0500
 @@ -147,6 +147,7 @@ struct rfkill_ops {
  	void	(*query)(struct rfkill *rfkill, void *data);
  	int	(*set_block)(void *data, bool blocked);
@@ -60225,9 +60069,9 @@ diff -urNp linux-3.0.9/include/linux/rfkill.h linux-3.0.9/include/linux/rfkill.h
  
  #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
  /**
-diff -urNp linux-3.0.9/include/linux/rmap.h linux-3.0.9/include/linux/rmap.h
---- linux-3.0.9/include/linux/rmap.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/rmap.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/rmap.h linux-3.1.1/include/linux/rmap.h
+--- linux-3.1.1/include/linux/rmap.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/rmap.h	2011-11-16 18:39:08.000000000 -0500
 @@ -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 *);
@@ -60239,9 +60083,9 @@ diff -urNp linux-3.0.9/include/linux/rmap.h linux-3.0.9/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.9/include/linux/sched.h linux-3.0.9/include/linux/sched.h
---- linux-3.0.9/include/linux/sched.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/sched.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/sched.h linux-3.1.1/include/linux/sched.h
+--- linux-3.1.1/include/linux/sched.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/sched.h	2011-11-16 18:40:31.000000000 -0500
 @@ -100,6 +100,7 @@ struct bio_list;
  struct fs_struct;
  struct perf_event_context;
@@ -60348,7 +60192,7 @@ diff -urNp linux-3.0.9/include/linux/sched.h linux-3.0.9/include/linux/sched.h
  #ifdef CONFIG_DEBUG_MUTEXES
  	/* mutex deadlock detection */
  	struct mutex_waiter *blocked_on;
-@@ -1538,6 +1564,21 @@ struct task_struct {
+@@ -1537,6 +1563,21 @@ struct task_struct {
  	unsigned long default_timer_slack_ns;
  
  	struct list_head	*scm_work_list;
@@ -60370,7 +60214,7 @@ diff -urNp linux-3.0.9/include/linux/sched.h linux-3.0.9/include/linux/sched.h
  #ifdef CONFIG_FUNCTION_GRAPH_TRACER
  	/* Index of current stored address in ret_stack */
  	int curr_ret_stack;
-@@ -1572,6 +1613,57 @@ struct task_struct {
+@@ -1571,6 +1612,57 @@ struct task_struct {
  #endif
  };
  
@@ -60415,7 +60259,7 @@ diff -urNp linux-3.0.9/include/linux/sched.h linux-3.0.9/include/linux/sched.h
 +#endif
 +
 +extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
-+extern void pax_report_insns(void *pc, void *sp);
++extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
 +extern void pax_report_refcount_overflow(struct pt_regs *regs);
 +extern NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type) ATTRIB_NORET;
 +
@@ -60428,15 +60272,7 @@ diff -urNp linux-3.0.9/include/linux/sched.h linux-3.0.9/include/linux/sched.h
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
  #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
  
-@@ -1768,6 +1860,7 @@ extern void thread_group_times(struct ta
- #define PF_DUMPCORE	0x00000200	/* dumped core */
- #define PF_SIGNALED	0x00000400	/* killed by a signal */
- #define PF_MEMALLOC	0x00000800	/* Allocating memory */
-+#define PF_NPROC_EXCEEDED 0x00001000	/* set_user noticed that RLIMIT_NPROC was exceeded */
- #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 */
-@@ -2055,7 +2148,9 @@ void yield(void);
+@@ -2074,7 +2166,9 @@ void yield(void);
  extern struct exec_domain	default_exec_domain;
  
  union thread_union {
@@ -60446,7 +60282,7 @@ diff -urNp linux-3.0.9/include/linux/sched.h linux-3.0.9/include/linux/sched.h
  	unsigned long stack[THREAD_SIZE/sizeof(long)];
  };
  
-@@ -2088,6 +2183,7 @@ extern struct pid_namespace init_pid_ns;
+@@ -2107,6 +2201,7 @@ extern struct pid_namespace init_pid_ns;
   */
  
  extern struct task_struct *find_task_by_vpid(pid_t nr);
@@ -60454,7 +60290,7 @@ diff -urNp linux-3.0.9/include/linux/sched.h linux-3.0.9/include/linux/sched.h
  extern struct task_struct *find_task_by_pid_ns(pid_t nr,
  		struct pid_namespace *ns);
  
-@@ -2224,7 +2320,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2243,7 +2338,7 @@ extern void __cleanup_sighand(struct sig
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -60463,7 +60299,7 @@ diff -urNp linux-3.0.9/include/linux/sched.h linux-3.0.9/include/linux/sched.h
  
  extern void daemonize(const char *, ...);
  extern int allow_signal(int);
-@@ -2392,13 +2488,17 @@ static inline unsigned long *end_of_stac
+@@ -2408,13 +2503,17 @@ static inline unsigned long *end_of_stac
  
  #endif
  
@@ -60483,9 +60319,9 @@ diff -urNp linux-3.0.9/include/linux/sched.h linux-3.0.9/include/linux/sched.h
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-3.0.9/include/linux/screen_info.h linux-3.0.9/include/linux/screen_info.h
---- linux-3.0.9/include/linux/screen_info.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/screen_info.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/screen_info.h linux-3.1.1/include/linux/screen_info.h
+--- linux-3.1.1/include/linux/screen_info.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/screen_info.h	2011-11-16 18:39:08.000000000 -0500
 @@ -43,7 +43,8 @@ struct screen_info {
  	__u16 pages;		/* 0x32 */
  	__u16 vesa_attributes;	/* 0x34 */
@@ -60496,9 +60332,9 @@ diff -urNp linux-3.0.9/include/linux/screen_info.h linux-3.0.9/include/linux/scr
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA		0x10	/* Monochrome Text Display	*/
-diff -urNp linux-3.0.9/include/linux/security.h linux-3.0.9/include/linux/security.h
---- linux-3.0.9/include/linux/security.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/security.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/security.h linux-3.1.1/include/linux/security.h
+--- linux-3.1.1/include/linux/security.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/security.h	2011-11-16 18:40:31.000000000 -0500
 @@ -36,6 +36,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
@@ -60507,10 +60343,10 @@ diff -urNp linux-3.0.9/include/linux/security.h linux-3.0.9/include/linux/securi
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff -urNp linux-3.0.9/include/linux/seq_file.h linux-3.0.9/include/linux/seq_file.h
---- linux-3.0.9/include/linux/seq_file.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/seq_file.h	2011-11-15 20:03:00.000000000 -0500
-@@ -32,6 +32,7 @@ struct seq_operations {
+diff -urNp linux-3.1.1/include/linux/seq_file.h linux-3.1.1/include/linux/seq_file.h
+--- linux-3.1.1/include/linux/seq_file.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/seq_file.h	2011-11-16 18:39:08.000000000 -0500
+@@ -33,6 +33,7 @@ struct seq_operations {
  	void * (*next) (struct seq_file *m, void *v, loff_t *pos);
  	int (*show) (struct seq_file *m, void *v);
  };
@@ -60518,25 +60354,13 @@ diff -urNp linux-3.0.9/include/linux/seq_file.h linux-3.0.9/include/linux/seq_fi
  
  #define SEQ_SKIP 1
  
-diff -urNp linux-3.0.9/include/linux/shmem_fs.h linux-3.0.9/include/linux/shmem_fs.h
---- linux-3.0.9/include/linux/shmem_fs.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/shmem_fs.h	2011-11-15 20:03:00.000000000 -0500
-@@ -10,7 +10,7 @@
- 
- #define SHMEM_NR_DIRECT 16
+diff -urNp linux-3.1.1/include/linux/shm.h linux-3.1.1/include/linux/shm.h
+--- linux-3.1.1/include/linux/shm.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/shm.h	2011-11-16 18:59:58.000000000 -0500
+@@ -98,6 +98,10 @@ struct shmid_kernel /* private to the ke
  
--#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.9/include/linux/shm.h linux-3.0.9/include/linux/shm.h
---- linux-3.0.9/include/linux/shm.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/shm.h	2011-11-15 20:03:00.000000000 -0500
-@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
- 	pid_t			shm_cprid;
- 	pid_t			shm_lprid;
- 	struct user_struct	*mlock_user;
+ 	/* The task created the shm object.  NULL if the task is dead. */
+ 	struct task_struct	*shm_creator;
 +#ifdef CONFIG_GRKERNSEC
 +	time_t			shm_createtime;
 +	pid_t			shm_lapid;
@@ -60544,10 +60368,10 @@ diff -urNp linux-3.0.9/include/linux/shm.h linux-3.0.9/include/linux/shm.h
  };
  
  /* shm_mode upper byte flags */
-diff -urNp linux-3.0.9/include/linux/skbuff.h linux-3.0.9/include/linux/skbuff.h
---- linux-3.0.9/include/linux/skbuff.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/skbuff.h	2011-11-15 20:03:00.000000000 -0500
-@@ -592,7 +592,7 @@ static inline struct skb_shared_hwtstamp
+diff -urNp linux-3.1.1/include/linux/skbuff.h linux-3.1.1/include/linux/skbuff.h
+--- linux-3.1.1/include/linux/skbuff.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/skbuff.h	2011-11-16 18:39:08.000000000 -0500
+@@ -610,7 +610,7 @@ static inline struct skb_shared_hwtstamp
   */
  static inline int skb_queue_empty(const struct sk_buff_head *list)
  {
@@ -60556,7 +60380,7 @@ diff -urNp linux-3.0.9/include/linux/skbuff.h linux-3.0.9/include/linux/skbuff.h
  }
  
  /**
-@@ -605,7 +605,7 @@ static inline int skb_queue_empty(const 
+@@ -623,7 +623,7 @@ static inline int skb_queue_empty(const 
  static inline bool skb_queue_is_last(const struct sk_buff_head *list,
  				     const struct sk_buff *skb)
  {
@@ -60565,7 +60389,7 @@ diff -urNp linux-3.0.9/include/linux/skbuff.h linux-3.0.9/include/linux/skbuff.h
  }
  
  /**
-@@ -618,7 +618,7 @@ static inline bool skb_queue_is_last(con
+@@ -636,7 +636,7 @@ static inline bool skb_queue_is_last(con
  static inline bool skb_queue_is_first(const struct sk_buff_head *list,
  				      const struct sk_buff *skb)
  {
@@ -60574,7 +60398,7 @@ diff -urNp linux-3.0.9/include/linux/skbuff.h linux-3.0.9/include/linux/skbuff.h
  }
  
  /**
-@@ -1440,7 +1440,7 @@ static inline int pskb_network_may_pull(
+@@ -1458,7 +1458,7 @@ static inline int pskb_network_may_pull(
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD
@@ -60583,10 +60407,10 @@ diff -urNp linux-3.0.9/include/linux/skbuff.h linux-3.0.9/include/linux/skbuff.h
  #endif
  
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-diff -urNp linux-3.0.9/include/linux/slab_def.h linux-3.0.9/include/linux/slab_def.h
---- linux-3.0.9/include/linux/slab_def.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/slab_def.h	2011-11-15 20:03:00.000000000 -0500
-@@ -96,10 +96,10 @@ struct kmem_cache {
+diff -urNp linux-3.1.1/include/linux/slab_def.h linux-3.1.1/include/linux/slab_def.h
+--- linux-3.1.1/include/linux/slab_def.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/slab_def.h	2011-11-16 18:39:08.000000000 -0500
+@@ -68,10 +68,10 @@ struct kmem_cache {
  	unsigned long node_allocs;
  	unsigned long node_frees;
  	unsigned long node_overflow;
@@ -60601,9 +60425,9 @@ diff -urNp linux-3.0.9/include/linux/slab_def.h linux-3.0.9/include/linux/slab_d
  
  	/*
  	 * If debugging is enabled, then the allocator can add additional
-diff -urNp linux-3.0.9/include/linux/slab.h linux-3.0.9/include/linux/slab.h
---- linux-3.0.9/include/linux/slab.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/slab.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/slab.h linux-3.1.1/include/linux/slab.h
+--- linux-3.1.1/include/linux/slab.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/slab.h	2011-11-16 18:39:08.000000000 -0500
 @@ -11,12 +11,20 @@
  
  #include <linux/gfp.h>
@@ -60642,7 +60466,7 @@ diff -urNp linux-3.0.9/include/linux/slab.h linux-3.0.9/include/linux/slab.h
  
  /*
   * struct kmem_cache related prototypes
-@@ -141,6 +152,7 @@ void * __must_check krealloc(const void 
+@@ -161,6 +172,7 @@ void * __must_check krealloc(const void 
  void kfree(const void *);
  void kzfree(const void *);
  size_t ksize(const void *);
@@ -60650,7 +60474,7 @@ diff -urNp linux-3.0.9/include/linux/slab.h linux-3.0.9/include/linux/slab.h
  
  /*
   * Allocator specific definitions. These are mainly used to establish optimized
-@@ -333,4 +345,59 @@ static inline void *kzalloc_node(size_t 
+@@ -353,4 +365,59 @@ static inline void *kzalloc_node(size_t 
  
  void __init kmem_cache_init_late(void);
  
@@ -60710,10 +60534,10 @@ diff -urNp linux-3.0.9/include/linux/slab.h linux-3.0.9/include/linux/slab.h
 +})
 +
  #endif	/* _LINUX_SLAB_H */
-diff -urNp linux-3.0.9/include/linux/slub_def.h linux-3.0.9/include/linux/slub_def.h
---- linux-3.0.9/include/linux/slub_def.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/slub_def.h	2011-11-15 20:03:00.000000000 -0500
-@@ -82,7 +82,7 @@ struct kmem_cache {
+diff -urNp linux-3.1.1/include/linux/slub_def.h linux-3.1.1/include/linux/slub_def.h
+--- linux-3.1.1/include/linux/slub_def.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/slub_def.h	2011-11-16 18:39:08.000000000 -0500
+@@ -85,7 +85,7 @@ struct kmem_cache {
  	struct kmem_cache_order_objects max;
  	struct kmem_cache_order_objects min;
  	gfp_t allocflags;	/* gfp flags to use on each alloc */
@@ -60722,7 +60546,7 @@ diff -urNp linux-3.0.9/include/linux/slub_def.h linux-3.0.9/include/linux/slub_d
  	void (*ctor)(void *);
  	int inuse;		/* Offset to metadata */
  	int align;		/* Alignment */
-@@ -218,7 +218,7 @@ static __always_inline struct kmem_cache
+@@ -211,7 +211,7 @@ static __always_inline struct kmem_cache
  }
  
  void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
@@ -60731,11 +60555,11 @@ diff -urNp linux-3.0.9/include/linux/slub_def.h linux-3.0.9/include/linux/slub_d
  
  static __always_inline void *
  kmalloc_order(size_t size, gfp_t flags, unsigned int order)
-diff -urNp linux-3.0.9/include/linux/sonet.h linux-3.0.9/include/linux/sonet.h
---- linux-3.0.9/include/linux/sonet.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/sonet.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/sonet.h linux-3.1.1/include/linux/sonet.h
+--- linux-3.1.1/include/linux/sonet.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/sonet.h	2011-11-16 18:39:08.000000000 -0500
 @@ -61,7 +61,7 @@ struct sonet_stats {
- #include <asm/atomic.h>
+ #include <linux/atomic.h>
  
  struct k_sonet_stats {
 -#define __HANDLE_ITEM(i) atomic_t i
@@ -60743,9 +60567,9 @@ diff -urNp linux-3.0.9/include/linux/sonet.h linux-3.0.9/include/linux/sonet.h
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-3.0.9/include/linux/sunrpc/clnt.h linux-3.0.9/include/linux/sunrpc/clnt.h
---- linux-3.0.9/include/linux/sunrpc/clnt.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/sunrpc/clnt.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/sunrpc/clnt.h linux-3.1.1/include/linux/sunrpc/clnt.h
+--- linux-3.1.1/include/linux/sunrpc/clnt.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/sunrpc/clnt.h	2011-11-16 18:39:08.000000000 -0500
 @@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por
  {
  	switch (sap->sa_family) {
@@ -60776,9 +60600,20 @@ diff -urNp linux-3.0.9/include/linux/sunrpc/clnt.h linux-3.0.9/include/linux/sun
  }
  
  #endif /* __KERNEL__ */
-diff -urNp linux-3.0.9/include/linux/sunrpc/svc_rdma.h linux-3.0.9/include/linux/sunrpc/svc_rdma.h
---- linux-3.0.9/include/linux/sunrpc/svc_rdma.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/sunrpc/svc_rdma.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/sunrpc/sched.h linux-3.1.1/include/linux/sunrpc/sched.h
+--- linux-3.1.1/include/linux/sunrpc/sched.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/sunrpc/sched.h	2011-11-16 18:39:08.000000000 -0500
+@@ -105,6 +105,7 @@ struct rpc_call_ops {
+ 	void (*rpc_call_done)(struct rpc_task *, void *);
+ 	void (*rpc_release)(void *);
+ };
++typedef struct rpc_call_ops __no_const rpc_call_ops_no_const;
+ 
+ struct rpc_task_setup {
+ 	struct rpc_task *task;
+diff -urNp linux-3.1.1/include/linux/sunrpc/svc_rdma.h linux-3.1.1/include/linux/sunrpc/svc_rdma.h
+--- linux-3.1.1/include/linux/sunrpc/svc_rdma.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/sunrpc/svc_rdma.h	2011-11-16 18:39:08.000000000 -0500
 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
  extern unsigned int svcrdma_max_requests;
  extern unsigned int svcrdma_max_req_size;
@@ -60804,9 +60639,9 @@ diff -urNp linux-3.0.9/include/linux/sunrpc/svc_rdma.h linux-3.0.9/include/linux
  
  #define RPCRDMA_VERSION 1
  
-diff -urNp linux-3.0.9/include/linux/sysctl.h linux-3.0.9/include/linux/sysctl.h
---- linux-3.0.9/include/linux/sysctl.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/sysctl.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/sysctl.h linux-3.1.1/include/linux/sysctl.h
+--- linux-3.1.1/include/linux/sysctl.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/sysctl.h	2011-11-16 18:40:31.000000000 -0500
 @@ -155,7 +155,11 @@ enum
  	KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
  };
@@ -60829,9 +60664,9 @@ diff -urNp linux-3.0.9/include/linux/sysctl.h linux-3.0.9/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.9/include/linux/tty_ldisc.h linux-3.0.9/include/linux/tty_ldisc.h
---- linux-3.0.9/include/linux/tty_ldisc.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/tty_ldisc.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/tty_ldisc.h linux-3.1.1/include/linux/tty_ldisc.h
+--- linux-3.1.1/include/linux/tty_ldisc.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/tty_ldisc.h	2011-11-16 18:39:08.000000000 -0500
 @@ -148,7 +148,7 @@ struct tty_ldisc_ops {
  
  	struct  module *owner;
@@ -60841,9 +60676,9 @@ diff -urNp linux-3.0.9/include/linux/tty_ldisc.h linux-3.0.9/include/linux/tty_l
  };
  
  struct tty_ldisc {
-diff -urNp linux-3.0.9/include/linux/types.h linux-3.0.9/include/linux/types.h
---- linux-3.0.9/include/linux/types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/types.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/types.h linux-3.1.1/include/linux/types.h
+--- linux-3.1.1/include/linux/types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/types.h	2011-11-16 18:39:08.000000000 -0500
 @@ -213,10 +213,26 @@ typedef struct {
  	int counter;
  } atomic_t;
@@ -60871,9 +60706,9 @@ diff -urNp linux-3.0.9/include/linux/types.h linux-3.0.9/include/linux/types.h
  #endif
  
  struct list_head {
-diff -urNp linux-3.0.9/include/linux/uaccess.h linux-3.0.9/include/linux/uaccess.h
---- linux-3.0.9/include/linux/uaccess.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/uaccess.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/uaccess.h linux-3.1.1/include/linux/uaccess.h
+--- linux-3.1.1/include/linux/uaccess.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/uaccess.h	2011-11-16 18:39:08.000000000 -0500
 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
  		long ret;				\
  		mm_segment_t old_fs = get_fs();		\
@@ -60889,9 +60724,9 @@ diff -urNp linux-3.0.9/include/linux/uaccess.h linux-3.0.9/include/linux/uaccess
  		ret;					\
  	})
  
-diff -urNp linux-3.0.9/include/linux/unaligned/access_ok.h linux-3.0.9/include/linux/unaligned/access_ok.h
---- linux-3.0.9/include/linux/unaligned/access_ok.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/unaligned/access_ok.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/unaligned/access_ok.h linux-3.1.1/include/linux/unaligned/access_ok.h
+--- linux-3.1.1/include/linux/unaligned/access_ok.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/unaligned/access_ok.h	2011-11-16 18:39:08.000000000 -0500
 @@ -6,32 +6,32 @@
  
  static inline u16 get_unaligned_le16(const void *p)
@@ -60931,10 +60766,10 @@ diff -urNp linux-3.0.9/include/linux/unaligned/access_ok.h linux-3.0.9/include/l
  }
  
  static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-3.0.9/include/linux/vermagic.h linux-3.0.9/include/linux/vermagic.h
---- linux-3.0.9/include/linux/vermagic.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/vermagic.h	2011-11-15 20:03:00.000000000 -0500
-@@ -26,9 +26,28 @@
+diff -urNp linux-3.1.1/include/linux/vermagic.h linux-3.1.1/include/linux/vermagic.h
+--- linux-3.1.1/include/linux/vermagic.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/vermagic.h	2011-11-16 18:54:54.000000000 -0500
+@@ -26,9 +26,35 @@
  #define MODULE_ARCH_VERMAGIC ""
  #endif
  
@@ -60950,6 +60785,12 @@ diff -urNp linux-3.0.9/include/linux/vermagic.h linux-3.0.9/include/linux/vermag
 +#define MODULE_CONSTIFY_PLUGIN ""
 +#endif
 +
++#ifdef STACKLEAK_PLUGIN
++#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
++#else
++#define MODULE_STACKLEAK_PLUGIN ""
++#endif
++
 +#ifdef CONFIG_GRKERNSEC
 +#define MODULE_GRSEC "GRSEC "
 +#else
@@ -60962,18 +60803,19 @@ diff -urNp linux-3.0.9/include/linux/vermagic.h linux-3.0.9/include/linux/vermag
  	MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS	\
 -	MODULE_ARCH_VERMAGIC
 +	MODULE_ARCH_VERMAGIC						\
-+	MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_GRSEC
++	MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
++	MODULE_GRSEC
  
-diff -urNp linux-3.0.9/include/linux/vmalloc.h linux-3.0.9/include/linux/vmalloc.h
---- linux-3.0.9/include/linux/vmalloc.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/vmalloc.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/vmalloc.h linux-3.1.1/include/linux/vmalloc.h
+--- linux-3.1.1/include/linux/vmalloc.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/vmalloc.h	2011-11-16 18:39:08.000000000 -0500
 @@ -14,6 +14,11 @@ struct vm_area_struct;		/* vma defining 
  #define VM_USERMAP	0x00000008	/* suitable for remap_vmalloc_range */
  #define VM_VPAGES	0x00000010	/* buffer for pages was vmalloc'ed */
  #define VM_UNLIST	0x00000020	/* vm_struct is not listed in vmlist */
 +
 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
-+#define VM_KERNEXEC   0x00000040      /* allocate from executable kernel memory range */
++#define VM_KERNEXEC	0x00000040	/* allocate from executable kernel memory range */
 +#endif
 +
  /* bits [20..32] reserved for arch specific ioremap internals */
@@ -61083,9 +60925,9 @@ diff -urNp linux-3.0.9/include/linux/vmalloc.h linux-3.0.9/include/linux/vmalloc
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-3.0.9/include/linux/vmstat.h linux-3.0.9/include/linux/vmstat.h
---- linux-3.0.9/include/linux/vmstat.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/vmstat.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/linux/vmstat.h linux-3.1.1/include/linux/vmstat.h
+--- linux-3.1.1/include/linux/vmstat.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/vmstat.h	2011-11-16 18:39:08.000000000 -0500
 @@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(in
  /*
   * Zone based page accounting with per cpu differentials.
@@ -61149,9 +60991,9 @@ diff -urNp linux-3.0.9/include/linux/vmstat.h linux-3.0.9/include/linux/vmstat.h
  }
  
  static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-3.0.9/include/media/saa7146_vv.h linux-3.0.9/include/media/saa7146_vv.h
---- linux-3.0.9/include/media/saa7146_vv.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/media/saa7146_vv.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/media/saa7146_vv.h linux-3.1.1/include/media/saa7146_vv.h
+--- linux-3.1.1/include/media/saa7146_vv.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/media/saa7146_vv.h	2011-11-16 18:39:08.000000000 -0500
 @@ -163,7 +163,7 @@ struct saa7146_ext_vv
  	int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
  
@@ -61161,9 +61003,9 @@ diff -urNp linux-3.0.9/include/media/saa7146_vv.h linux-3.0.9/include/media/saa7
  	/* pointer to the saa7146 core ops */
  	const struct v4l2_ioctl_ops *core_ops;
  
-diff -urNp linux-3.0.9/include/media/v4l2-dev.h linux-3.0.9/include/media/v4l2-dev.h
---- linux-3.0.9/include/media/v4l2-dev.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/media/v4l2-dev.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/media/v4l2-dev.h linux-3.1.1/include/media/v4l2-dev.h
+--- linux-3.1.1/include/media/v4l2-dev.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/media/v4l2-dev.h	2011-11-16 18:39:08.000000000 -0500
 @@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_sta
  
  
@@ -61181,9 +61023,9 @@ diff -urNp linux-3.0.9/include/media/v4l2-dev.h linux-3.0.9/include/media/v4l2-d
  
  /*
   * Newer version of video_device, handled by videodev2.c
-diff -urNp linux-3.0.9/include/media/v4l2-ioctl.h linux-3.0.9/include/media/v4l2-ioctl.h
---- linux-3.0.9/include/media/v4l2-ioctl.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/media/v4l2-ioctl.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/media/v4l2-ioctl.h linux-3.1.1/include/media/v4l2-ioctl.h
+--- linux-3.1.1/include/media/v4l2-ioctl.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/media/v4l2-ioctl.h	2011-11-16 18:40:44.000000000 -0500
 @@ -272,6 +272,7 @@ struct v4l2_ioctl_ops {
  	long (*vidioc_default)	       (struct file *file, void *fh,
  					bool valid_prio, int cmd, void *arg);
@@ -61192,9 +61034,21 @@ diff -urNp linux-3.0.9/include/media/v4l2-ioctl.h linux-3.0.9/include/media/v4l2
  
  
  /* v4l debugging and diagnostics */
-diff -urNp linux-3.0.9/include/net/caif/cfctrl.h linux-3.0.9/include/net/caif/cfctrl.h
---- linux-3.0.9/include/net/caif/cfctrl.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/caif/cfctrl.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/net/caif/caif_hsi.h linux-3.1.1/include/net/caif/caif_hsi.h
+--- linux-3.1.1/include/net/caif/caif_hsi.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/caif/caif_hsi.h	2011-11-16 18:39:08.000000000 -0500
+@@ -94,7 +94,7 @@ struct cfhsi_drv {
+ 	void (*rx_done_cb) (struct cfhsi_drv *drv);
+ 	void (*wake_up_cb) (struct cfhsi_drv *drv);
+ 	void (*wake_down_cb) (struct cfhsi_drv *drv);
+-};
++} __no_const;
+ 
+ /* Structure implemented by HSI device. */
+ struct cfhsi_dev {
+diff -urNp linux-3.1.1/include/net/caif/cfctrl.h linux-3.1.1/include/net/caif/cfctrl.h
+--- linux-3.1.1/include/net/caif/cfctrl.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/caif/cfctrl.h	2011-11-16 18:39:08.000000000 -0500
 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
  	void (*radioset_rsp)(void);
  	void (*reject_rsp)(struct cflayer *layer, u8 linkid,
@@ -61215,9 +61069,9 @@ diff -urNp linux-3.0.9/include/net/caif/cfctrl.h linux-3.0.9/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.9/include/net/flow.h linux-3.0.9/include/net/flow.h
---- linux-3.0.9/include/net/flow.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/flow.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/net/flow.h linux-3.1.1/include/net/flow.h
+--- linux-3.1.1/include/net/flow.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/flow.h	2011-11-16 18:39:08.000000000 -0500
 @@ -207,6 +207,6 @@ extern struct flow_cache_object *flow_ca
  		u8 dir, flow_resolve_t resolver, void *ctx);
  
@@ -61226,10 +61080,10 @@ diff -urNp linux-3.0.9/include/net/flow.h linux-3.0.9/include/net/flow.h
 +extern atomic_unchecked_t flow_cache_genid;
  
  #endif
-diff -urNp linux-3.0.9/include/net/inetpeer.h linux-3.0.9/include/net/inetpeer.h
---- linux-3.0.9/include/net/inetpeer.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/inetpeer.h	2011-11-15 20:03:00.000000000 -0500
-@@ -43,8 +43,8 @@ struct inet_peer {
+diff -urNp linux-3.1.1/include/net/inetpeer.h linux-3.1.1/include/net/inetpeer.h
+--- linux-3.1.1/include/net/inetpeer.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/inetpeer.h	2011-11-16 18:39:08.000000000 -0500
+@@ -47,8 +47,8 @@ struct inet_peer {
  	 */
  	union {
  		struct {
@@ -61239,19 +61093,24 @@ diff -urNp linux-3.0.9/include/net/inetpeer.h linux-3.0.9/include/net/inetpeer.h
 +			atomic_unchecked_t		ip_id_count;	/* IP ID for the next packet */
  			__u32				tcp_ts;
  			__u32				tcp_ts_stamp;
- 			u32				metrics[RTAX_MAX];
-@@ -108,7 +108,7 @@ static inline __u16	inet_getid(struct in
- {
+ 		};
+@@ -112,11 +112,11 @@ static inline int inet_getid(struct inet
  	more++;
  	inet_peer_refcheck(p);
--	return atomic_add_return(more, &p->ip_id_count) - more;
-+	return atomic_add_return_unchecked(more, &p->ip_id_count) - more;
- }
- 
- #endif /* _NET_INETPEER_H */
-diff -urNp linux-3.0.9/include/net/ip_fib.h linux-3.0.9/include/net/ip_fib.h
---- linux-3.0.9/include/net/ip_fib.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/ip_fib.h	2011-11-15 20:03:00.000000000 -0500
+ 	do {
+-		old = atomic_read(&p->ip_id_count);
++		old = atomic_read_unchecked(&p->ip_id_count);
+ 		new = old + more;
+ 		if (!new)
+ 			new = 1;
+-	} while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
++	} while (atomic_cmpxchg_unchecked(&p->ip_id_count, old, new) != old);
+ 	return new;
+ }
+ 
+diff -urNp linux-3.1.1/include/net/ip_fib.h linux-3.1.1/include/net/ip_fib.h
+--- linux-3.1.1/include/net/ip_fib.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/ip_fib.h	2011-11-16 18:39:08.000000000 -0500
 @@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s
  
  #define FIB_RES_SADDR(net, res)				\
@@ -61261,9 +61120,9 @@ diff -urNp linux-3.0.9/include/net/ip_fib.h linux-3.0.9/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.9/include/net/ip_vs.h linux-3.0.9/include/net/ip_vs.h
---- linux-3.0.9/include/net/ip_vs.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/ip_vs.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/net/ip_vs.h linux-3.1.1/include/net/ip_vs.h
+--- linux-3.1.1/include/net/ip_vs.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/ip_vs.h	2011-11-16 18:39:08.000000000 -0500
 @@ -509,7 +509,7 @@ struct ip_vs_conn {
  	struct ip_vs_conn       *control;       /* Master control connection */
  	atomic_t                n_control;      /* Number of controlled ones */
@@ -61282,9 +61141,9 @@ diff -urNp linux-3.0.9/include/net/ip_vs.h linux-3.0.9/include/net/ip_vs.h
  	atomic_t		weight;		/* server weight */
  
  	atomic_t		refcnt;		/* reference counter */
-diff -urNp linux-3.0.9/include/net/irda/ircomm_core.h linux-3.0.9/include/net/irda/ircomm_core.h
---- linux-3.0.9/include/net/irda/ircomm_core.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/irda/ircomm_core.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/net/irda/ircomm_core.h linux-3.1.1/include/net/irda/ircomm_core.h
+--- linux-3.1.1/include/net/irda/ircomm_core.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/irda/ircomm_core.h	2011-11-16 18:39:08.000000000 -0500
 @@ -51,7 +51,7 @@ typedef struct {
  	int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
  	int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *, 
@@ -61294,9 +61153,9 @@ diff -urNp linux-3.0.9/include/net/irda/ircomm_core.h linux-3.0.9/include/net/ir
  
  struct ircomm_cb {
  	irda_queue_t queue;
-diff -urNp linux-3.0.9/include/net/irda/ircomm_tty.h linux-3.0.9/include/net/irda/ircomm_tty.h
---- linux-3.0.9/include/net/irda/ircomm_tty.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/irda/ircomm_tty.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/net/irda/ircomm_tty.h linux-3.1.1/include/net/irda/ircomm_tty.h
+--- linux-3.1.1/include/net/irda/ircomm_tty.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/irda/ircomm_tty.h	2011-11-16 18:39:08.000000000 -0500
 @@ -35,6 +35,7 @@
  #include <linux/termios.h>
  #include <linux/timer.h>
@@ -61316,9 +61175,9 @@ diff -urNp linux-3.0.9/include/net/irda/ircomm_tty.h linux-3.0.9/include/net/ird
  
  	/* Protect concurent access to :
  	 *	o self->open_count
-diff -urNp linux-3.0.9/include/net/iucv/af_iucv.h linux-3.0.9/include/net/iucv/af_iucv.h
---- linux-3.0.9/include/net/iucv/af_iucv.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/iucv/af_iucv.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/net/iucv/af_iucv.h linux-3.1.1/include/net/iucv/af_iucv.h
+--- linux-3.1.1/include/net/iucv/af_iucv.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/iucv/af_iucv.h	2011-11-16 18:39:08.000000000 -0500
 @@ -87,7 +87,7 @@ struct iucv_sock {
  struct iucv_sock_list {
  	struct hlist_head head;
@@ -61328,9 +61187,9 @@ diff -urNp linux-3.0.9/include/net/iucv/af_iucv.h linux-3.0.9/include/net/iucv/a
  };
  
  unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
-diff -urNp linux-3.0.9/include/net/lapb.h linux-3.0.9/include/net/lapb.h
---- linux-3.0.9/include/net/lapb.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/lapb.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/net/lapb.h linux-3.1.1/include/net/lapb.h
+--- linux-3.1.1/include/net/lapb.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/lapb.h	2011-11-16 18:39:08.000000000 -0500
 @@ -95,7 +95,7 @@ struct lapb_cb {
  	struct sk_buff_head	write_queue;
  	struct sk_buff_head	ack_queue;
@@ -61340,21 +61199,21 @@ diff -urNp linux-3.0.9/include/net/lapb.h linux-3.0.9/include/net/lapb.h
  
  	/* FRMR control information */
  	struct lapb_frame	frmr_data;
-diff -urNp linux-3.0.9/include/net/neighbour.h linux-3.0.9/include/net/neighbour.h
---- linux-3.0.9/include/net/neighbour.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/neighbour.h	2011-11-15 20:03:00.000000000 -0500
-@@ -124,7 +124,7 @@ struct neigh_ops {
- 	int			(*connected_output)(struct sk_buff*);
- 	int			(*hh_output)(struct sk_buff*);
- 	int			(*queue_xmit)(struct sk_buff*);
+diff -urNp linux-3.1.1/include/net/neighbour.h linux-3.1.1/include/net/neighbour.h
+--- linux-3.1.1/include/net/neighbour.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/neighbour.h	2011-11-16 18:39:08.000000000 -0500
+@@ -122,7 +122,7 @@ struct neigh_ops {
+ 	void			(*error_report)(struct neighbour *, struct sk_buff *);
+ 	int			(*output)(struct neighbour *, struct sk_buff *);
+ 	int			(*connected_output)(struct neighbour *, struct sk_buff *);
 -};
 +} __do_const;
  
  struct pneigh_entry {
  	struct pneigh_entry	*next;
-diff -urNp linux-3.0.9/include/net/netlink.h linux-3.0.9/include/net/netlink.h
---- linux-3.0.9/include/net/netlink.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/netlink.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/net/netlink.h linux-3.1.1/include/net/netlink.h
+--- linux-3.1.1/include/net/netlink.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/netlink.h	2011-11-16 18:39:08.000000000 -0500
 @@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct
  static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
  {
@@ -61364,9 +61223,9 @@ diff -urNp linux-3.0.9/include/net/netlink.h linux-3.0.9/include/net/netlink.h
  }
  
  /**
-diff -urNp linux-3.0.9/include/net/netns/ipv4.h linux-3.0.9/include/net/netns/ipv4.h
---- linux-3.0.9/include/net/netns/ipv4.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/netns/ipv4.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/net/netns/ipv4.h linux-3.1.1/include/net/netns/ipv4.h
+--- linux-3.1.1/include/net/netns/ipv4.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/netns/ipv4.h	2011-11-16 18:39:08.000000000 -0500
 @@ -56,8 +56,8 @@ struct netns_ipv4 {
  
  	unsigned int sysctl_ping_group_range[2];
@@ -61378,10 +61237,10 @@ diff -urNp linux-3.0.9/include/net/netns/ipv4.h linux-3.0.9/include/net/netns/ip
  
  #ifdef CONFIG_IP_MROUTE
  #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-diff -urNp linux-3.0.9/include/net/sctp/sctp.h linux-3.0.9/include/net/sctp/sctp.h
---- linux-3.0.9/include/net/sctp/sctp.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/sctp/sctp.h	2011-11-15 20:03:00.000000000 -0500
-@@ -315,9 +315,9 @@ do {									\
+diff -urNp linux-3.1.1/include/net/sctp/sctp.h linux-3.1.1/include/net/sctp/sctp.h
+--- linux-3.1.1/include/net/sctp/sctp.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/sctp/sctp.h	2011-11-16 18:39:08.000000000 -0500
+@@ -318,9 +318,9 @@ do {									\
  
  #else	/* SCTP_DEBUG */
  
@@ -61394,10 +61253,10 @@ diff -urNp linux-3.0.9/include/net/sctp/sctp.h linux-3.0.9/include/net/sctp/sctp
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-3.0.9/include/net/sock.h linux-3.0.9/include/net/sock.h
---- linux-3.0.9/include/net/sock.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/sock.h	2011-11-15 20:03:00.000000000 -0500
-@@ -277,7 +277,7 @@ struct sock {
+diff -urNp linux-3.1.1/include/net/sock.h linux-3.1.1/include/net/sock.h
+--- linux-3.1.1/include/net/sock.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/sock.h	2011-11-16 18:39:08.000000000 -0500
+@@ -278,7 +278,7 @@ struct sock {
  #ifdef CONFIG_RPS
  	__u32			sk_rxhash;
  #endif
@@ -61406,7 +61265,7 @@ diff -urNp linux-3.0.9/include/net/sock.h linux-3.0.9/include/net/sock.h
  	int			sk_rcvbuf;
  
  	struct sk_filter __rcu	*sk_filter;
-@@ -1390,7 +1390,7 @@ static inline void sk_nocaps_add(struct 
+@@ -1391,7 +1391,7 @@ static inline void sk_nocaps_add(struct 
  }
  
  static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
@@ -61415,10 +61274,10 @@ diff -urNp linux-3.0.9/include/net/sock.h linux-3.0.9/include/net/sock.h
  					   int copy, int offset)
  {
  	if (skb->ip_summed == CHECKSUM_NONE) {
-diff -urNp linux-3.0.9/include/net/tcp.h linux-3.0.9/include/net/tcp.h
---- linux-3.0.9/include/net/tcp.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/tcp.h	2011-11-15 20:03:00.000000000 -0500
-@@ -1374,8 +1374,8 @@ enum tcp_seq_states {
+diff -urNp linux-3.1.1/include/net/tcp.h linux-3.1.1/include/net/tcp.h
+--- linux-3.1.1/include/net/tcp.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/tcp.h	2011-11-16 18:39:08.000000000 -0500
+@@ -1401,8 +1401,8 @@ enum tcp_seq_states {
  struct tcp_seq_afinfo {
  	char			*name;
  	sa_family_t		family;
@@ -61429,9 +61288,9 @@ diff -urNp linux-3.0.9/include/net/tcp.h linux-3.0.9/include/net/tcp.h
  };
  
  struct tcp_iter_state {
-diff -urNp linux-3.0.9/include/net/udp.h linux-3.0.9/include/net/udp.h
---- linux-3.0.9/include/net/udp.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/udp.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/net/udp.h linux-3.1.1/include/net/udp.h
+--- linux-3.1.1/include/net/udp.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/udp.h	2011-11-16 18:39:08.000000000 -0500
 @@ -234,8 +234,8 @@ struct udp_seq_afinfo {
  	char			*name;
  	sa_family_t		family;
@@ -61443,9 +61302,9 @@ diff -urNp linux-3.0.9/include/net/udp.h linux-3.0.9/include/net/udp.h
  };
  
  struct udp_iter_state {
-diff -urNp linux-3.0.9/include/net/xfrm.h linux-3.0.9/include/net/xfrm.h
---- linux-3.0.9/include/net/xfrm.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/xfrm.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/net/xfrm.h linux-3.1.1/include/net/xfrm.h
+--- linux-3.1.1/include/net/xfrm.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/xfrm.h	2011-11-16 18:39:08.000000000 -0500
 @@ -505,7 +505,7 @@ struct xfrm_policy {
  	struct timer_list	timer;
  
@@ -61455,9 +61314,9 @@ diff -urNp linux-3.0.9/include/net/xfrm.h linux-3.0.9/include/net/xfrm.h
  	u32			priority;
  	u32			index;
  	struct xfrm_mark	mark;
-diff -urNp linux-3.0.9/include/rdma/iw_cm.h linux-3.0.9/include/rdma/iw_cm.h
---- linux-3.0.9/include/rdma/iw_cm.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/rdma/iw_cm.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/rdma/iw_cm.h linux-3.1.1/include/rdma/iw_cm.h
+--- linux-3.1.1/include/rdma/iw_cm.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/rdma/iw_cm.h	2011-11-16 18:39:08.000000000 -0500
 @@ -120,7 +120,7 @@ struct iw_cm_verbs {
  					 int backlog);
  
@@ -61467,10 +61326,10 @@ diff -urNp linux-3.0.9/include/rdma/iw_cm.h linux-3.0.9/include/rdma/iw_cm.h
  
  /**
   * iw_create_cm_id - Create an IW CM identifier.
-diff -urNp linux-3.0.9/include/scsi/libfc.h linux-3.0.9/include/scsi/libfc.h
---- linux-3.0.9/include/scsi/libfc.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/scsi/libfc.h	2011-11-15 20:03:00.000000000 -0500
-@@ -750,6 +750,7 @@ struct libfc_function_template {
+diff -urNp linux-3.1.1/include/scsi/libfc.h linux-3.1.1/include/scsi/libfc.h
+--- linux-3.1.1/include/scsi/libfc.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/scsi/libfc.h	2011-11-16 18:39:08.000000000 -0500
+@@ -758,6 +758,7 @@ struct libfc_function_template {
  	 */
  	void (*disc_stop_final) (struct fc_lport *);
  };
@@ -61478,7 +61337,7 @@ diff -urNp linux-3.0.9/include/scsi/libfc.h linux-3.0.9/include/scsi/libfc.h
  
  /**
   * struct fc_disc - Discovery context
-@@ -853,7 +854,7 @@ struct fc_lport {
+@@ -861,7 +862,7 @@ struct fc_lport {
  	struct fc_vport		       *vport;
  
  	/* Operational Information */
@@ -61487,9 +61346,9 @@ diff -urNp linux-3.0.9/include/scsi/libfc.h linux-3.0.9/include/scsi/libfc.h
  	u8			       link_up;
  	u8			       qfull;
  	enum fc_lport_state	       state;
-diff -urNp linux-3.0.9/include/scsi/scsi_device.h linux-3.0.9/include/scsi/scsi_device.h
---- linux-3.0.9/include/scsi/scsi_device.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/scsi/scsi_device.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/scsi/scsi_device.h linux-3.1.1/include/scsi/scsi_device.h
+--- linux-3.1.1/include/scsi/scsi_device.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/scsi/scsi_device.h	2011-11-16 18:39:08.000000000 -0500
 @@ -161,9 +161,9 @@ struct scsi_device {
  	unsigned int max_device_blocked; /* what device_blocked counts down from  */
  #define SCSI_DEFAULT_DEVICE_BLOCKED	3
@@ -61503,9 +61362,9 @@ diff -urNp linux-3.0.9/include/scsi/scsi_device.h linux-3.0.9/include/scsi/scsi_
  
  	struct device		sdev_gendev,
  				sdev_dev;
-diff -urNp linux-3.0.9/include/scsi/scsi_transport_fc.h linux-3.0.9/include/scsi/scsi_transport_fc.h
---- linux-3.0.9/include/scsi/scsi_transport_fc.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/scsi/scsi_transport_fc.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/scsi/scsi_transport_fc.h linux-3.1.1/include/scsi/scsi_transport_fc.h
+--- linux-3.1.1/include/scsi/scsi_transport_fc.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/scsi/scsi_transport_fc.h	2011-11-16 18:39:08.000000000 -0500
 @@ -711,7 +711,7 @@ struct fc_function_template {
  	unsigned long	show_host_system_hostname:1;
  
@@ -61515,9 +61374,9 @@ diff -urNp linux-3.0.9/include/scsi/scsi_transport_fc.h linux-3.0.9/include/scsi
  
  
  /**
-diff -urNp linux-3.0.9/include/sound/ak4xxx-adda.h linux-3.0.9/include/sound/ak4xxx-adda.h
---- linux-3.0.9/include/sound/ak4xxx-adda.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/ak4xxx-adda.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/sound/ak4xxx-adda.h linux-3.1.1/include/sound/ak4xxx-adda.h
+--- linux-3.1.1/include/sound/ak4xxx-adda.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/ak4xxx-adda.h	2011-11-16 18:39:08.000000000 -0500
 @@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
  	void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
  		      unsigned char val);
@@ -61527,9 +61386,9 @@ diff -urNp linux-3.0.9/include/sound/ak4xxx-adda.h linux-3.0.9/include/sound/ak4
  
  #define AK4XXX_IMAGE_SIZE	(AK4XXX_MAX_CHIPS * 16)	/* 64 bytes */
  
-diff -urNp linux-3.0.9/include/sound/hwdep.h linux-3.0.9/include/sound/hwdep.h
---- linux-3.0.9/include/sound/hwdep.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/hwdep.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/sound/hwdep.h linux-3.1.1/include/sound/hwdep.h
+--- linux-3.1.1/include/sound/hwdep.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/hwdep.h	2011-11-16 18:39:08.000000000 -0500
 @@ -49,7 +49,7 @@ struct snd_hwdep_ops {
  			  struct snd_hwdep_dsp_status *status);
  	int (*dsp_load)(struct snd_hwdep *hw,
@@ -61539,9 +61398,9 @@ diff -urNp linux-3.0.9/include/sound/hwdep.h linux-3.0.9/include/sound/hwdep.h
  
  struct snd_hwdep {
  	struct snd_card *card;
-diff -urNp linux-3.0.9/include/sound/info.h linux-3.0.9/include/sound/info.h
---- linux-3.0.9/include/sound/info.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/info.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/sound/info.h linux-3.1.1/include/sound/info.h
+--- linux-3.1.1/include/sound/info.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/info.h	2011-11-16 18:39:08.000000000 -0500
 @@ -44,7 +44,7 @@ struct snd_info_entry_text {
  		     struct snd_info_buffer *buffer);
  	void (*write)(struct snd_info_entry *entry,
@@ -61551,9 +61410,9 @@ diff -urNp linux-3.0.9/include/sound/info.h linux-3.0.9/include/sound/info.h
  
  struct snd_info_entry_ops {
  	int (*open)(struct snd_info_entry *entry,
-diff -urNp linux-3.0.9/include/sound/pcm.h linux-3.0.9/include/sound/pcm.h
---- linux-3.0.9/include/sound/pcm.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/pcm.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/sound/pcm.h linux-3.1.1/include/sound/pcm.h
+--- linux-3.1.1/include/sound/pcm.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/pcm.h	2011-11-16 18:39:08.000000000 -0500
 @@ -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);
@@ -61562,9 +61421,9 @@ diff -urNp linux-3.0.9/include/sound/pcm.h linux-3.0.9/include/sound/pcm.h
  
  /*
   *
-diff -urNp linux-3.0.9/include/sound/sb16_csp.h linux-3.0.9/include/sound/sb16_csp.h
---- linux-3.0.9/include/sound/sb16_csp.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/sb16_csp.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/sound/sb16_csp.h linux-3.1.1/include/sound/sb16_csp.h
+--- linux-3.1.1/include/sound/sb16_csp.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/sb16_csp.h	2011-11-16 18:39:08.000000000 -0500
 @@ -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);
@@ -61574,21 +61433,21 @@ diff -urNp linux-3.0.9/include/sound/sb16_csp.h linux-3.0.9/include/sound/sb16_c
  
  /*
   * CSP private data
-diff -urNp linux-3.0.9/include/sound/soc.h linux-3.0.9/include/sound/soc.h
---- linux-3.0.9/include/sound/soc.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/soc.h	2011-11-15 20:03:00.000000000 -0500
-@@ -636,7 +636,7 @@ struct snd_soc_platform_driver {
- 
- 	/* platform stream ops */
- 	struct snd_pcm_ops *ops;
+diff -urNp linux-3.1.1/include/sound/soc.h linux-3.1.1/include/sound/soc.h
+--- linux-3.1.1/include/sound/soc.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/soc.h	2011-11-16 18:39:08.000000000 -0500
+@@ -676,7 +676,7 @@ struct snd_soc_platform_driver {
+ 	/* platform IO - used for platform DAPM */
+ 	unsigned int (*read)(struct snd_soc_platform *, unsigned int);
+ 	int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
 -};
 +} __do_const;
  
  struct snd_soc_platform {
  	const char *name;
-diff -urNp linux-3.0.9/include/sound/ymfpci.h linux-3.0.9/include/sound/ymfpci.h
---- linux-3.0.9/include/sound/ymfpci.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/ymfpci.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/sound/ymfpci.h linux-3.1.1/include/sound/ymfpci.h
+--- linux-3.1.1/include/sound/ymfpci.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/ymfpci.h	2011-11-16 18:39:08.000000000 -0500
 @@ -358,7 +358,7 @@ struct snd_ymfpci {
  	spinlock_t reg_lock;
  	spinlock_t voice_lock;
@@ -61598,19 +61457,19 @@ diff -urNp linux-3.0.9/include/sound/ymfpci.h linux-3.0.9/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.9/include/target/target_core_base.h linux-3.0.9/include/target/target_core_base.h
---- linux-3.0.9/include/target/target_core_base.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/target/target_core_base.h	2011-11-15 20:03:00.000000000 -0500
-@@ -364,7 +364,7 @@ struct t10_reservation_ops {
+diff -urNp linux-3.1.1/include/target/target_core_base.h linux-3.1.1/include/target/target_core_base.h
+--- linux-3.1.1/include/target/target_core_base.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/target/target_core_base.h	2011-11-16 18:39:08.000000000 -0500
+@@ -356,7 +356,7 @@ struct t10_reservation_ops {
  	int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
  	int (*t10_pr_register)(struct se_cmd *);
  	int (*t10_pr_clear)(struct se_cmd *);
 -};
 +} __no_const;
  
- struct t10_reservation_template {
+ struct t10_reservation {
  	/* Reservation effects all target ports */
-@@ -432,8 +432,8 @@ struct se_transport_task {
+@@ -496,8 +496,8 @@ struct se_cmd {
  	atomic_t		t_task_cdbs_left;
  	atomic_t		t_task_cdbs_ex_left;
  	atomic_t		t_task_cdbs_timeout_left;
@@ -61621,7 +61480,7 @@ diff -urNp linux-3.0.9/include/target/target_core_base.h linux-3.0.9/include/tar
  	atomic_t		t_transport_active;
  	atomic_t		t_transport_complete;
  	atomic_t		t_transport_queue_active;
-@@ -774,7 +774,7 @@ struct se_device {
+@@ -744,7 +744,7 @@ struct se_device {
  	atomic_t		active_cmds;
  	atomic_t		simple_cmds;
  	atomic_t		depth_left;
@@ -61630,9 +61489,9 @@ diff -urNp linux-3.0.9/include/target/target_core_base.h linux-3.0.9/include/tar
  	atomic_t		dev_tur_active;
  	atomic_t		execute_tasks;
  	atomic_t		dev_status_thr_count;
-diff -urNp linux-3.0.9/include/trace/events/irq.h linux-3.0.9/include/trace/events/irq.h
---- linux-3.0.9/include/trace/events/irq.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/trace/events/irq.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/trace/events/irq.h linux-3.1.1/include/trace/events/irq.h
+--- linux-3.1.1/include/trace/events/irq.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/trace/events/irq.h	2011-11-16 18:39:08.000000000 -0500
 @@ -36,7 +36,7 @@ struct softirq_action;
   */
  TRACE_EVENT(irq_handler_entry,
@@ -61651,9 +61510,9 @@ diff -urNp linux-3.0.9/include/trace/events/irq.h linux-3.0.9/include/trace/even
  
  	TP_ARGS(irq, action, ret),
  
-diff -urNp linux-3.0.9/include/video/udlfb.h linux-3.0.9/include/video/udlfb.h
---- linux-3.0.9/include/video/udlfb.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/video/udlfb.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/video/udlfb.h linux-3.1.1/include/video/udlfb.h
+--- linux-3.1.1/include/video/udlfb.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/video/udlfb.h	2011-11-16 18:39:08.000000000 -0500
 @@ -51,10 +51,10 @@ struct dlfb_data {
  	int base8;
  	u32 pseudo_palette[256];
@@ -61669,9 +61528,9 @@ diff -urNp linux-3.0.9/include/video/udlfb.h linux-3.0.9/include/video/udlfb.h
  };
  
  #define NR_USB_REQUEST_I2C_SUB_IO 0x02
-diff -urNp linux-3.0.9/include/video/uvesafb.h linux-3.0.9/include/video/uvesafb.h
---- linux-3.0.9/include/video/uvesafb.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/video/uvesafb.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/include/video/uvesafb.h linux-3.1.1/include/video/uvesafb.h
+--- linux-3.1.1/include/video/uvesafb.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/video/uvesafb.h	2011-11-16 18:39:08.000000000 -0500
 @@ -177,6 +177,7 @@ struct uvesafb_par {
  	u8 ypan;			/* 0 - nothing, 1 - ypan, 2 - ywrap */
  	u8 pmi_setpal;			/* PMI for palette changes */
@@ -61680,9 +61539,9 @@ diff -urNp linux-3.0.9/include/video/uvesafb.h linux-3.0.9/include/video/uvesafb
  	void *pmi_start;
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
-diff -urNp linux-3.0.9/init/do_mounts.c linux-3.0.9/init/do_mounts.c
---- linux-3.0.9/init/do_mounts.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/do_mounts.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/init/do_mounts.c linux-3.1.1/init/do_mounts.c
+--- linux-3.1.1/init/do_mounts.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/do_mounts.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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)
@@ -61728,9 +61587,9 @@ diff -urNp linux-3.0.9/init/do_mounts.c linux-3.0.9/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.9/init/do_mounts.h linux-3.0.9/init/do_mounts.h
---- linux-3.0.9/init/do_mounts.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/do_mounts.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/init/do_mounts.h linux-3.1.1/init/do_mounts.h
+--- linux-3.1.1/init/do_mounts.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/do_mounts.h	2011-11-16 18:39:08.000000000 -0500
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
@@ -61759,9 +61618,9 @@ diff -urNp linux-3.0.9/init/do_mounts.h linux-3.0.9/init/do_mounts.h
  		return 0;
  	if (!S_ISBLK(stat.st_mode))
  		return 0;
-diff -urNp linux-3.0.9/init/do_mounts_initrd.c linux-3.0.9/init/do_mounts_initrd.c
---- linux-3.0.9/init/do_mounts_initrd.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/do_mounts_initrd.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/init/do_mounts_initrd.c linux-3.1.1/init/do_mounts_initrd.c
+--- linux-3.1.1/init/do_mounts_initrd.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/do_mounts_initrd.c	2011-11-16 18:39:08.000000000 -0500
 @@ -44,13 +44,13 @@ static void __init handle_initrd(void)
  	create_dev("/dev/root.old", Root_RAM0);
  	/* mount initrd on rootfs' /root */
@@ -61836,9 +61695,9 @@ diff -urNp linux-3.0.9/init/do_mounts_initrd.c linux-3.0.9/init/do_mounts_initrd
 +	sys_unlink((const char __force_user *)"/initrd.image");
  	return 0;
  }
-diff -urNp linux-3.0.9/init/do_mounts_md.c linux-3.0.9/init/do_mounts_md.c
---- linux-3.0.9/init/do_mounts_md.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/do_mounts_md.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/init/do_mounts_md.c linux-3.1.1/init/do_mounts_md.c
+--- linux-3.1.1/init/do_mounts_md.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/do_mounts_md.c	2011-11-16 18:39:08.000000000 -0500
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
  			partitioned ? "_d" : "", minor,
  			md_setup_args[ent].device_names);
@@ -61866,9 +61725,9 @@ diff -urNp linux-3.0.9/init/do_mounts_md.c linux-3.0.9/init/do_mounts_md.c
  	if (fd >= 0) {
  		sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
  		sys_close(fd);
-diff -urNp linux-3.0.9/init/initramfs.c linux-3.0.9/init/initramfs.c
---- linux-3.0.9/init/initramfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/initramfs.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/init/initramfs.c linux-3.1.1/init/initramfs.c
+--- linux-3.1.1/init/initramfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/initramfs.c	2011-11-16 18:39:08.000000000 -0500
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
  	}
  }
@@ -61977,10 +61836,10 @@ diff -urNp linux-3.0.9/init/initramfs.c linux-3.0.9/init/initramfs.c
  	state = SkipIt;
  	next_state = Reset;
  	return 0;
-diff -urNp linux-3.0.9/init/Kconfig linux-3.0.9/init/Kconfig
---- linux-3.0.9/init/Kconfig	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/Kconfig	2011-11-15 20:03:00.000000000 -0500
-@@ -1195,7 +1195,7 @@ config SLUB_DEBUG
+diff -urNp linux-3.1.1/init/Kconfig linux-3.1.1/init/Kconfig
+--- linux-3.1.1/init/Kconfig	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/Kconfig	2011-11-16 18:39:08.000000000 -0500
+@@ -1202,7 +1202,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
  	bool "Disable heap randomization"
@@ -61989,9 +61848,9 @@ diff -urNp linux-3.0.9/init/Kconfig linux-3.0.9/init/Kconfig
  	help
  	  Randomizing heap placement makes heap exploits harder, but it
  	  also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-3.0.9/init/main.c linux-3.0.9/init/main.c
---- linux-3.0.9/init/main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/main.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/init/main.c linux-3.1.1/init/main.c
+--- linux-3.1.1/init/main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/main.c	2011-11-16 18:40:44.000000000 -0500
 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) 
  extern void tc_init(void);
  #endif
@@ -62051,7 +61910,7 @@ diff -urNp linux-3.0.9/init/main.c linux-3.0.9/init/main.c
  static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
  const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
  static const char *panic_later, *panic_param;
-@@ -667,6 +712,7 @@ int __init_or_module do_one_initcall(ini
+@@ -678,6 +723,7 @@ int __init_or_module do_one_initcall(ini
  {
  	int count = preempt_count();
  	int ret;
@@ -62059,7 +61918,7 @@ diff -urNp linux-3.0.9/init/main.c linux-3.0.9/init/main.c
  
  	if (initcall_debug)
  		ret = do_one_initcall_debug(fn);
-@@ -679,15 +725,15 @@ int __init_or_module do_one_initcall(ini
+@@ -690,15 +736,15 @@ int __init_or_module do_one_initcall(ini
  		sprintf(msgbuf, "error code %d ", ret);
  
  	if (preempt_count() != count) {
@@ -62079,7 +61938,7 @@ diff -urNp linux-3.0.9/init/main.c linux-3.0.9/init/main.c
  	}
  
  	return ret;
-@@ -805,7 +851,7 @@ static int __init kernel_init(void * unu
+@@ -817,7 +863,7 @@ static int __init kernel_init(void * unu
  	do_basic_setup();
  
  	/* Open the /dev/console on the rootfs, this should never fail */
@@ -62088,7 +61947,7 @@ diff -urNp linux-3.0.9/init/main.c linux-3.0.9/init/main.c
  		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
  
  	(void) sys_dup(0);
-@@ -818,11 +864,13 @@ static int __init kernel_init(void * unu
+@@ -830,11 +876,13 @@ static int __init kernel_init(void * unu
  	if (!ramdisk_execute_command)
  		ramdisk_execute_command = "/init";
  
@@ -62103,9 +61962,9 @@ diff -urNp linux-3.0.9/init/main.c linux-3.0.9/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.9/ipc/mqueue.c linux-3.0.9/ipc/mqueue.c
---- linux-3.0.9/ipc/mqueue.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/ipc/mqueue.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/ipc/mqueue.c linux-3.1.1/ipc/mqueue.c
+--- linux-3.1.1/ipc/mqueue.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/ipc/mqueue.c	2011-11-16 18:40:44.000000000 -0500
 @@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(st
  		mq_bytes = (mq_msg_tblsz +
  			(info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -62114,9 +61973,9 @@ diff -urNp linux-3.0.9/ipc/mqueue.c linux-3.0.9/ipc/mqueue.c
  		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.9/ipc/msg.c linux-3.0.9/ipc/msg.c
---- linux-3.0.9/ipc/msg.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/ipc/msg.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/ipc/msg.c linux-3.1.1/ipc/msg.c
+--- linux-3.1.1/ipc/msg.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/ipc/msg.c	2011-11-16 18:39:08.000000000 -0500
 @@ -309,18 +309,19 @@ static inline int msg_security(struct ke
  	return security_msg_queue_associate(msq, msgflg);
  }
@@ -62142,9 +62001,9 @@ diff -urNp linux-3.0.9/ipc/msg.c linux-3.0.9/ipc/msg.c
  	msg_params.key = key;
  	msg_params.flg = msgflg;
  
-diff -urNp linux-3.0.9/ipc/sem.c linux-3.0.9/ipc/sem.c
---- linux-3.0.9/ipc/sem.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/ipc/sem.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/ipc/sem.c linux-3.1.1/ipc/sem.c
+--- linux-3.1.1/ipc/sem.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/ipc/sem.c	2011-11-16 18:40:44.000000000 -0500
 @@ -318,10 +318,15 @@ static inline int sem_more_checks(struct
  	return 0;
  }
@@ -62173,7 +62032,7 @@ diff -urNp linux-3.0.9/ipc/sem.c linux-3.0.9/ipc/sem.c
  	sem_params.key = key;
  	sem_params.flg = semflg;
  	sem_params.u.nsems = nsems;
-@@ -854,6 +855,8 @@ static int semctl_main(struct ipc_namesp
+@@ -848,6 +849,8 @@ static int semctl_main(struct ipc_namesp
  	int nsems;
  	struct list_head tasks;
  
@@ -62182,7 +62041,7 @@ diff -urNp linux-3.0.9/ipc/sem.c linux-3.0.9/ipc/sem.c
  	sma = sem_lock_check(ns, semid);
  	if (IS_ERR(sma))
  		return PTR_ERR(sma);
-@@ -1301,6 +1304,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, 
+@@ -1295,6 +1298,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, 
  	struct ipc_namespace *ns;
  	struct list_head tasks;
  
@@ -62191,9 +62050,9 @@ diff -urNp linux-3.0.9/ipc/sem.c linux-3.0.9/ipc/sem.c
  	ns = current->nsproxy->ipc_ns;
  
  	if (nsops < 1 || semid < 0)
-diff -urNp linux-3.0.9/ipc/shm.c linux-3.0.9/ipc/shm.c
---- linux-3.0.9/ipc/shm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/ipc/shm.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/ipc/shm.c linux-3.1.1/ipc/shm.c
+--- linux-3.1.1/ipc/shm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/ipc/shm.c	2011-11-16 18:40:44.000000000 -0500
 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
  static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
  #endif
@@ -62209,7 +62068,7 @@ diff -urNp linux-3.0.9/ipc/shm.c linux-3.0.9/ipc/shm.c
  void shm_init_ns(struct ipc_namespace *ns)
  {
  	ns->shm_ctlmax = SHMMAX;
-@@ -401,6 +409,14 @@ static int newseg(struct ipc_namespace *
+@@ -508,6 +516,14 @@ static int newseg(struct ipc_namespace *
  	shp->shm_lprid = 0;
  	shp->shm_atim = shp->shm_dtim = 0;
  	shp->shm_ctim = get_seconds();
@@ -62224,7 +62083,7 @@ diff -urNp linux-3.0.9/ipc/shm.c linux-3.0.9/ipc/shm.c
  	shp->shm_segsz = size;
  	shp->shm_nattch = 0;
  	shp->shm_file = file;
-@@ -451,18 +467,19 @@ static inline int shm_more_checks(struct
+@@ -559,18 +575,19 @@ static inline int shm_more_checks(struct
  	return 0;
  }
  
@@ -62249,7 +62108,7 @@ diff -urNp linux-3.0.9/ipc/shm.c linux-3.0.9/ipc/shm.c
  	shm_params.key = key;
  	shm_params.flg = shmflg;
  	shm_params.u.size = size;
-@@ -762,8 +779,6 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int,
+@@ -870,8 +887,6 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int,
  	case SHM_LOCK:
  	case SHM_UNLOCK:
  	{
@@ -62258,7 +62117,7 @@ diff -urNp linux-3.0.9/ipc/shm.c linux-3.0.9/ipc/shm.c
  		lru_add_drain_all();  /* drain pagevecs to lru lists */
  
  		shp = shm_lock_check(ns, shmid);
-@@ -896,9 +911,21 @@ long do_shmat(int shmid, char __user *sh
+@@ -1004,9 +1019,21 @@ long do_shmat(int shmid, char __user *sh
  	if (err)
  		goto out_unlock;
  
@@ -62280,9 +62139,9 @@ diff -urNp linux-3.0.9/ipc/shm.c linux-3.0.9/ipc/shm.c
  	size = i_size_read(path.dentry->d_inode);
  	shm_unlock(shp);
  
-diff -urNp linux-3.0.9/kernel/acct.c linux-3.0.9/kernel/acct.c
---- linux-3.0.9/kernel/acct.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/acct.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/acct.c linux-3.1.1/kernel/acct.c
+--- linux-3.1.1/kernel/acct.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/acct.c	2011-11-16 18:39:08.000000000 -0500
 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
  	 */
  	flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -62292,10 +62151,10 @@ diff -urNp linux-3.0.9/kernel/acct.c linux-3.0.9/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.9/kernel/audit.c linux-3.0.9/kernel/audit.c
---- linux-3.0.9/kernel/audit.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/audit.c	2011-11-15 20:03:00.000000000 -0500
-@@ -112,7 +112,7 @@ u32		audit_sig_sid = 0;
+diff -urNp linux-3.1.1/kernel/audit.c linux-3.1.1/kernel/audit.c
+--- linux-3.1.1/kernel/audit.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/audit.c	2011-11-16 18:39:08.000000000 -0500
+@@ -115,7 +115,7 @@ u32		audit_sig_sid = 0;
     3) suppressed due to audit_rate_limit
     4) suppressed due to audit_backlog_limit
  */
@@ -62304,7 +62163,7 @@ diff -urNp linux-3.0.9/kernel/audit.c linux-3.0.9/kernel/audit.c
  
  /* The netlink socket. */
  static struct sock *audit_sock;
-@@ -234,7 +234,7 @@ void audit_log_lost(const char *message)
+@@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
  	unsigned long		now;
  	int			print;
  
@@ -62313,7 +62172,7 @@ diff -urNp linux-3.0.9/kernel/audit.c linux-3.0.9/kernel/audit.c
  
  	print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
  
-@@ -253,7 +253,7 @@ void audit_log_lost(const char *message)
+@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
  			printk(KERN_WARNING
  				"audit: audit_lost=%d audit_rate_limit=%d "
  				"audit_backlog_limit=%d\n",
@@ -62322,7 +62181,7 @@ diff -urNp linux-3.0.9/kernel/audit.c linux-3.0.9/kernel/audit.c
  				audit_rate_limit,
  				audit_backlog_limit);
  		audit_panic(message);
-@@ -686,7 +686,7 @@ static int audit_receive_msg(struct sk_b
+@@ -689,7 +689,7 @@ static int audit_receive_msg(struct sk_b
  		status_set.pid		 = audit_pid;
  		status_set.rate_limit	 = audit_rate_limit;
  		status_set.backlog_limit = audit_backlog_limit;
@@ -62331,9 +62190,9 @@ diff -urNp linux-3.0.9/kernel/audit.c linux-3.0.9/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.9/kernel/auditsc.c linux-3.0.9/kernel/auditsc.c
---- linux-3.0.9/kernel/auditsc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/auditsc.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/auditsc.c linux-3.1.1/kernel/auditsc.c
+--- linux-3.1.1/kernel/auditsc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/auditsc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_conte
  }
  
@@ -62352,9 +62211,9 @@ diff -urNp linux-3.0.9/kernel/auditsc.c linux-3.0.9/kernel/auditsc.c
  	struct audit_context *context = task->audit_context;
  
  	if (context && context->in_syscall) {
-diff -urNp linux-3.0.9/kernel/capability.c linux-3.0.9/kernel/capability.c
---- linux-3.0.9/kernel/capability.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/capability.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/capability.c linux-3.1.1/kernel/capability.c
+--- linux-3.1.1/kernel/capability.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/capability.c	2011-11-16 18:40:44.000000000 -0500
 @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
  		 * before modification is attempted and the application
  		 * fails.
@@ -62415,10 +62274,10 @@ diff -urNp linux-3.0.9/kernel/capability.c linux-3.0.9/kernel/capability.c
  /**
   * nsown_capable - Check superior capability to one's own user_ns
   * @cap: The capability in question
-diff -urNp linux-3.0.9/kernel/cgroup.c linux-3.0.9/kernel/cgroup.c
---- linux-3.0.9/kernel/cgroup.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/cgroup.c	2011-11-15 20:03:00.000000000 -0500
-@@ -593,6 +593,8 @@ static struct css_set *find_css_set(
+diff -urNp linux-3.1.1/kernel/cgroup.c linux-3.1.1/kernel/cgroup.c
+--- linux-3.1.1/kernel/cgroup.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/cgroup.c	2011-11-16 18:40:44.000000000 -0500
+@@ -595,6 +595,8 @@ static struct css_set *find_css_set(
  	struct hlist_head *hhead;
  	struct cg_cgroup_link *link;
  
@@ -62427,9 +62286,9 @@ diff -urNp linux-3.0.9/kernel/cgroup.c linux-3.0.9/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.9/kernel/compat.c linux-3.0.9/kernel/compat.c
---- linux-3.0.9/kernel/compat.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/compat.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/compat.c linux-3.1.1/kernel/compat.c
+--- linux-3.1.1/kernel/compat.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/compat.c	2011-11-16 18:40:44.000000000 -0500
 @@ -13,6 +13,7 @@
  
  #include <linux/linkage.h>
@@ -62438,7 +62297,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  #include <linux/errno.h>
  #include <linux/time.h>
  #include <linux/signal.h>
-@@ -166,7 +167,7 @@ static long compat_nanosleep_restart(str
+@@ -167,7 +168,7 @@ static long compat_nanosleep_restart(str
  	mm_segment_t oldfs;
  	long ret;
  
@@ -62447,7 +62306,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	ret = hrtimer_nanosleep_restart(restart);
-@@ -198,7 +199,7 @@ asmlinkage long compat_sys_nanosleep(str
+@@ -199,7 +200,7 @@ asmlinkage long compat_sys_nanosleep(str
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	ret = hrtimer_nanosleep(&tu,
@@ -62456,7 +62315,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  				HRTIMER_MODE_REL, CLOCK_MONOTONIC);
  	set_fs(oldfs);
  
-@@ -307,7 +308,7 @@ asmlinkage long compat_sys_sigpending(co
+@@ -308,7 +309,7 @@ asmlinkage long compat_sys_sigpending(co
  	mm_segment_t old_fs = get_fs();
  
  	set_fs(KERNEL_DS);
@@ -62465,7 +62324,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	set_fs(old_fs);
  	if (ret == 0)
  		ret = put_user(s, set);
-@@ -330,8 +331,8 @@ asmlinkage long compat_sys_sigprocmask(i
+@@ -331,8 +332,8 @@ asmlinkage long compat_sys_sigprocmask(i
  	old_fs = get_fs();
  	set_fs(KERNEL_DS);
  	ret = sys_sigprocmask(how,
@@ -62476,7 +62335,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	set_fs(old_fs);
  	if (ret == 0)
  		if (oset)
-@@ -368,7 +369,7 @@ asmlinkage long compat_sys_old_getrlimit
+@@ -369,7 +370,7 @@ asmlinkage long compat_sys_old_getrlimit
  	mm_segment_t old_fs = get_fs();
  
  	set_fs(KERNEL_DS);
@@ -62485,7 +62344,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	set_fs(old_fs);
  
  	if (!ret) {
-@@ -440,7 +441,7 @@ asmlinkage long compat_sys_getrusage(int
+@@ -441,7 +442,7 @@ asmlinkage long compat_sys_getrusage(int
  	mm_segment_t old_fs = get_fs();
  
  	set_fs(KERNEL_DS);
@@ -62494,7 +62353,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	set_fs(old_fs);
  
  	if (ret)
-@@ -467,8 +468,8 @@ compat_sys_wait4(compat_pid_t pid, compa
+@@ -468,8 +469,8 @@ compat_sys_wait4(compat_pid_t pid, compa
  		set_fs (KERNEL_DS);
  		ret = sys_wait4(pid,
  				(stat_addr ?
@@ -62505,7 +62364,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  		set_fs (old_fs);
  
  		if (ret > 0) {
-@@ -493,8 +494,8 @@ asmlinkage long compat_sys_waitid(int wh
+@@ -494,8 +495,8 @@ asmlinkage long compat_sys_waitid(int wh
  	memset(&info, 0, sizeof(info));
  
  	set_fs(KERNEL_DS);
@@ -62516,7 +62375,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	set_fs(old_fs);
  
  	if ((ret < 0) || (info.si_signo == 0))
-@@ -624,8 +625,8 @@ long compat_sys_timer_settime(timer_t ti
+@@ -625,8 +626,8 @@ long compat_sys_timer_settime(timer_t ti
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = sys_timer_settime(timer_id, flags,
@@ -62527,7 +62386,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	set_fs(oldfs);
  	if (!err && old && put_compat_itimerspec(old, &oldts))
  		return -EFAULT;
-@@ -642,7 +643,7 @@ long compat_sys_timer_gettime(timer_t ti
+@@ -643,7 +644,7 @@ long compat_sys_timer_gettime(timer_t ti
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = sys_timer_gettime(timer_id,
@@ -62536,7 +62395,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	set_fs(oldfs);
  	if (!err && put_compat_itimerspec(setting, &ts))
  		return -EFAULT;
-@@ -661,7 +662,7 @@ long compat_sys_clock_settime(clockid_t 
+@@ -662,7 +663,7 @@ long compat_sys_clock_settime(clockid_t 
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = sys_clock_settime(which_clock,
@@ -62545,7 +62404,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	set_fs(oldfs);
  	return err;
  }
-@@ -676,7 +677,7 @@ long compat_sys_clock_gettime(clockid_t 
+@@ -677,7 +678,7 @@ long compat_sys_clock_gettime(clockid_t 
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = sys_clock_gettime(which_clock,
@@ -62554,7 +62413,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	set_fs(oldfs);
  	if (!err && put_compat_timespec(&ts, tp))
  		return -EFAULT;
-@@ -696,7 +697,7 @@ long compat_sys_clock_adjtime(clockid_t 
+@@ -697,7 +698,7 @@ long compat_sys_clock_adjtime(clockid_t 
  
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
@@ -62563,7 +62422,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	set_fs(oldfs);
  
  	err = compat_put_timex(utp, &txc);
-@@ -716,7 +717,7 @@ long compat_sys_clock_getres(clockid_t w
+@@ -717,7 +718,7 @@ long compat_sys_clock_getres(clockid_t w
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = sys_clock_getres(which_clock,
@@ -62572,7 +62431,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	set_fs(oldfs);
  	if (!err && tp && put_compat_timespec(&ts, tp))
  		return -EFAULT;
-@@ -728,9 +729,9 @@ static long compat_clock_nanosleep_resta
+@@ -729,9 +730,9 @@ static long compat_clock_nanosleep_resta
  	long err;
  	mm_segment_t oldfs;
  	struct timespec tu;
@@ -62584,7 +62443,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = clock_nanosleep_restart(restart);
-@@ -762,8 +763,8 @@ long compat_sys_clock_nanosleep(clockid_
+@@ -763,8 +764,8 @@ long compat_sys_clock_nanosleep(clockid_
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = sys_clock_nanosleep(which_clock, flags,
@@ -62595,9 +62454,9 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
  	set_fs(oldfs);
  
  	if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
-diff -urNp linux-3.0.9/kernel/configs.c linux-3.0.9/kernel/configs.c
---- linux-3.0.9/kernel/configs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/configs.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/configs.c linux-3.1.1/kernel/configs.c
+--- linux-3.1.1/kernel/configs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/configs.c	2011-11-16 18:40:44.000000000 -0500
 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
  	struct proc_dir_entry *entry;
  
@@ -62618,9 +62477,9 @@ diff -urNp linux-3.0.9/kernel/configs.c linux-3.0.9/kernel/configs.c
  	if (!entry)
  		return -ENOMEM;
  
-diff -urNp linux-3.0.9/kernel/cred.c linux-3.0.9/kernel/cred.c
---- linux-3.0.9/kernel/cred.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/cred.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/cred.c linux-3.1.1/kernel/cred.c
+--- linux-3.1.1/kernel/cred.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/cred.c	2011-11-16 18:40:44.000000000 -0500
 @@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head
   */
  void __put_cred(struct cred *cred)
@@ -62702,20 +62561,7 @@ diff -urNp linux-3.0.9/kernel/cred.c linux-3.0.9/kernel/cred.c
  	/* dumpability changes */
  	if (old->euid != new->euid ||
  	    old->egid != new->egid ||
-@@ -508,10 +526,8 @@ int commit_creds(struct cred *new)
- 		key_fsgid_changed(task);
- 
- 	/* do it
--	 * - What if a process setreuid()'s and this brings the
--	 *   new uid over his NPROC rlimit?  We can check this now
--	 *   cheaply with the new uid cache, so if it matters
--	 *   we should be checking for it.  -DaveM
-+	 * RLIMIT_NPROC limits on user->processes have already been checked
-+	 * in set_user().
- 	 */
- 	alter_cred_subscribers(new, 2);
- 	if (new->user != old->user)
-@@ -551,6 +567,8 @@ EXPORT_SYMBOL(commit_creds);
+@@ -549,6 +567,8 @@ EXPORT_SYMBOL(commit_creds);
   */
  void abort_creds(struct cred *new)
  {
@@ -62724,7 +62570,7 @@ diff -urNp linux-3.0.9/kernel/cred.c linux-3.0.9/kernel/cred.c
  	kdebug("abort_creds(%p{%d,%d})", new,
  	       atomic_read(&new->usage),
  	       read_cred_subscribers(new));
-@@ -574,6 +592,8 @@ const struct cred *override_creds(const 
+@@ -572,6 +592,8 @@ const struct cred *override_creds(const 
  {
  	const struct cred *old = current->cred;
  
@@ -62733,7 +62579,7 @@ diff -urNp linux-3.0.9/kernel/cred.c linux-3.0.9/kernel/cred.c
  	kdebug("override_creds(%p{%d,%d})", new,
  	       atomic_read(&new->usage),
  	       read_cred_subscribers(new));
-@@ -603,6 +623,8 @@ void revert_creds(const struct cred *old
+@@ -601,6 +623,8 @@ void revert_creds(const struct cred *old
  {
  	const struct cred *override = current->cred;
  
@@ -62742,7 +62588,7 @@ diff -urNp linux-3.0.9/kernel/cred.c linux-3.0.9/kernel/cred.c
  	kdebug("revert_creds(%p{%d,%d})", old,
  	       atomic_read(&old->usage),
  	       read_cred_subscribers(old));
-@@ -649,6 +671,8 @@ struct cred *prepare_kernel_cred(struct 
+@@ -647,6 +671,8 @@ struct cred *prepare_kernel_cred(struct 
  	const struct cred *old;
  	struct cred *new;
  
@@ -62751,7 +62597,7 @@ diff -urNp linux-3.0.9/kernel/cred.c linux-3.0.9/kernel/cred.c
  	new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
  	if (!new)
  		return NULL;
-@@ -703,6 +727,8 @@ EXPORT_SYMBOL(prepare_kernel_cred);
+@@ -701,6 +727,8 @@ EXPORT_SYMBOL(prepare_kernel_cred);
   */
  int set_security_override(struct cred *new, u32 secid)
  {
@@ -62760,7 +62606,7 @@ diff -urNp linux-3.0.9/kernel/cred.c linux-3.0.9/kernel/cred.c
  	return security_kernel_act_as(new, secid);
  }
  EXPORT_SYMBOL(set_security_override);
-@@ -722,6 +748,8 @@ int set_security_override_from_ctx(struc
+@@ -720,6 +748,8 @@ int set_security_override_from_ctx(struc
  	u32 secid;
  	int ret;
  
@@ -62769,9 +62615,9 @@ diff -urNp linux-3.0.9/kernel/cred.c linux-3.0.9/kernel/cred.c
  	ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
  	if (ret < 0)
  		return ret;
-diff -urNp linux-3.0.9/kernel/debug/debug_core.c linux-3.0.9/kernel/debug/debug_core.c
---- linux-3.0.9/kernel/debug/debug_core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/debug/debug_core.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/debug/debug_core.c linux-3.1.1/kernel/debug/debug_core.c
+--- linux-3.1.1/kernel/debug/debug_core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/debug/debug_core.c	2011-11-16 18:39:08.000000000 -0500
 @@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_loc
   */
  static atomic_t			masters_in_kgdb;
@@ -62832,9 +62678,9 @@ diff -urNp linux-3.0.9/kernel/debug/debug_core.c linux-3.0.9/kernel/debug/debug_
  	tasklet_schedule(&kgdb_tasklet_breakpoint);
  }
  EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
-diff -urNp linux-3.0.9/kernel/debug/kdb/kdb_main.c linux-3.0.9/kernel/debug/kdb/kdb_main.c
---- linux-3.0.9/kernel/debug/kdb/kdb_main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/debug/kdb/kdb_main.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/debug/kdb/kdb_main.c linux-3.1.1/kernel/debug/kdb/kdb_main.c
+--- linux-3.1.1/kernel/debug/kdb/kdb_main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/debug/kdb/kdb_main.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
  	list_for_each_entry(mod, kdb_modules, list) {
  
@@ -62853,10 +62699,10 @@ diff -urNp linux-3.0.9/kernel/debug/kdb/kdb_main.c linux-3.0.9/kernel/debug/kdb/
  
  #ifdef CONFIG_MODULE_UNLOAD
  		{
-diff -urNp linux-3.0.9/kernel/events/core.c linux-3.0.9/kernel/events/core.c
---- linux-3.0.9/kernel/events/core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/events/core.c	2011-11-15 20:03:00.000000000 -0500
-@@ -170,7 +170,7 @@ int perf_proc_update_handler(struct ctl_
+diff -urNp linux-3.1.1/kernel/events/core.c linux-3.1.1/kernel/events/core.c
+--- linux-3.1.1/kernel/events/core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/events/core.c	2011-11-16 18:39:08.000000000 -0500
+@@ -172,7 +172,7 @@ int perf_proc_update_handler(struct ctl_
  	return 0;
  }
  
@@ -62865,7 +62711,7 @@ diff -urNp linux-3.0.9/kernel/events/core.c linux-3.0.9/kernel/events/core.c
  
  static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
  			      enum event_type_t event_type);
-@@ -2488,7 +2488,7 @@ static void __perf_event_read(void *info
+@@ -2535,7 +2535,7 @@ static void __perf_event_read(void *info
  
  static inline u64 perf_event_count(struct perf_event *event)
  {
@@ -62874,7 +62720,7 @@ diff -urNp linux-3.0.9/kernel/events/core.c linux-3.0.9/kernel/events/core.c
  }
  
  static u64 perf_event_read(struct perf_event *event)
-@@ -3023,9 +3023,9 @@ u64 perf_event_read_value(struct perf_ev
+@@ -3060,9 +3060,9 @@ u64 perf_event_read_value(struct perf_ev
  	mutex_lock(&event->child_mutex);
  	total += perf_event_read(event);
  	*enabled += event->total_time_enabled +
@@ -62886,20 +62732,20 @@ diff -urNp linux-3.0.9/kernel/events/core.c linux-3.0.9/kernel/events/core.c
  
  	list_for_each_entry(child, &event->child_list, child_list) {
  		total += perf_event_read(child);
-@@ -3388,10 +3388,10 @@ void perf_event_update_userpage(struct p
+@@ -3448,10 +3448,10 @@ void perf_event_update_userpage(struct p
  		userpg->offset -= local64_read(&event->hw.prev_count);
  
- 	userpg->time_enabled = event->total_time_enabled +
+ 	userpg->time_enabled = enabled +
 -			atomic64_read(&event->child_total_time_enabled);
 +			atomic64_read_unchecked(&event->child_total_time_enabled);
  
- 	userpg->time_running = event->total_time_running +
+ 	userpg->time_running = running +
 -			atomic64_read(&event->child_total_time_running);
 +			atomic64_read_unchecked(&event->child_total_time_running);
  
  	barrier();
  	++userpg->lock;
-@@ -4188,11 +4188,11 @@ static void perf_output_read_one(struct 
+@@ -3822,11 +3822,11 @@ static void perf_output_read_one(struct 
  	values[n++] = perf_event_count(event);
  	if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
  		values[n++] = enabled +
@@ -62913,7 +62759,7 @@ diff -urNp linux-3.0.9/kernel/events/core.c linux-3.0.9/kernel/events/core.c
  	}
  	if (read_format & PERF_FORMAT_ID)
  		values[n++] = primary_event_id(event);
-@@ -4833,12 +4833,12 @@ static void perf_event_mmap_event(struct
+@@ -4477,12 +4477,12 @@ static void perf_event_mmap_event(struct
  		 * need to add enough zero bytes after the string to handle
  		 * the 64bit alignment we do later.
  		 */
@@ -62928,7 +62774,7 @@ diff -urNp linux-3.0.9/kernel/events/core.c linux-3.0.9/kernel/events/core.c
  		if (IS_ERR(name)) {
  			name = strncpy(tmp, "//toolong", sizeof(tmp));
  			goto got_name;
-@@ -6190,7 +6190,7 @@ perf_event_alloc(struct perf_event_attr 
+@@ -5833,7 +5833,7 @@ perf_event_alloc(struct perf_event_attr 
  	event->parent		= parent_event;
  
  	event->ns		= get_pid_ns(current->nsproxy->pid_ns);
@@ -62937,7 +62783,7 @@ diff -urNp linux-3.0.9/kernel/events/core.c linux-3.0.9/kernel/events/core.c
  
  	event->state		= PERF_EVENT_STATE_INACTIVE;
  
-@@ -6713,10 +6713,10 @@ static void sync_child_event(struct perf
+@@ -6355,10 +6355,10 @@ static void sync_child_event(struct perf
  	/*
  	 * Add back the child's count to the parent's count:
  	 */
@@ -62951,9 +62797,9 @@ diff -urNp linux-3.0.9/kernel/events/core.c linux-3.0.9/kernel/events/core.c
  		     &parent_event->child_total_time_running);
  
  	/*
-diff -urNp linux-3.0.9/kernel/exit.c linux-3.0.9/kernel/exit.c
---- linux-3.0.9/kernel/exit.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/exit.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/exit.c linux-3.1.1/kernel/exit.c
+--- linux-3.1.1/kernel/exit.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/exit.c	2011-11-16 19:33:48.000000000 -0500
 @@ -57,6 +57,10 @@
  #include <asm/pgtable.h>
  #include <asm/mmu_context.h>
@@ -62965,7 +62811,7 @@ diff -urNp linux-3.0.9/kernel/exit.c linux-3.0.9/kernel/exit.c
  static void exit_mm(struct task_struct * tsk);
  
  static void __unhash_process(struct task_struct *p, bool group_dead)
-@@ -169,6 +173,10 @@ void release_task(struct task_struct * p
+@@ -168,6 +172,10 @@ void release_task(struct task_struct * p
  	struct task_struct *leader;
  	int zap_leader;
  repeat:
@@ -62973,10 +62819,10 @@ diff -urNp linux-3.0.9/kernel/exit.c linux-3.0.9/kernel/exit.c
 +	gr_del_task_from_ip_table(p);
 +#endif
 +
- 	tracehook_prepare_release_task(p);
  	/* don't need to get the RCU readlock here - the process is dead and
  	 * can't be modifying its own credentials. But shut RCU-lockdep up */
-@@ -338,11 +346,22 @@ static void reparent_to_kthreadd(void)
+ 	rcu_read_lock();
+@@ -324,11 +332,22 @@ static void reparent_to_kthreadd(void)
  {
  	write_lock_irq(&tasklist_lock);
  
@@ -62999,7 +62845,7 @@ diff -urNp linux-3.0.9/kernel/exit.c linux-3.0.9/kernel/exit.c
  	/* Set the exit signal to SIGCHLD so we signal init on exit */
  	current->exit_signal = SIGCHLD;
  
-@@ -394,7 +413,7 @@ int allow_signal(int sig)
+@@ -380,7 +399,7 @@ int allow_signal(int sig)
  	 * know it'll be handled, so that they don't get converted to
  	 * SIGKILL or just silently dropped.
  	 */
@@ -63008,7 +62854,7 @@ diff -urNp linux-3.0.9/kernel/exit.c linux-3.0.9/kernel/exit.c
  	recalc_sigpending();
  	spin_unlock_irq(&current->sighand->siglock);
  	return 0;
-@@ -430,6 +449,17 @@ void daemonize(const char *name, ...)
+@@ -416,6 +435,17 @@ void daemonize(const char *name, ...)
  	vsnprintf(current->comm, sizeof(current->comm), name, args);
  	va_end(args);
  
@@ -63026,38 +62872,24 @@ diff -urNp linux-3.0.9/kernel/exit.c linux-3.0.9/kernel/exit.c
  	/*
  	 * If we were started as result of loading a module, close all of the
  	 * user space pages.  We don't need them, and if we didn't close them
-@@ -904,15 +934,8 @@ NORET_TYPE void do_exit(long code)
+@@ -895,6 +925,8 @@ NORET_TYPE void do_exit(long code)
  	struct task_struct *tsk = current;
  	int group_dead;
  
--	profile_task_exit(tsk);
--
--	WARN_ON(atomic_read(&tsk->fs_excl));
--	WARN_ON(blk_needs_flush_plug(tsk));
--
- 	if (unlikely(in_interrupt()))
- 		panic("Aiee, killing interrupt handler!");
--	if (unlikely(!tsk->pid))
--		panic("Attempted to kill the idle task!");
++	set_fs(USER_DS);
++
+ 	profile_task_exit(tsk);
  
- 	/*
- 	 * If do_exit is called because this processes oopsed, it's possible
-@@ -923,6 +946,14 @@ NORET_TYPE void do_exit(long code)
+ 	WARN_ON(blk_needs_flush_plug(tsk));
+@@ -911,7 +943,6 @@ NORET_TYPE void do_exit(long code)
+ 	 * mm_release()->clear_child_tid() from writing to a user-controlled
+ 	 * kernel address.
  	 */
- 	set_fs(USER_DS);
+-	set_fs(USER_DS);
  
-+	profile_task_exit(tsk);
-+
-+	WARN_ON(atomic_read(&tsk->fs_excl));
-+	WARN_ON(blk_needs_flush_plug(tsk));
-+
-+	if (unlikely(!tsk->pid))
-+		panic("Attempted to kill the idle task!");
-+
- 	tracehook_report_exit(&code);
+ 	ptrace_event(PTRACE_EVENT_EXIT, code);
  
- 	validate_creds_for_do_exit(tsk);
-@@ -983,6 +1014,9 @@ NORET_TYPE void do_exit(long code)
+@@ -973,6 +1004,9 @@ NORET_TYPE void do_exit(long code)
  	tsk->exit_code = code;
  	taskstats_exit(tsk, group_dead);
  
@@ -63067,10 +62899,10 @@ diff -urNp linux-3.0.9/kernel/exit.c linux-3.0.9/kernel/exit.c
  	exit_mm(tsk);
  
  	if (group_dead)
-diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
---- linux-3.0.9/kernel/fork.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/fork.c	2011-11-15 20:03:00.000000000 -0500
-@@ -286,7 +286,7 @@ static struct task_struct *dup_task_stru
+diff -urNp linux-3.1.1/kernel/fork.c linux-3.1.1/kernel/fork.c
+--- linux-3.1.1/kernel/fork.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/fork.c	2011-11-16 19:36:31.000000000 -0500
+@@ -285,7 +285,7 @@ static struct task_struct *dup_task_stru
  	*stackend = STACK_END_MAGIC;	/* for overflow detection */
  
  #ifdef CONFIG_CC_STACKPROTECTOR
@@ -63078,8 +62910,8 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
 +	tsk->stack_canary = pax_get_random_long();
  #endif
  
- 	/* One for us, one for whoever does the "release_task()" (usually parent) */
-@@ -308,13 +308,77 @@ out:
+ 	/*
+@@ -309,13 +309,77 @@ out:
  }
  
  #ifdef CONFIG_MMU
@@ -63159,7 +62991,7 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
  
  	down_write(&oldmm->mmap_sem);
  	flush_cache_dup_mm(oldmm);
-@@ -326,8 +390,8 @@ static int dup_mmap(struct mm_struct *mm
+@@ -327,8 +391,8 @@ static int dup_mmap(struct mm_struct *mm
  	mm->locked_vm = 0;
  	mm->mmap = NULL;
  	mm->mmap_cache = NULL;
@@ -63170,7 +63002,7 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
  	mm->map_count = 0;
  	cpumask_clear(mm_cpumask(mm));
  	mm->mm_rb = RB_ROOT;
-@@ -343,8 +407,6 @@ static int dup_mmap(struct mm_struct *mm
+@@ -344,8 +408,6 @@ static int dup_mmap(struct mm_struct *mm
  
  	prev = NULL;
  	for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
@@ -63179,7 +63011,7 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
  		if (mpnt->vm_flags & VM_DONTCOPY) {
  			long pages = vma_pages(mpnt);
  			mm->total_vm -= pages;
-@@ -352,55 +414,13 @@ static int dup_mmap(struct mm_struct *mm
+@@ -353,55 +415,13 @@ static int dup_mmap(struct mm_struct *mm
  								-pages);
  			continue;
  		}
@@ -63239,7 +63071,7 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
  		 * Link in the new vma and copy the page table entries.
  		 */
  		*pprev = tmp;
-@@ -421,6 +441,31 @@ static int dup_mmap(struct mm_struct *mm
+@@ -422,6 +442,31 @@ static int dup_mmap(struct mm_struct *mm
  		if (retval)
  			goto out;
  	}
@@ -63271,7 +63103,7 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
  	/* a new mm has just been created */
  	arch_dup_mmap(oldmm, mm);
  	retval = 0;
-@@ -429,14 +474,6 @@ out:
+@@ -430,14 +475,6 @@ out:
  	flush_tlb_mm(oldmm);
  	up_write(&oldmm->mmap_sem);
  	return retval;
@@ -63285,8 +63117,8 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
 -	goto out;
  }
  
- static inline int mm_alloc_pgd(struct mm_struct * mm)
-@@ -836,13 +873,14 @@ static int copy_fs(unsigned long clone_f
+ static inline int mm_alloc_pgd(struct mm_struct *mm)
+@@ -837,13 +874,14 @@ static int copy_fs(unsigned long clone_f
  			spin_unlock(&fs->lock);
  			return -EAGAIN;
  		}
@@ -63302,7 +63134,7 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
  	return 0;
  }
  
-@@ -1104,12 +1142,16 @@ static struct task_struct *copy_process(
+@@ -1105,6 +1143,9 @@ static struct task_struct *copy_process(
  	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
  #endif
  	retval = -EAGAIN;
@@ -63311,17 +63143,8 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
 +
  	if (atomic_read(&p->real_cred->user->processes) >=
  			task_rlimit(p, RLIMIT_NPROC)) {
--		if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
--		    p->real_cred->user != INIT_USER)
-+		if (p->real_cred->user != INIT_USER &&
-+		    !capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE))
- 			goto bad_fork_free;
- 	}
-+	current->flags &= ~PF_NPROC_EXCEEDED;
- 
- 	retval = copy_creds(p, clone_flags);
- 	if (retval < 0)
-@@ -1250,6 +1292,8 @@ static struct task_struct *copy_process(
+ 		if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
+@@ -1264,6 +1305,8 @@ static struct task_struct *copy_process(
  	if (clone_flags & CLONE_THREAD)
  		p->tgid = current->tgid;
  
@@ -63330,7 +63153,7 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
  	p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
  	/*
  	 * Clear TID on mm_release()?
-@@ -1414,6 +1458,8 @@ bad_fork_cleanup_count:
+@@ -1428,6 +1471,8 @@ bad_fork_cleanup_count:
  bad_fork_free:
  	free_task(p);
  fork_out:
@@ -63339,7 +63162,7 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
  	return ERR_PTR(retval);
  }
  
-@@ -1502,6 +1548,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1528,6 +1573,8 @@ long do_fork(unsigned long clone_flags,
  		if (clone_flags & CLONE_PARENT_SETTID)
  			put_user(nr, parent_tidptr);
  
@@ -63348,7 +63171,7 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
  		if (clone_flags & CLONE_VFORK) {
  			p->vfork_done = &vfork;
  			init_completion(&vfork);
-@@ -1610,7 +1658,7 @@ static int unshare_fs(unsigned long unsh
+@@ -1637,7 +1684,7 @@ static int unshare_fs(unsigned long unsh
  		return 0;
  
  	/* don't need lock here; in the worst case we'll do useless copy */
@@ -63357,7 +63180,7 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
  		return 0;
  
  	*new_fsp = copy_fs_struct(fs);
-@@ -1697,7 +1745,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, 
+@@ -1726,7 +1773,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, 
  			fs = current->fs;
  			spin_lock(&fs->lock);
  			current->fs = new_fs;
@@ -63367,9 +63190,9 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
  				new_fs = NULL;
  			else
  				new_fs = fs;
-diff -urNp linux-3.0.9/kernel/futex.c linux-3.0.9/kernel/futex.c
---- linux-3.0.9/kernel/futex.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/futex.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/futex.c linux-3.1.1/kernel/futex.c
+--- linux-3.1.1/kernel/futex.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/futex.c	2011-11-16 18:40:44.000000000 -0500
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -63456,10 +63279,10 @@ diff -urNp linux-3.0.9/kernel/futex.c linux-3.0.9/kernel/futex.c
 +	set_fs(oldfs);
  
  	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.9/kernel/futex_compat.c linux-3.0.9/kernel/futex_compat.c
---- linux-3.0.9/kernel/futex_compat.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/futex_compat.c	2011-11-15 20:03:00.000000000 -0500
+ 		plist_head_init(&futex_queues[i].chain);
+diff -urNp linux-3.1.1/kernel/futex_compat.c linux-3.1.1/kernel/futex_compat.c
+--- linux-3.1.1/kernel/futex_compat.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/futex_compat.c	2011-11-16 18:40:44.000000000 -0500
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -63499,9 +63322,9 @@ diff -urNp linux-3.0.9/kernel/futex_compat.c linux-3.0.9/kernel/futex_compat.c
  		head = p->compat_robust_list;
  		rcu_read_unlock();
  	}
-diff -urNp linux-3.0.9/kernel/gcov/base.c linux-3.0.9/kernel/gcov/base.c
---- linux-3.0.9/kernel/gcov/base.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/gcov/base.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/gcov/base.c linux-3.1.1/kernel/gcov/base.c
+--- linux-3.1.1/kernel/gcov/base.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/gcov/base.c	2011-11-16 18:39:08.000000000 -0500
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -63523,9 +63346,9 @@ diff -urNp linux-3.0.9/kernel/gcov/base.c linux-3.0.9/kernel/gcov/base.c
  			if (prev)
  				prev->next = info->next;
  			else
-diff -urNp linux-3.0.9/kernel/hrtimer.c linux-3.0.9/kernel/hrtimer.c
---- linux-3.0.9/kernel/hrtimer.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/hrtimer.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/hrtimer.c linux-3.1.1/kernel/hrtimer.c
+--- linux-3.1.1/kernel/hrtimer.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/hrtimer.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
  	local_irq_restore(flags);
  }
@@ -63535,9 +63358,9 @@ diff -urNp linux-3.0.9/kernel/hrtimer.c linux-3.0.9/kernel/hrtimer.c
  {
  	hrtimer_peek_ahead_timers();
  }
-diff -urNp linux-3.0.9/kernel/jump_label.c linux-3.0.9/kernel/jump_label.c
---- linux-3.0.9/kernel/jump_label.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/jump_label.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/jump_label.c linux-3.1.1/kernel/jump_label.c
+--- linux-3.1.1/kernel/jump_label.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/jump_label.c	2011-11-16 18:39:08.000000000 -0500
 @@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entr
  
  	size = (((unsigned long)stop - (unsigned long)start)
@@ -63561,9 +63384,9 @@ diff -urNp linux-3.0.9/kernel/jump_label.c linux-3.0.9/kernel/jump_label.c
  }
  
  static int
-diff -urNp linux-3.0.9/kernel/kallsyms.c linux-3.0.9/kernel/kallsyms.c
---- linux-3.0.9/kernel/kallsyms.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/kallsyms.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/kallsyms.c linux-3.1.1/kernel/kallsyms.c
+--- linux-3.1.1/kernel/kallsyms.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/kallsyms.c	2011-11-16 18:40:44.000000000 -0500
 @@ -11,6 +11,9 @@
   *      Changed the compression method from stem compression to "table lookup"
   *      compression (see scripts/kallsyms.c for a more complete description)
@@ -63666,9 +63489,9 @@ diff -urNp linux-3.0.9/kernel/kallsyms.c linux-3.0.9/kernel/kallsyms.c
  	if (!iter)
  		return -ENOMEM;
  	reset_iter(iter, 0);
-diff -urNp linux-3.0.9/kernel/kexec.c linux-3.0.9/kernel/kexec.c
---- linux-3.0.9/kernel/kexec.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/kexec.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/kexec.c linux-3.1.1/kernel/kexec.c
+--- linux-3.1.1/kernel/kexec.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/kexec.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1033,7 +1033,8 @@ asmlinkage long compat_sys_kexec_load(un
  				unsigned long flags)
  {
@@ -63679,9 +63502,9 @@ diff -urNp linux-3.0.9/kernel/kexec.c linux-3.0.9/kernel/kexec.c
  	unsigned long i, result;
  
  	/* Don't allow clients that don't understand the native
-diff -urNp linux-3.0.9/kernel/kmod.c linux-3.0.9/kernel/kmod.c
---- linux-3.0.9/kernel/kmod.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/kmod.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/kmod.c linux-3.1.1/kernel/kmod.c
+--- linux-3.1.1/kernel/kmod.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/kmod.c	2011-11-16 18:40:44.000000000 -0500
 @@ -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.
@@ -63787,9 +63610,9 @@ diff -urNp linux-3.0.9/kernel/kmod.c linux-3.0.9/kernel/kmod.c
  
  		/*
  		 * If ret is 0, either ____call_usermodehelper failed and the
-diff -urNp linux-3.0.9/kernel/kprobes.c linux-3.0.9/kernel/kprobes.c
---- linux-3.0.9/kernel/kprobes.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/kprobes.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/kprobes.c linux-3.1.1/kernel/kprobes.c
+--- linux-3.1.1/kernel/kprobes.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/kprobes.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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.
@@ -63808,7 +63631,7 @@ diff -urNp linux-3.0.9/kernel/kprobes.c linux-3.0.9/kernel/kprobes.c
  			kfree(kip);
  		}
  		return 1;
-@@ -1936,7 +1936,7 @@ static int __init init_kprobes(void)
+@@ -1949,7 +1949,7 @@ static int __init init_kprobes(void)
  {
  	int i, err = 0;
  	unsigned long offset = 0, size = 0;
@@ -63817,7 +63640,7 @@ diff -urNp linux-3.0.9/kernel/kprobes.c linux-3.0.9/kernel/kprobes.c
  	const char *symbol_name;
  	void *addr;
  	struct kprobe_blackpoint *kb;
-@@ -2062,7 +2062,7 @@ static int __kprobes show_kprobe_addr(st
+@@ -2075,7 +2075,7 @@ static int __kprobes show_kprobe_addr(st
  	const char *sym = NULL;
  	unsigned int i = *(loff_t *) v;
  	unsigned long offset = 0;
@@ -63826,9 +63649,9 @@ diff -urNp linux-3.0.9/kernel/kprobes.c linux-3.0.9/kernel/kprobes.c
  
  	head = &kprobe_table[i];
  	preempt_disable();
-diff -urNp linux-3.0.9/kernel/lockdep.c linux-3.0.9/kernel/lockdep.c
---- linux-3.0.9/kernel/lockdep.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/lockdep.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/lockdep.c linux-3.1.1/kernel/lockdep.c
+--- linux-3.1.1/kernel/lockdep.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/lockdep.c	2011-11-16 18:39:08.000000000 -0500
 @@ -583,6 +583,10 @@ static int static_obj(void *obj)
  		      end   = (unsigned long) &_end,
  		      addr  = (unsigned long) obj;
@@ -63848,7 +63671,7 @@ diff -urNp linux-3.0.9/kernel/lockdep.c linux-3.0.9/kernel/lockdep.c
  		printk("the code is fine but needs lockdep annotation.\n");
  		printk("turning off the locking correctness validator.\n");
  		dump_stack();
-@@ -2936,7 +2941,7 @@ static int __lock_acquire(struct lockdep
+@@ -2948,7 +2953,7 @@ static int __lock_acquire(struct lockdep
  		if (!class)
  			return 0;
  	}
@@ -63857,9 +63680,9 @@ diff -urNp linux-3.0.9/kernel/lockdep.c linux-3.0.9/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.9/kernel/lockdep_proc.c linux-3.0.9/kernel/lockdep_proc.c
---- linux-3.0.9/kernel/lockdep_proc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/lockdep_proc.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/lockdep_proc.c linux-3.1.1/kernel/lockdep_proc.c
+--- linux-3.1.1/kernel/lockdep_proc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/lockdep_proc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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)
@@ -63869,9 +63692,9 @@ diff -urNp linux-3.0.9/kernel/lockdep_proc.c linux-3.0.9/kernel/lockdep_proc.c
  	const char *name = class->name;
  
  	if (!name) {
-diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
---- linux-3.0.9/kernel/module.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/module.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/module.c linux-3.1.1/kernel/module.c
+--- linux-3.1.1/kernel/module.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/module.c	2011-11-16 18:40:44.000000000 -0500
 @@ -58,6 +58,7 @@
  #include <linux/jump_label.h>
  #include <linux/pfn.h>
@@ -63917,7 +63740,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  		printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
  		       mod->name, align, PAGE_SIZE);
  		align = PAGE_SIZE;
-@@ -1166,7 +1168,7 @@ resolve_symbol_wait(struct module *mod,
+@@ -1183,7 +1185,7 @@ resolve_symbol_wait(struct module *mod,
   */
  #ifdef CONFIG_SYSFS
  
@@ -63926,7 +63749,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  static inline bool sect_empty(const Elf_Shdr *sect)
  {
  	return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
-@@ -1632,21 +1634,21 @@ static void set_section_ro_nx(void *base
+@@ -1649,21 +1651,21 @@ static void set_section_ro_nx(void *base
  
  static void unset_module_core_ro_nx(struct module *mod)
  {
@@ -63956,7 +63779,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  		set_memory_rw);
  }
  
-@@ -1657,14 +1659,14 @@ void set_all_modules_text_rw(void)
+@@ -1674,14 +1676,14 @@ void set_all_modules_text_rw(void)
  
  	mutex_lock(&module_mutex);
  	list_for_each_entry_rcu(mod, &modules, list) {
@@ -63977,7 +63800,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  						set_memory_rw);
  		}
  	}
-@@ -1678,14 +1680,14 @@ void set_all_modules_text_ro(void)
+@@ -1695,14 +1697,14 @@ void set_all_modules_text_ro(void)
  
  	mutex_lock(&module_mutex);
  	list_for_each_entry_rcu(mod, &modules, list) {
@@ -63998,7 +63821,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  						set_memory_ro);
  		}
  	}
-@@ -1722,16 +1724,19 @@ static void free_module(struct module *m
+@@ -1748,16 +1750,19 @@ static void free_module(struct module *m
  
  	/* This may be NULL, but that's OK */
  	unset_module_init_ro_nx(mod);
@@ -64021,7 +63844,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  
  #ifdef CONFIG_MPU
  	update_protections(current->mm);
-@@ -1800,10 +1805,31 @@ static int simplify_symbols(struct modul
+@@ -1826,10 +1831,31 @@ static int simplify_symbols(struct modul
  	unsigned int i;
  	int ret = 0;
  	const struct kernel_symbol *ksym;
@@ -64053,7 +63876,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  		switch (sym[i].st_shndx) {
  		case SHN_COMMON:
  			/* We compiled with -fno-common.  These are not
-@@ -1824,7 +1850,9 @@ static int simplify_symbols(struct modul
+@@ -1850,7 +1876,9 @@ static int simplify_symbols(struct modul
  			ksym = resolve_symbol_wait(mod, info, name);
  			/* Ok if resolved.  */
  			if (ksym && !IS_ERR(ksym)) {
@@ -64063,7 +63886,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  				break;
  			}
  
-@@ -1843,11 +1871,20 @@ static int simplify_symbols(struct modul
+@@ -1869,11 +1897,20 @@ static int simplify_symbols(struct modul
  				secbase = (unsigned long)mod_percpu(mod);
  			else
  				secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
@@ -64084,7 +63907,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  	return ret;
  }
  
-@@ -1931,22 +1968,12 @@ static void layout_sections(struct modul
+@@ -1977,22 +2014,12 @@ static void layout_sections(struct modul
  			    || s->sh_entsize != ~0UL
  			    || strstarts(sname, ".init"))
  				continue;
@@ -64111,7 +63934,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  	}
  
  	DEBUGP("Init section allocation order:\n");
-@@ -1960,23 +1987,13 @@ static void layout_sections(struct modul
+@@ -2006,23 +2033,13 @@ static void layout_sections(struct modul
  			    || s->sh_entsize != ~0UL
  			    || !strstarts(sname, ".init"))
  				continue;
@@ -64140,7 +63963,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  	}
  }
  
-@@ -2141,7 +2158,7 @@ static void layout_symtab(struct module 
+@@ -2187,7 +2204,7 @@ static void layout_symtab(struct module 
  
  	/* Put symbol section at end of init part of module. */
  	symsect->sh_flags |= SHF_ALLOC;
@@ -64149,7 +63972,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  					 info->index.sym) | INIT_OFFSET_MASK;
  	DEBUGP("\t%s\n", info->secstrings + symsect->sh_name);
  
-@@ -2158,19 +2175,19 @@ static void layout_symtab(struct module 
+@@ -2204,19 +2221,19 @@ static void layout_symtab(struct module 
  		}
  
  	/* Append room for core symbols at end of core part. */
@@ -64174,7 +63997,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  }
  
  static void add_kallsyms(struct module *mod, const struct load_info *info)
-@@ -2186,11 +2203,13 @@ static void add_kallsyms(struct module *
+@@ -2232,11 +2249,13 @@ static void add_kallsyms(struct module *
  	/* Make sure we get permanent strtab: don't use info->strtab. */
  	mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
  
@@ -64189,7 +64012,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  	src = mod->symtab;
  	*dst = *src;
  	for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
-@@ -2203,10 +2222,12 @@ static void add_kallsyms(struct module *
+@@ -2249,10 +2268,12 @@ static void add_kallsyms(struct module *
  	}
  	mod->core_num_syms = ndst;
  
@@ -64203,8 +64026,8 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  }
  #else
  static inline void layout_symtab(struct module *mod, struct load_info *info)
-@@ -2235,17 +2256,33 @@ static void dynamic_debug_remove(struct 
- 		ddebug_remove_module(debug->modname);
+@@ -2286,17 +2307,33 @@ void * __weak module_alloc(unsigned long
+ 	return size == 0 ? NULL : vmalloc_exec(size);
  }
  
 -static void *module_alloc_update_bounds(unsigned long size)
@@ -64242,7 +64065,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  		mutex_unlock(&module_mutex);
  	}
  	return ret;
-@@ -2538,7 +2575,7 @@ static int move_module(struct module *mo
+@@ -2589,7 +2626,7 @@ static int move_module(struct module *mo
  	void *ptr;
  
  	/* Do the allocs. */
@@ -64251,7 +64074,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  	/*
  	 * The pointer to this block is stored in the module structure
  	 * which is inside the block. Just mark it as not being a
-@@ -2548,23 +2585,50 @@ static int move_module(struct module *mo
+@@ -2599,23 +2636,50 @@ static int move_module(struct module *mo
  	if (!ptr)
  		return -ENOMEM;
  
@@ -64310,7 +64133,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  
  	/* Transfer each section which specifies SHF_ALLOC */
  	DEBUGP("final section addresses:\n");
-@@ -2575,16 +2639,45 @@ static int move_module(struct module *mo
+@@ -2626,16 +2690,45 @@ static int move_module(struct module *mo
  		if (!(shdr->sh_flags & SHF_ALLOC))
  			continue;
  
@@ -64363,7 +64186,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  		DEBUGP("\t0x%lx %s\n",
  		       shdr->sh_addr, info->secstrings + shdr->sh_name);
  	}
-@@ -2635,12 +2728,12 @@ static void flush_module_icache(const st
+@@ -2686,12 +2779,12 @@ static void flush_module_icache(const st
  	 * Do it before processing of module parameters, so the module
  	 * can provide parameter accessor functions of its own.
  	 */
@@ -64382,7 +64205,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  
  	set_fs(old_fs);
  }
-@@ -2712,8 +2805,10 @@ static void module_deallocate(struct mod
+@@ -2771,8 +2864,10 @@ static void module_deallocate(struct mod
  {
  	kfree(info->strmap);
  	percpu_modfree(mod);
@@ -64394,8 +64217,8 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
 +	module_free(mod, mod->module_core_rw);
  }
  
- static int post_relocation(struct module *mod, const struct load_info *info)
-@@ -2770,9 +2865,38 @@ static struct module *load_module(void _
+ int __weak module_finalize(const Elf_Ehdr *hdr,
+@@ -2836,9 +2931,38 @@ static struct module *load_module(void _
  	if (err)
  		goto free_unload;
  
@@ -64434,7 +64257,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  	/* Fix up syms, so that st_value is a pointer to location. */
  	err = simplify_symbols(mod, &info);
  	if (err < 0)
-@@ -2788,13 +2912,6 @@ static struct module *load_module(void _
+@@ -2854,13 +2978,6 @@ static struct module *load_module(void _
  
  	flush_module_icache(mod);
  
@@ -64448,7 +64271,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  	/* Mark state as coming so strong_try_module_get() ignores us. */
  	mod->state = MODULE_STATE_COMING;
  
-@@ -2854,11 +2971,10 @@ static struct module *load_module(void _
+@@ -2920,11 +3037,10 @@ static struct module *load_module(void _
   unlock:
  	mutex_unlock(&module_mutex);
  	synchronize_sched();
@@ -64461,7 +64284,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
   free_unload:
  	module_unload_free(mod);
   free_module:
-@@ -2899,16 +3015,16 @@ SYSCALL_DEFINE3(init_module, void __user
+@@ -2965,16 +3081,16 @@ SYSCALL_DEFINE3(init_module, void __user
  			MODULE_STATE_COMING, mod);
  
  	/* Set RO and NX regions for core */
@@ -64486,7 +64309,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  
  	do_mod_ctors(mod);
  	/* Start the module */
-@@ -2954,11 +3070,12 @@ SYSCALL_DEFINE3(init_module, void __user
+@@ -3020,11 +3136,12 @@ SYSCALL_DEFINE3(init_module, void __user
  	mod->strtab = mod->core_strtab;
  #endif
  	unset_module_init_ro_nx(mod);
@@ -64504,7 +64327,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  	mutex_unlock(&module_mutex);
  
  	return 0;
-@@ -2989,10 +3106,16 @@ static const char *get_ksymbol(struct mo
+@@ -3055,10 +3172,16 @@ static const char *get_ksymbol(struct mo
  	unsigned long nextval;
  
  	/* At worse, next value is at end of module */
@@ -64524,7 +64347,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  
  	/* Scan for closest preceding symbol, and next symbol. (ELF
  	   starts real symbols at 1). */
-@@ -3238,7 +3361,7 @@ static int m_show(struct seq_file *m, vo
+@@ -3304,7 +3427,7 @@ static int m_show(struct seq_file *m, vo
  	char buf[8];
  
  	seq_printf(m, "%s %u",
@@ -64533,7 +64356,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  	print_unload_info(m, mod);
  
  	/* Informative for users. */
-@@ -3247,7 +3370,7 @@ static int m_show(struct seq_file *m, vo
+@@ -3313,7 +3436,7 @@ static int m_show(struct seq_file *m, vo
  		   mod->state == MODULE_STATE_COMING ? "Loading":
  		   "Live");
  	/* Used by oprofile and other similar tools. */
@@ -64542,7 +64365,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  
  	/* Taints info */
  	if (mod->taints)
-@@ -3283,7 +3406,17 @@ static const struct file_operations proc
+@@ -3349,7 +3472,17 @@ static const struct file_operations proc
  
  static int __init proc_modules_init(void)
  {
@@ -64560,7 +64383,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  	return 0;
  }
  module_init(proc_modules_init);
-@@ -3342,12 +3475,12 @@ struct module *__module_address(unsigned
+@@ -3408,12 +3541,12 @@ struct module *__module_address(unsigned
  {
  	struct module *mod;
  
@@ -64576,7 +64399,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  			return mod;
  	return NULL;
  }
-@@ -3381,11 +3514,20 @@ bool is_module_text_address(unsigned lon
+@@ -3447,11 +3580,20 @@ bool is_module_text_address(unsigned lon
   */
  struct module *__module_text_address(unsigned long addr)
  {
@@ -64600,9 +64423,9 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
  			mod = NULL;
  	}
  	return mod;
-diff -urNp linux-3.0.9/kernel/mutex.c linux-3.0.9/kernel/mutex.c
---- linux-3.0.9/kernel/mutex.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/mutex.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/mutex.c linux-3.1.1/kernel/mutex.c
+--- linux-3.1.1/kernel/mutex.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/mutex.c	2011-11-16 18:39:08.000000000 -0500
 @@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, 
  	spin_lock_mutex(&lock->wait_lock, flags);
  
@@ -64631,9 +64454,9 @@ diff -urNp linux-3.0.9/kernel/mutex.c linux-3.0.9/kernel/mutex.c
  	mutex_set_owner(lock);
  
  	/* set it to 0 if there are no waiters left: */
-diff -urNp linux-3.0.9/kernel/mutex-debug.c linux-3.0.9/kernel/mutex-debug.c
---- linux-3.0.9/kernel/mutex-debug.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/mutex-debug.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/mutex-debug.c linux-3.1.1/kernel/mutex-debug.c
+--- linux-3.1.1/kernel/mutex-debug.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/mutex-debug.c	2011-11-16 18:39:08.000000000 -0500
 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
  }
  
@@ -64662,9 +64485,9 @@ diff -urNp linux-3.0.9/kernel/mutex-debug.c linux-3.0.9/kernel/mutex-debug.c
  
  	list_del_init(&waiter->list);
  	waiter->task = NULL;
-diff -urNp linux-3.0.9/kernel/mutex-debug.h linux-3.0.9/kernel/mutex-debug.h
---- linux-3.0.9/kernel/mutex-debug.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/mutex-debug.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/mutex-debug.h linux-3.1.1/kernel/mutex-debug.h
+--- linux-3.1.1/kernel/mutex-debug.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/mutex-debug.h	2011-11-16 18:39:08.000000000 -0500
 @@ -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,
@@ -64677,9 +64500,9 @@ diff -urNp linux-3.0.9/kernel/mutex-debug.h linux-3.0.9/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.9/kernel/padata.c linux-3.0.9/kernel/padata.c
---- linux-3.0.9/kernel/padata.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/padata.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/padata.c linux-3.1.1/kernel/padata.c
+--- linux-3.1.1/kernel/padata.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/padata.c	2011-11-16 18:39:08.000000000 -0500
 @@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins
  	padata->pd = pd;
  	padata->cb_cpu = cb_cpu;
@@ -64703,10 +64526,10 @@ diff -urNp linux-3.0.9/kernel/padata.c linux-3.0.9/kernel/padata.c
  	atomic_set(&pd->reorder_objects, 0);
  	atomic_set(&pd->refcnt, 0);
  	pd->pinst = pinst;
-diff -urNp linux-3.0.9/kernel/panic.c linux-3.0.9/kernel/panic.c
---- linux-3.0.9/kernel/panic.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/panic.c	2011-11-15 20:03:00.000000000 -0500
-@@ -369,7 +369,7 @@ static void warn_slowpath_common(const c
+diff -urNp linux-3.1.1/kernel/panic.c linux-3.1.1/kernel/panic.c
+--- linux-3.1.1/kernel/panic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/panic.c	2011-11-16 18:40:44.000000000 -0500
+@@ -371,7 +371,7 @@ static void warn_slowpath_common(const c
  	const char *board;
  
  	printk(KERN_WARNING "------------[ cut here ]------------\n");
@@ -64715,7 +64538,7 @@ diff -urNp linux-3.0.9/kernel/panic.c linux-3.0.9/kernel/panic.c
  	board = dmi_get_system_info(DMI_PRODUCT_NAME);
  	if (board)
  		printk(KERN_WARNING "Hardware name: %s\n", board);
-@@ -424,7 +424,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
+@@ -426,7 +426,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
   */
  void __stack_chk_fail(void)
  {
@@ -64725,9 +64548,9 @@ diff -urNp linux-3.0.9/kernel/panic.c linux-3.0.9/kernel/panic.c
  		__builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-3.0.9/kernel/pid.c linux-3.0.9/kernel/pid.c
---- linux-3.0.9/kernel/pid.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/pid.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/pid.c linux-3.1.1/kernel/pid.c
+--- linux-3.1.1/kernel/pid.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/pid.c	2011-11-16 18:40:44.000000000 -0500
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -64745,7 +64568,7 @@ diff -urNp linux-3.0.9/kernel/pid.c linux-3.0.9/kernel/pid.c
  
  int pid_max_min = RESERVED_PIDS + 1;
  int pid_max_max = PID_MAX_LIMIT;
-@@ -419,8 +420,15 @@ EXPORT_SYMBOL(pid_task);
+@@ -418,8 +419,15 @@ EXPORT_SYMBOL(pid_task);
   */
  struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
  {
@@ -64762,7 +64585,7 @@ diff -urNp linux-3.0.9/kernel/pid.c linux-3.0.9/kernel/pid.c
  }
  
  struct task_struct *find_task_by_vpid(pid_t vnr)
-@@ -428,6 +436,12 @@ struct task_struct *find_task_by_vpid(pi
+@@ -427,6 +435,12 @@ struct task_struct *find_task_by_vpid(pi
  	return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
  }
  
@@ -64775,9 +64598,9 @@ diff -urNp linux-3.0.9/kernel/pid.c linux-3.0.9/kernel/pid.c
  struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
  {
  	struct pid *pid;
-diff -urNp linux-3.0.9/kernel/posix-cpu-timers.c linux-3.0.9/kernel/posix-cpu-timers.c
---- linux-3.0.9/kernel/posix-cpu-timers.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/posix-cpu-timers.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/posix-cpu-timers.c linux-3.1.1/kernel/posix-cpu-timers.c
+--- linux-3.1.1/kernel/posix-cpu-timers.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/posix-cpu-timers.c	2011-11-16 18:40:44.000000000 -0500
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -64803,9 +64626,9 @@ diff -urNp linux-3.0.9/kernel/posix-cpu-timers.c linux-3.0.9/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.9/kernel/posix-timers.c linux-3.0.9/kernel/posix-timers.c
---- linux-3.0.9/kernel/posix-timers.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/posix-timers.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/posix-timers.c linux-3.1.1/kernel/posix-timers.c
+--- linux-3.1.1/kernel/posix-timers.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/posix-timers.c	2011-11-16 18:40:44.000000000 -0500
 @@ -43,6 +43,7 @@
  #include <linux/idr.h>
  #include <linux/posix-clock.h>
@@ -64909,9 +64732,9 @@ diff -urNp linux-3.0.9/kernel/posix-timers.c linux-3.0.9/kernel/posix-timers.c
  	return kc->clock_set(which_clock, &new_tp);
  }
  
-diff -urNp linux-3.0.9/kernel/power/poweroff.c linux-3.0.9/kernel/power/poweroff.c
---- linux-3.0.9/kernel/power/poweroff.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/power/poweroff.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/power/poweroff.c linux-3.1.1/kernel/power/poweroff.c
+--- linux-3.1.1/kernel/power/poweroff.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/power/poweroff.c	2011-11-16 18:39:08.000000000 -0500
 @@ -37,7 +37,7 @@ static struct sysrq_key_op	sysrq_powerof
  	.enable_mask	= SYSRQ_ENABLE_BOOT,
  };
@@ -64921,9 +64744,9 @@ diff -urNp linux-3.0.9/kernel/power/poweroff.c linux-3.0.9/kernel/power/poweroff
  {
  	register_sysrq_key('o', &sysrq_poweroff_op);
  	return 0;
-diff -urNp linux-3.0.9/kernel/power/process.c linux-3.0.9/kernel/power/process.c
---- linux-3.0.9/kernel/power/process.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/power/process.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/power/process.c linux-3.1.1/kernel/power/process.c
+--- linux-3.1.1/kernel/power/process.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/power/process.c	2011-11-16 18:39:08.000000000 -0500
 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
  	u64 elapsed_csecs64;
  	unsigned int elapsed_csecs;
@@ -64966,10 +64789,10 @@ diff -urNp linux-3.0.9/kernel/power/process.c linux-3.0.9/kernel/power/process.c
  			break;
  
  		if (pm_wakeup_pending()) {
-diff -urNp linux-3.0.9/kernel/printk.c linux-3.0.9/kernel/printk.c
---- linux-3.0.9/kernel/printk.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/printk.c	2011-11-15 20:03:00.000000000 -0500
-@@ -313,12 +313,17 @@ static int check_syslog_permissions(int 
+diff -urNp linux-3.1.1/kernel/printk.c linux-3.1.1/kernel/printk.c
+--- linux-3.1.1/kernel/printk.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/printk.c	2011-11-16 19:38:11.000000000 -0500
+@@ -313,6 +313,11 @@ static int check_syslog_permissions(int 
  	if (from_file && type != SYSLOG_ACTION_OPEN)
  		return 0;
  
@@ -64981,16 +64804,9 @@ diff -urNp linux-3.0.9/kernel/printk.c linux-3.0.9/kernel/printk.c
  	if (syslog_action_restricted(type)) {
  		if (capable(CAP_SYSLOG))
  			return 0;
- 		/* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
- 		if (capable(CAP_SYS_ADMIN)) {
--			WARN_ONCE(1, "Attempt to access syslog with CAP_SYS_ADMIN "
-+			printk_once(KERN_WARNING "Attempt to access syslog with CAP_SYS_ADMIN "
- 				 "but no CAP_SYSLOG (deprecated).\n");
- 			return 0;
- 		}
-diff -urNp linux-3.0.9/kernel/profile.c linux-3.0.9/kernel/profile.c
---- linux-3.0.9/kernel/profile.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/profile.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/profile.c linux-3.1.1/kernel/profile.c
+--- linux-3.1.1/kernel/profile.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/profile.c	2011-11-16 18:39:08.000000000 -0500
 @@ -39,7 +39,7 @@ struct profile_hit {
  /* Oprofile timer tick hook */
  static int (*timer_hook)(struct pt_regs *) __read_mostly;
@@ -65048,10 +64864,10 @@ diff -urNp linux-3.0.9/kernel/profile.c linux-3.0.9/kernel/profile.c
  	return count;
  }
  
-diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
---- linux-3.0.9/kernel/ptrace.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/ptrace.c	2011-11-15 20:03:00.000000000 -0500
-@@ -132,7 +132,8 @@ int ptrace_check_attach(struct task_stru
+diff -urNp linux-3.1.1/kernel/ptrace.c linux-3.1.1/kernel/ptrace.c
+--- linux-3.1.1/kernel/ptrace.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/ptrace.c	2011-11-16 19:50:22.000000000 -0500
+@@ -161,7 +161,8 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
  
@@ -65061,7 +64877,7 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
  {
  	const struct cred *cred = current_cred(), *tcred;
  
-@@ -158,7 +159,8 @@ int __ptrace_may_access(struct task_stru
+@@ -187,7 +188,8 @@ int __ptrace_may_access(struct task_stru
  	     cred->gid == tcred->sgid &&
  	     cred->gid == tcred->gid))
  		goto ok;
@@ -65071,7 +64887,7 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
  		goto ok;
  	rcu_read_unlock();
  	return -EPERM;
-@@ -167,7 +169,9 @@ ok:
+@@ -196,7 +198,9 @@ ok:
  	smp_rmb();
  	if (task->mm)
  		dumpable = get_dumpable(task->mm);
@@ -65082,7 +64898,7 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
  		return -EPERM;
  
  	return security_ptrace_access_check(task, mode);
-@@ -177,7 +181,16 @@ bool ptrace_may_access(struct task_struc
+@@ -206,7 +210,16 @@ bool ptrace_may_access(struct task_struc
  {
  	int err;
  	task_lock(task);
@@ -65100,7 +64916,7 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
  	task_unlock(task);
  	return !err;
  }
-@@ -205,7 +218,7 @@ static int ptrace_attach(struct task_str
+@@ -251,7 +264,7 @@ static int ptrace_attach(struct task_str
  		goto out;
  
  	task_lock(task);
@@ -65109,16 +64925,16 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
  	task_unlock(task);
  	if (retval)
  		goto unlock_creds;
-@@ -218,7 +231,7 @@ static int ptrace_attach(struct task_str
- 		goto unlock_tasklist;
- 
+@@ -266,7 +279,7 @@ static int ptrace_attach(struct task_str
  	task->ptrace = PT_PTRACED;
+ 	if (seize)
+ 		task->ptrace |= PT_SEIZED;
 -	if (task_ns_capable(task, CAP_SYS_PTRACE))
 +	if (task_ns_capable_nolog(task, CAP_SYS_PTRACE))
  		task->ptrace |= PT_PTRACE_CAP;
  
  	__ptrace_link(task, current);
-@@ -406,6 +419,8 @@ int ptrace_readdata(struct task_struct *
+@@ -461,6 +474,8 @@ int ptrace_readdata(struct task_struct *
  {
  	int copied = 0;
  
@@ -65127,7 +64943,7 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
  	while (len > 0) {
  		char buf[128];
  		int this_len, retval;
-@@ -417,7 +432,7 @@ int ptrace_readdata(struct task_struct *
+@@ -472,7 +487,7 @@ int ptrace_readdata(struct task_struct *
  				break;
  			return -EIO;
  		}
@@ -65136,7 +64952,7 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
  			return -EFAULT;
  		copied += retval;
  		src += retval;
-@@ -431,6 +446,8 @@ int ptrace_writedata(struct task_struct 
+@@ -486,6 +501,8 @@ int ptrace_writedata(struct task_struct 
  {
  	int copied = 0;
  
@@ -65145,20 +64961,21 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
  	while (len > 0) {
  		char buf[128];
  		int this_len, retval;
-@@ -613,9 +630,11 @@ int ptrace_request(struct task_struct *c
- {
+@@ -669,10 +686,12 @@ int ptrace_request(struct task_struct *c
+ 	bool seized = child->ptrace & PT_SEIZED;
  	int ret = -EIO;
- 	siginfo_t siginfo;
+ 	siginfo_t siginfo, *si;
 -	void __user *datavp = (void __user *) data;
 +	void __user *datavp = (__force void __user *) data;
  	unsigned long __user *datalp = datavp;
+ 	unsigned long flags;
  
 +	pax_track_stack();
 +
  	switch (request) {
  	case PTRACE_PEEKTEXT:
  	case PTRACE_PEEKDATA:
-@@ -761,14 +780,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
+@@ -871,14 +890,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
  		goto out;
  	}
  
@@ -65167,8 +64984,8 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
 +		goto out_put_task_struct;
 +	}
 +
- 	if (request == PTRACE_ATTACH) {
- 		ret = ptrace_attach(child);
+ 	if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
+ 		ret = ptrace_attach(child, request, data);
  		/*
  		 * Some architectures need to do book-keeping after
  		 * a ptrace attach.
@@ -65181,7 +64998,7 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
  		goto out_put_task_struct;
  	}
  
-@@ -793,7 +819,7 @@ int generic_ptrace_peekdata(struct task_
+@@ -904,7 +930,7 @@ int generic_ptrace_peekdata(struct task_
  	copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
  	if (copied != sizeof(tmp))
  		return -EIO;
@@ -65190,7 +65007,7 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
  }
  
  int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
-@@ -816,6 +842,8 @@ int compat_ptrace_request(struct task_st
+@@ -927,6 +953,8 @@ int compat_ptrace_request(struct task_st
  	siginfo_t siginfo;
  	int ret;
  
@@ -65199,7 +65016,7 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
  	switch (request) {
  	case PTRACE_PEEKTEXT:
  	case PTRACE_PEEKDATA:
-@@ -903,14 +931,21 @@ asmlinkage long compat_sys_ptrace(compat
+@@ -1014,14 +1042,21 @@ asmlinkage long compat_sys_ptrace(compat
  		goto out;
  	}
  
@@ -65208,8 +65025,8 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
 +		goto out_put_task_struct;
 +	}
 +
- 	if (request == PTRACE_ATTACH) {
- 		ret = ptrace_attach(child);
+ 	if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
+ 		ret = ptrace_attach(child, request, data);
  		/*
  		 * Some architectures need to do book-keeping after
  		 * a ptrace attach.
@@ -65222,9 +65039,9 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
  		goto out_put_task_struct;
  	}
  
-diff -urNp linux-3.0.9/kernel/rcutorture.c linux-3.0.9/kernel/rcutorture.c
---- linux-3.0.9/kernel/rcutorture.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/rcutorture.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/rcutorture.c linux-3.1.1/kernel/rcutorture.c
+--- linux-3.1.1/kernel/rcutorture.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/rcutorture.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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) =
@@ -65294,7 +65111,7 @@ diff -urNp linux-3.0.9/kernel/rcutorture.c linux-3.0.9/kernel/rcutorture.c
  			old_rp->rtort_pipe_count++;
  			cur_ops->deferred_free(old_rp);
  		}
-@@ -951,7 +951,7 @@ static void rcu_torture_timer(unsigned l
+@@ -950,7 +950,7 @@ static void rcu_torture_timer(unsigned l
  		return;
  	}
  	if (p->rtort_mbtest == 0)
@@ -65303,7 +65120,7 @@ diff -urNp linux-3.0.9/kernel/rcutorture.c linux-3.0.9/kernel/rcutorture.c
  	spin_lock(&rand_lock);
  	cur_ops->read_delay(&rand);
  	n_rcu_torture_timers++;
-@@ -1013,7 +1013,7 @@ rcu_torture_reader(void *arg)
+@@ -1011,7 +1011,7 @@ rcu_torture_reader(void *arg)
  			continue;
  		}
  		if (p->rtort_mbtest == 0)
@@ -65312,7 +65129,7 @@ diff -urNp linux-3.0.9/kernel/rcutorture.c linux-3.0.9/kernel/rcutorture.c
  		cur_ops->read_delay(&rand);
  		preempt_disable();
  		pipe_count = p->rtort_pipe_count;
-@@ -1072,16 +1072,16 @@ rcu_torture_printk(char *page)
+@@ -1070,16 +1070,16 @@ rcu_torture_printk(char *page)
  		       rcu_torture_current,
  		       rcu_torture_current_version,
  		       list_empty(&rcu_torture_freelist),
@@ -65334,7 +65151,7 @@ diff -urNp linux-3.0.9/kernel/rcutorture.c linux-3.0.9/kernel/rcutorture.c
  	    n_rcu_torture_boost_ktrerror != 0 ||
  	    n_rcu_torture_boost_rterror != 0 ||
  	    n_rcu_torture_boost_failure != 0)
-@@ -1089,7 +1089,7 @@ rcu_torture_printk(char *page)
+@@ -1087,7 +1087,7 @@ rcu_torture_printk(char *page)
  	cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
  	if (i > 1) {
  		cnt += sprintf(&page[cnt], "!!! ");
@@ -65343,7 +65160,7 @@ diff -urNp linux-3.0.9/kernel/rcutorture.c linux-3.0.9/kernel/rcutorture.c
  		WARN_ON_ONCE(1);
  	}
  	cnt += sprintf(&page[cnt], "Reader Pipe: ");
-@@ -1103,7 +1103,7 @@ rcu_torture_printk(char *page)
+@@ -1101,7 +1101,7 @@ rcu_torture_printk(char *page)
  	cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
  	for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
  		cnt += sprintf(&page[cnt], " %d",
@@ -65352,7 +65169,7 @@ diff -urNp linux-3.0.9/kernel/rcutorture.c linux-3.0.9/kernel/rcutorture.c
  	}
  	cnt += sprintf(&page[cnt], "\n");
  	if (cur_ops->stats)
-@@ -1412,7 +1412,7 @@ rcu_torture_cleanup(void)
+@@ -1410,7 +1410,7 @@ rcu_torture_cleanup(void)
  
  	if (cur_ops->cleanup)
  		cur_ops->cleanup();
@@ -65361,7 +65178,7 @@ diff -urNp linux-3.0.9/kernel/rcutorture.c linux-3.0.9/kernel/rcutorture.c
  		rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
  	else
  		rcu_torture_print_module_parms(cur_ops, "End of test: SUCCESS");
-@@ -1476,17 +1476,17 @@ rcu_torture_init(void)
+@@ -1474,17 +1474,17 @@ rcu_torture_init(void)
  
  	rcu_torture_current = NULL;
  	rcu_torture_current_version = 0;
@@ -65385,9 +65202,9 @@ diff -urNp linux-3.0.9/kernel/rcutorture.c linux-3.0.9/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.9/kernel/rcutree.c linux-3.0.9/kernel/rcutree.c
---- linux-3.0.9/kernel/rcutree.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/rcutree.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/rcutree.c linux-3.1.1/kernel/rcutree.c
+--- linux-3.1.1/kernel/rcutree.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/rcutree.c	2011-11-16 18:39:08.000000000 -0500
 @@ -356,9 +356,9 @@ void rcu_enter_nohz(void)
  	}
  	/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
@@ -65470,9 +65287,9 @@ diff -urNp linux-3.0.9/kernel/rcutree.c linux-3.0.9/kernel/rcutree.c
  {
  	__rcu_process_callbacks(&rcu_sched_state,
  				&__get_cpu_var(rcu_sched_data));
-diff -urNp linux-3.0.9/kernel/rcutree.h linux-3.0.9/kernel/rcutree.h
---- linux-3.0.9/kernel/rcutree.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/rcutree.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/rcutree.h linux-3.1.1/kernel/rcutree.h
+--- linux-3.1.1/kernel/rcutree.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/rcutree.h	2011-11-16 18:39:08.000000000 -0500
 @@ -86,7 +86,7 @@
  struct rcu_dynticks {
  	int dynticks_nesting;	/* Track irq/process nesting level. */
@@ -65482,9 +65299,9 @@ diff -urNp linux-3.0.9/kernel/rcutree.h linux-3.0.9/kernel/rcutree.h
  };
  
  /* RCU's kthread states for tracing. */
-diff -urNp linux-3.0.9/kernel/rcutree_plugin.h linux-3.0.9/kernel/rcutree_plugin.h
---- linux-3.0.9/kernel/rcutree_plugin.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/rcutree_plugin.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/rcutree_plugin.h linux-3.1.1/kernel/rcutree_plugin.h
+--- linux-3.1.1/kernel/rcutree_plugin.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/rcutree_plugin.h	2011-11-16 18:39:08.000000000 -0500
 @@ -822,7 +822,7 @@ void synchronize_rcu_expedited(void)
  
  	/* Clean up and exit. */
@@ -65547,9 +65364,9 @@ diff -urNp linux-3.0.9/kernel/rcutree_plugin.h linux-3.0.9/kernel/rcutree_plugin
  
  	put_online_cpus();
  }
-diff -urNp linux-3.0.9/kernel/relay.c linux-3.0.9/kernel/relay.c
---- linux-3.0.9/kernel/relay.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/relay.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/relay.c linux-3.1.1/kernel/relay.c
+--- linux-3.1.1/kernel/relay.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/relay.c	2011-11-16 18:40:44.000000000 -0500
 @@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc
  	};
  	ssize_t ret;
@@ -65559,9 +65376,9 @@ diff -urNp linux-3.0.9/kernel/relay.c linux-3.0.9/kernel/relay.c
  	if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
  		return 0;
  	if (splice_grow_spd(pipe, &spd))
-diff -urNp linux-3.0.9/kernel/resource.c linux-3.0.9/kernel/resource.c
---- linux-3.0.9/kernel/resource.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/resource.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/resource.c linux-3.1.1/kernel/resource.c
+--- linux-3.1.1/kernel/resource.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/resource.c	2011-11-16 18:40:44.000000000 -0500
 @@ -141,8 +141,18 @@ static const struct file_operations proc
  
  static int __init ioresources_init(void)
@@ -65581,9 +65398,9 @@ diff -urNp linux-3.0.9/kernel/resource.c linux-3.0.9/kernel/resource.c
  	return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-3.0.9/kernel/rtmutex-tester.c linux-3.0.9/kernel/rtmutex-tester.c
---- linux-3.0.9/kernel/rtmutex-tester.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/rtmutex-tester.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/rtmutex-tester.c linux-3.1.1/kernel/rtmutex-tester.c
+--- linux-3.1.1/kernel/rtmutex-tester.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/rtmutex-tester.c	2011-11-16 18:39:08.000000000 -0500
 @@ -20,7 +20,7 @@
  #define MAX_RT_TEST_MUTEXES	8
  
@@ -65674,9 +65491,9 @@ diff -urNp linux-3.0.9/kernel/rtmutex-tester.c linux-3.0.9/kernel/rtmutex-tester
  		return;
  
  	default:
-diff -urNp linux-3.0.9/kernel/sched_autogroup.c linux-3.0.9/kernel/sched_autogroup.c
---- linux-3.0.9/kernel/sched_autogroup.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sched_autogroup.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/sched_autogroup.c linux-3.1.1/kernel/sched_autogroup.c
+--- linux-3.1.1/kernel/sched_autogroup.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sched_autogroup.c	2011-11-16 18:39:08.000000000 -0500
 @@ -7,7 +7,7 @@
  
  unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
@@ -65695,10 +65512,10 @@ diff -urNp linux-3.0.9/kernel/sched_autogroup.c linux-3.0.9/kernel/sched_autogro
  	ag->tg = tg;
  #ifdef CONFIG_RT_GROUP_SCHED
  	/*
-diff -urNp linux-3.0.9/kernel/sched.c linux-3.0.9/kernel/sched.c
---- linux-3.0.9/kernel/sched.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sched.c	2011-11-15 20:03:00.000000000 -0500
-@@ -4227,6 +4227,8 @@ static void __sched __schedule(void)
+diff -urNp linux-3.1.1/kernel/sched.c linux-3.1.1/kernel/sched.c
+--- linux-3.1.1/kernel/sched.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sched.c	2011-11-16 18:40:44.000000000 -0500
+@@ -4264,6 +4264,8 @@ static void __sched __schedule(void)
  	struct rq *rq;
  	int cpu;
  
@@ -65707,7 +65524,7 @@ diff -urNp linux-3.0.9/kernel/sched.c linux-3.0.9/kernel/sched.c
  need_resched:
  	preempt_disable();
  	cpu = smp_processor_id();
-@@ -4920,6 +4922,8 @@ int can_nice(const struct task_struct *p
+@@ -4950,6 +4952,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;
  
@@ -65716,7 +65533,7 @@ diff -urNp linux-3.0.9/kernel/sched.c linux-3.0.9/kernel/sched.c
  	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
  		capable(CAP_SYS_NICE));
  }
-@@ -4953,7 +4957,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4983,7 +4987,8 @@ SYSCALL_DEFINE1(nice, int, increment)
  	if (nice > 19)
  		nice = 19;
  
@@ -65726,7 +65543,7 @@ diff -urNp linux-3.0.9/kernel/sched.c linux-3.0.9/kernel/sched.c
  		return -EPERM;
  
  	retval = security_task_setnice(current, nice);
-@@ -5097,6 +5102,7 @@ recheck:
+@@ -5127,6 +5132,7 @@ recheck:
  			unsigned long rlim_rtprio =
  					task_rlimit(p, RLIMIT_RTPRIO);
  
@@ -65734,10 +65551,10 @@ diff -urNp linux-3.0.9/kernel/sched.c linux-3.0.9/kernel/sched.c
  			/* can't set/change the rt policy */
  			if (policy != p->policy && !rlim_rtprio)
  				return -EPERM;
-diff -urNp linux-3.0.9/kernel/sched_fair.c linux-3.0.9/kernel/sched_fair.c
---- linux-3.0.9/kernel/sched_fair.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sched_fair.c	2011-11-15 20:03:00.000000000 -0500
-@@ -4050,7 +4050,7 @@ static void nohz_idle_balance(int this_c
+diff -urNp linux-3.1.1/kernel/sched_fair.c linux-3.1.1/kernel/sched_fair.c
+--- linux-3.1.1/kernel/sched_fair.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sched_fair.c	2011-11-16 18:39:08.000000000 -0500
+@@ -4062,7 +4062,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).
   */
@@ -65746,9 +65563,9 @@ diff -urNp linux-3.0.9/kernel/sched_fair.c linux-3.0.9/kernel/sched_fair.c
  {
  	int this_cpu = smp_processor_id();
  	struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c
---- linux-3.0.9/kernel/signal.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/signal.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/signal.c linux-3.1.1/kernel/signal.c
+--- linux-3.1.1/kernel/signal.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/signal.c	2011-11-16 19:30:04.000000000 -0500
 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
  
  int print_fatal_signals __read_mostly;
@@ -65773,7 +65590,7 @@ diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c
  
  	handler = sig_handler(t, sig);
  
-@@ -320,6 +320,9 @@ __sigqueue_alloc(int sig, struct task_st
+@@ -364,6 +364,9 @@ __sigqueue_alloc(int sig, struct task_st
  	atomic_inc(&user->sigpending);
  	rcu_read_unlock();
  
@@ -65783,7 +65600,7 @@ diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c
  	if (override_rlimit ||
  	    atomic_read(&user->sigpending) <=
  			task_rlimit(t, RLIMIT_SIGPENDING)) {
-@@ -444,7 +447,7 @@ flush_signal_handlers(struct task_struct
+@@ -488,7 +491,7 @@ flush_signal_handlers(struct task_struct
  
  int unhandled_signal(struct task_struct *tsk, int sig)
  {
@@ -65792,7 +65609,7 @@ diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c
  	if (is_global_init(tsk))
  		return 1;
  	if (handler != SIG_IGN && handler != SIG_DFL)
-@@ -770,6 +773,13 @@ static int check_kill_permission(int sig
+@@ -815,6 +818,13 @@ static int check_kill_permission(int sig
  		}
  	}
  
@@ -65806,7 +65623,7 @@ diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c
  	return security_task_kill(t, info, sig, 0);
  }
  
-@@ -1092,7 +1102,7 @@ __group_send_sig_info(int sig, struct si
+@@ -1165,7 +1175,7 @@ __group_send_sig_info(int sig, struct si
  	return send_signal(sig, info, p, 1);
  }
  
@@ -65815,7 +65632,7 @@ diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c
  specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  {
  	return send_signal(sig, info, t, 0);
-@@ -1129,6 +1139,7 @@ force_sig_info(int sig, struct siginfo *
+@@ -1202,6 +1212,7 @@ force_sig_info(int sig, struct siginfo *
  	unsigned long int flags;
  	int ret, blocked, ignored;
  	struct k_sigaction *action;
@@ -65823,7 +65640,7 @@ diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c
  
  	spin_lock_irqsave(&t->sighand->siglock, flags);
  	action = &t->sighand->action[sig-1];
-@@ -1143,9 +1154,18 @@ force_sig_info(int sig, struct siginfo *
+@@ -1216,9 +1227,18 @@ force_sig_info(int sig, struct siginfo *
  	}
  	if (action->sa.sa_handler == SIG_DFL)
  		t->signal->flags &= ~SIGNAL_UNKILLABLE;
@@ -65842,7 +65659,7 @@ diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c
  	return ret;
  }
  
-@@ -1212,8 +1232,11 @@ int group_send_sig_info(int sig, struct 
+@@ -1285,8 +1305,11 @@ int group_send_sig_info(int sig, struct 
  	ret = check_kill_permission(sig, info, p);
  	rcu_read_unlock();
  
@@ -65855,16 +65672,16 @@ diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c
  
  	return ret;
  }
-@@ -1839,6 +1862,8 @@ void ptrace_notify(int exit_code)
+@@ -1909,6 +1932,8 @@ static void ptrace_do_notify(int signr, 
  {
  	siginfo_t info;
  
 +	pax_track_stack();
 +
- 	BUG_ON((exit_code & (0x7f | ~0xffff)) != SIGTRAP);
- 
  	memset(&info, 0, sizeof info);
-@@ -2637,7 +2662,15 @@ do_send_specific(pid_t tgid, pid_t pid, 
+ 	info.si_signo = signr;
+ 	info.si_code = exit_code;
+@@ -2748,7 +2773,15 @@ do_send_specific(pid_t tgid, pid_t pid, 
  	int error = -ESRCH;
  
  	rcu_read_lock();
@@ -65881,9 +65698,9 @@ diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c
  	if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
  		error = check_kill_permission(sig, info, p);
  		/*
-diff -urNp linux-3.0.9/kernel/smp.c linux-3.0.9/kernel/smp.c
---- linux-3.0.9/kernel/smp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/smp.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/smp.c linux-3.1.1/kernel/smp.c
+--- linux-3.1.1/kernel/smp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/smp.c	2011-11-16 18:39:08.000000000 -0500
 @@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t fu
  }
  EXPORT_SYMBOL(smp_call_function);
@@ -65911,9 +65728,9 @@ diff -urNp linux-3.0.9/kernel/smp.c linux-3.0.9/kernel/smp.c
  {
  	raw_spin_unlock_irq(&call_function.lock);
  }
-diff -urNp linux-3.0.9/kernel/softirq.c linux-3.0.9/kernel/softirq.c
---- linux-3.0.9/kernel/softirq.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/softirq.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/softirq.c linux-3.1.1/kernel/softirq.c
+--- linux-3.1.1/kernel/softirq.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/softirq.c	2011-11-16 18:39:08.000000000 -0500
 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
  DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -65964,10 +65781,10 @@ diff -urNp linux-3.0.9/kernel/softirq.c linux-3.0.9/kernel/softirq.c
  {
  	struct tasklet_struct *list;
  
-diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
---- linux-3.0.9/kernel/sys.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sys.c	2011-11-15 20:03:00.000000000 -0500
-@@ -158,6 +158,12 @@ static int set_one_prio(struct task_stru
+diff -urNp linux-3.1.1/kernel/sys.c linux-3.1.1/kernel/sys.c
+--- linux-3.1.1/kernel/sys.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sys.c	2011-11-16 18:40:44.000000000 -0500
+@@ -157,6 +157,12 @@ static int set_one_prio(struct task_stru
  		error = -EACCES;
  		goto out;
  	}
@@ -65980,7 +65797,7 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
  	no_nice = security_task_setnice(p, niceval);
  	if (no_nice) {
  		error = no_nice;
-@@ -541,6 +547,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
+@@ -571,6 +577,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
  			goto error;
  	}
  
@@ -65990,7 +65807,7 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
  	if (rgid != (gid_t) -1 ||
  	    (egid != (gid_t) -1 && egid != old->gid))
  		new->sgid = new->egid;
-@@ -570,6 +579,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
+@@ -600,6 +609,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
  	old = current_cred();
  
  	retval = -EPERM;
@@ -66001,30 +65818,7 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
  	if (nsown_capable(CAP_SETGID))
  		new->gid = new->egid = new->sgid = new->fsgid = gid;
  	else if (gid == old->gid || gid == old->sgid)
-@@ -595,11 +608,18 @@ static int set_user(struct cred *new)
- 	if (!new_user)
- 		return -EAGAIN;
- 
-+	/*
-+	 * We don't fail in case of NPROC limit excess here because too many
-+	 * poorly written programs don't check set*uid() return code, assuming
-+	 * it never fails if called by root.  We may still enforce NPROC limit
-+	 * for programs doing set*uid()+execve() by harmlessly deferring the
-+	 * failure to the execve() stage.
-+	 */
- 	if (atomic_read(&new_user->processes) >= rlimit(RLIMIT_NPROC) &&
--			new_user != INIT_USER) {
--		free_uid(new_user);
--		return -EAGAIN;
--	}
-+			new_user != INIT_USER)
-+		current->flags |= PF_NPROC_EXCEEDED;
-+	else
-+		current->flags &= ~PF_NPROC_EXCEEDED;
- 
- 	free_uid(new->user);
- 	new->user = new_user;
-@@ -650,6 +670,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
+@@ -687,6 +700,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
  			goto error;
  	}
  
@@ -66034,7 +65828,7 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
  	if (new->uid != old->uid) {
  		retval = set_user(new);
  		if (retval < 0)
-@@ -694,6 +717,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
+@@ -731,6 +747,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
  	old = current_cred();
  
  	retval = -EPERM;
@@ -66047,7 +65841,7 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
  	if (nsown_capable(CAP_SETUID)) {
  		new->suid = new->uid = uid;
  		if (uid != old->uid) {
-@@ -748,6 +777,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, 
+@@ -785,6 +807,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, 
  			goto error;
  	}
  
@@ -66057,7 +65851,7 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
  	if (ruid != (uid_t) -1) {
  		new->uid = ruid;
  		if (ruid != old->uid) {
-@@ -812,6 +844,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, 
+@@ -849,6 +874,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, 
  			goto error;
  	}
  
@@ -66067,7 +65861,7 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
  	if (rgid != (gid_t) -1)
  		new->gid = rgid;
  	if (egid != (gid_t) -1)
-@@ -858,6 +893,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -895,6 +923,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
  	old = current_cred();
  	old_fsuid = old->fsuid;
  
@@ -66077,7 +65871,7 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
  	if (uid == old->uid  || uid == old->euid  ||
  	    uid == old->suid || uid == old->fsuid ||
  	    nsown_capable(CAP_SETUID)) {
-@@ -868,6 +906,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -905,6 +936,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
  		}
  	}
  
@@ -66085,7 +65879,7 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
  	abort_creds(new);
  	return old_fsuid;
  
-@@ -894,12 +933,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
+@@ -931,12 +963,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
  	if (gid == old->gid  || gid == old->egid  ||
  	    gid == old->sgid || gid == old->fsgid ||
  	    nsown_capable(CAP_SETGID)) {
@@ -66102,7 +65896,7 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
  	abort_creds(new);
  	return old_fsgid;
  
-@@ -1205,19 +1248,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_
+@@ -1242,19 +1278,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_
  		return -EFAULT;
  
  	down_read(&uts_sem);
@@ -66127,7 +65921,7 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
  				__OLD_UTS_LEN);
  	error |= __put_user(0, name->machine + __OLD_UTS_LEN);
  	up_read(&uts_sem);
-@@ -1680,7 +1723,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
+@@ -1717,7 +1753,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
  			error = get_dumpable(me->mm);
  			break;
  		case PR_SET_DUMPABLE:
@@ -66136,9 +65930,9 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
  				error = -EINVAL;
  				break;
  			}
-diff -urNp linux-3.0.9/kernel/sysctl_binary.c linux-3.0.9/kernel/sysctl_binary.c
---- linux-3.0.9/kernel/sysctl_binary.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sysctl_binary.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/sysctl_binary.c linux-3.1.1/kernel/sysctl_binary.c
+--- linux-3.1.1/kernel/sysctl_binary.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sysctl_binary.c	2011-11-16 18:39:08.000000000 -0500
 @@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *f
  		int i;
  
@@ -66202,9 +65996,9 @@ diff -urNp linux-3.0.9/kernel/sysctl_binary.c linux-3.0.9/kernel/sysctl_binary.c
  		set_fs(old_fs);
  		if (result < 0)
  			goto out;
-diff -urNp linux-3.0.9/kernel/sysctl.c linux-3.0.9/kernel/sysctl.c
---- linux-3.0.9/kernel/sysctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sysctl.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/sysctl.c linux-3.1.1/kernel/sysctl.c
+--- linux-3.1.1/kernel/sysctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sysctl.c	2011-11-16 18:40:44.000000000 -0500
 @@ -85,6 +85,13 @@
  
  
@@ -66316,7 +66110,7 @@ diff -urNp linux-3.0.9/kernel/sysctl.c linux-3.0.9/kernel/sysctl.c
  #else
  	{
  		.procname	= "nr_trim_pages",
-@@ -1714,6 +1763,17 @@ static int test_perm(int mode, int op)
+@@ -1709,6 +1758,17 @@ static int test_perm(int mode, int op)
  int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
  {
  	int mode;
@@ -66334,7 +66128,7 @@ diff -urNp linux-3.0.9/kernel/sysctl.c linux-3.0.9/kernel/sysctl.c
  
  	if (root->permissions)
  		mode = root->permissions(root, current->nsproxy, table);
-@@ -2118,6 +2178,16 @@ int proc_dostring(struct ctl_table *tabl
+@@ -2113,6 +2173,16 @@ int proc_dostring(struct ctl_table *tabl
  			       buffer, lenp, ppos);
  }
  
@@ -66351,7 +66145,7 @@ diff -urNp linux-3.0.9/kernel/sysctl.c linux-3.0.9/kernel/sysctl.c
  static size_t proc_skip_spaces(char **buf)
  {
  	size_t ret;
-@@ -2223,6 +2293,8 @@ static int proc_put_long(void __user **b
+@@ -2218,6 +2288,8 @@ static int proc_put_long(void __user **b
  	len = strlen(tmp);
  	if (len > *size)
  		len = *size;
@@ -66360,7 +66154,7 @@ diff -urNp linux-3.0.9/kernel/sysctl.c linux-3.0.9/kernel/sysctl.c
  	if (copy_to_user(*buf, tmp, len))
  		return -EFAULT;
  	*size -= len;
-@@ -2539,8 +2611,11 @@ static int __do_proc_doulongvec_minmax(v
+@@ -2534,8 +2606,11 @@ static int __do_proc_doulongvec_minmax(v
  			*i = val;
  		} else {
  			val = convdiv * (*i) / convmul;
@@ -66373,7 +66167,7 @@ diff -urNp linux-3.0.9/kernel/sysctl.c linux-3.0.9/kernel/sysctl.c
  			err = proc_put_long(&buffer, &left, val, false);
  			if (err)
  				break;
-@@ -2935,6 +3010,12 @@ int proc_dostring(struct ctl_table *tabl
+@@ -2930,6 +3005,12 @@ int proc_dostring(struct ctl_table *tabl
  	return -ENOSYS;
  }
  
@@ -66386,7 +66180,7 @@ diff -urNp linux-3.0.9/kernel/sysctl.c linux-3.0.9/kernel/sysctl.c
  int proc_dointvec(struct ctl_table *table, int write,
  		  void __user *buffer, size_t *lenp, loff_t *ppos)
  {
-@@ -2991,6 +3072,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
+@@ -2986,6 +3067,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
  EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
  EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
  EXPORT_SYMBOL(proc_dostring);
@@ -66394,9 +66188,9 @@ diff -urNp linux-3.0.9/kernel/sysctl.c linux-3.0.9/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.9/kernel/sysctl_check.c linux-3.0.9/kernel/sysctl_check.c
---- linux-3.0.9/kernel/sysctl_check.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sysctl_check.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/sysctl_check.c linux-3.1.1/kernel/sysctl_check.c
+--- linux-3.1.1/kernel/sysctl_check.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sysctl_check.c	2011-11-16 18:40:44.000000000 -0500
 @@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n
  				set_fail(&fail, table, "Directory with extra2");
  		} else {
@@ -66405,23 +66199,23 @@ diff -urNp linux-3.0.9/kernel/sysctl_check.c linux-3.0.9/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.9/kernel/taskstats.c linux-3.0.9/kernel/taskstats.c
---- linux-3.0.9/kernel/taskstats.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/taskstats.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/taskstats.c linux-3.1.1/kernel/taskstats.c
+--- linux-3.1.1/kernel/taskstats.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/taskstats.c	2011-11-16 19:35:09.000000000 -0500
 @@ -27,9 +27,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
  #include <linux/file.h>
 +#include <linux/grsecurity.h>
  #include <net/genetlink.h>
- #include <asm/atomic.h>
+ #include <linux/atomic.h>
  
 +extern int gr_is_taskstats_denied(int pid);
 +
  /*
   * Maximum length of a cpumask that can be specified in
   * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
-@@ -558,6 +561,9 @@ err:
+@@ -556,6 +559,9 @@ err:
  
  static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
  {
@@ -66431,9 +66225,9 @@ diff -urNp linux-3.0.9/kernel/taskstats.c linux-3.0.9/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.9/kernel/time/alarmtimer.c linux-3.0.9/kernel/time/alarmtimer.c
---- linux-3.0.9/kernel/time/alarmtimer.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/time/alarmtimer.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/time/alarmtimer.c linux-3.1.1/kernel/time/alarmtimer.c
+--- linux-3.1.1/kernel/time/alarmtimer.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/time/alarmtimer.c	2011-11-16 18:39:08.000000000 -0500
 @@ -693,7 +693,7 @@ static int __init alarmtimer_init(void)
  {
  	int error = 0;
@@ -66443,9 +66237,9 @@ diff -urNp linux-3.0.9/kernel/time/alarmtimer.c linux-3.0.9/kernel/time/alarmtim
  		.clock_getres	= alarm_clock_getres,
  		.clock_get	= alarm_clock_get,
  		.timer_create	= alarm_timer_create,
-diff -urNp linux-3.0.9/kernel/time/tick-broadcast.c linux-3.0.9/kernel/time/tick-broadcast.c
---- linux-3.0.9/kernel/time/tick-broadcast.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/time/tick-broadcast.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/time/tick-broadcast.c linux-3.1.1/kernel/time/tick-broadcast.c
+--- linux-3.1.1/kernel/time/tick-broadcast.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/time/tick-broadcast.c	2011-11-16 18:39:08.000000000 -0500
 @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl
  		 * then clear the broadcast bit.
  		 */
@@ -66455,9 +66249,9 @@ diff -urNp linux-3.0.9/kernel/time/tick-broadcast.c linux-3.0.9/kernel/time/tick
  
  			cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
  			tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-3.0.9/kernel/time/timekeeping.c linux-3.0.9/kernel/time/timekeeping.c
---- linux-3.0.9/kernel/time/timekeeping.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/time/timekeeping.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/time/timekeeping.c linux-3.1.1/kernel/time/timekeeping.c
+--- linux-3.1.1/kernel/time/timekeeping.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/time/timekeeping.c	2011-11-16 18:40:44.000000000 -0500
 @@ -14,6 +14,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
@@ -66475,9 +66269,9 @@ diff -urNp linux-3.0.9/kernel/time/timekeeping.c linux-3.0.9/kernel/time/timekee
  	write_seqlock_irqsave(&xtime_lock, flags);
  
  	timekeeping_forward_now();
-diff -urNp linux-3.0.9/kernel/time/timer_list.c linux-3.0.9/kernel/time/timer_list.c
---- linux-3.0.9/kernel/time/timer_list.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/time/timer_list.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/time/timer_list.c linux-3.1.1/kernel/time/timer_list.c
+--- linux-3.1.1/kernel/time/timer_list.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/time/timer_list.c	2011-11-16 18:40:44.000000000 -0500
 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
  
  static void print_name_offset(struct seq_file *m, void *sym)
@@ -66519,9 +66313,9 @@ diff -urNp linux-3.0.9/kernel/time/timer_list.c linux-3.0.9/kernel/time/timer_li
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-3.0.9/kernel/time/timer_stats.c linux-3.0.9/kernel/time/timer_stats.c
---- linux-3.0.9/kernel/time/timer_stats.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/time/timer_stats.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/time/timer_stats.c linux-3.1.1/kernel/time/timer_stats.c
+--- linux-3.1.1/kernel/time/timer_stats.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/time/timer_stats.c	2011-11-16 18:40:44.000000000 -0500
 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
  static unsigned long nr_entries;
  static struct entry entries[MAX_ENTRIES];
@@ -66590,9 +66384,9 @@ diff -urNp linux-3.0.9/kernel/time/timer_stats.c linux-3.0.9/kernel/time/timer_s
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-3.0.9/kernel/time.c linux-3.0.9/kernel/time.c
---- linux-3.0.9/kernel/time.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/time.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/time.c linux-3.1.1/kernel/time.c
+--- linux-3.1.1/kernel/time.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/time.c	2011-11-16 18:40:44.000000000 -0500
 @@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim
  		return error;
  
@@ -66605,9 +66399,9 @@ diff -urNp linux-3.0.9/kernel/time.c linux-3.0.9/kernel/time.c
  		/* SMP safe, global irq locking makes it work. */
  		sys_tz = *tz;
  		update_vsyscall_tz();
-diff -urNp linux-3.0.9/kernel/timer.c linux-3.0.9/kernel/timer.c
---- linux-3.0.9/kernel/timer.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/timer.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/timer.c linux-3.1.1/kernel/timer.c
+--- linux-3.1.1/kernel/timer.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/timer.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
  /*
   * This function runs timers and the timer-tq in bottom half context.
@@ -66617,10 +66411,10 @@ diff -urNp linux-3.0.9/kernel/timer.c linux-3.0.9/kernel/timer.c
  {
  	struct tvec_base *base = __this_cpu_read(tvec_bases);
  
-diff -urNp linux-3.0.9/kernel/trace/blktrace.c linux-3.0.9/kernel/trace/blktrace.c
---- linux-3.0.9/kernel/trace/blktrace.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/blktrace.c	2011-11-15 20:03:00.000000000 -0500
-@@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f
+diff -urNp linux-3.1.1/kernel/trace/blktrace.c linux-3.1.1/kernel/trace/blktrace.c
+--- linux-3.1.1/kernel/trace/blktrace.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/blktrace.c	2011-11-16 18:39:08.000000000 -0500
+@@ -323,7 +323,7 @@ static ssize_t blk_dropped_read(struct f
  	struct blk_trace *bt = filp->private_data;
  	char buf[16];
  
@@ -66629,7 +66423,7 @@ diff -urNp linux-3.0.9/kernel/trace/blktrace.c linux-3.0.9/kernel/trace/blktrace
  
  	return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
  }
-@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(str
+@@ -388,7 +388,7 @@ static int blk_subbuf_start_callback(str
  		return 1;
  
  	bt = buf->chan->private_data;
@@ -66638,7 +66432,7 @@ diff -urNp linux-3.0.9/kernel/trace/blktrace.c linux-3.0.9/kernel/trace/blktrace
  	return 0;
  }
  
-@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_qu
+@@ -489,7 +489,7 @@ int do_blk_trace_setup(struct request_qu
  
  	bt->dir = dir;
  	bt->dev = dev;
@@ -66647,10 +66441,10 @@ diff -urNp linux-3.0.9/kernel/trace/blktrace.c linux-3.0.9/kernel/trace/blktrace
  
  	ret = -EIO;
  	bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
-diff -urNp linux-3.0.9/kernel/trace/ftrace.c linux-3.0.9/kernel/trace/ftrace.c
---- linux-3.0.9/kernel/trace/ftrace.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/ftrace.c	2011-11-15 20:03:00.000000000 -0500
-@@ -1566,12 +1566,17 @@ ftrace_code_disable(struct module *mod, 
+diff -urNp linux-3.1.1/kernel/trace/ftrace.c linux-3.1.1/kernel/trace/ftrace.c
+--- linux-3.1.1/kernel/trace/ftrace.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/ftrace.c	2011-11-16 18:39:08.000000000 -0500
+@@ -1585,12 +1585,17 @@ ftrace_code_disable(struct module *mod, 
  	if (unlikely(ftrace_disabled))
  		return 0;
  
@@ -66670,7 +66464,7 @@ diff -urNp linux-3.0.9/kernel/trace/ftrace.c linux-3.0.9/kernel/trace/ftrace.c
  }
  
  /*
-@@ -2570,7 +2575,7 @@ static void ftrace_free_entry_rcu(struct
+@@ -2607,7 +2612,7 @@ static void ftrace_free_entry_rcu(struct
  
  int
  register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
@@ -66679,10 +66473,10 @@ diff -urNp linux-3.0.9/kernel/trace/ftrace.c linux-3.0.9/kernel/trace/ftrace.c
  {
  	struct ftrace_func_probe *entry;
  	struct ftrace_page *pg;
-diff -urNp linux-3.0.9/kernel/trace/trace.c linux-3.0.9/kernel/trace/trace.c
---- linux-3.0.9/kernel/trace/trace.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace.c	2011-11-15 20:03:00.000000000 -0500
-@@ -3339,6 +3339,8 @@ static ssize_t tracing_splice_read_pipe(
+diff -urNp linux-3.1.1/kernel/trace/trace.c linux-3.1.1/kernel/trace/trace.c
+--- linux-3.1.1/kernel/trace/trace.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace.c	2011-11-16 18:40:44.000000000 -0500
+@@ -3451,6 +3451,8 @@ static ssize_t tracing_splice_read_pipe(
  	size_t rem;
  	unsigned int i;
  
@@ -66691,7 +66485,7 @@ diff -urNp linux-3.0.9/kernel/trace/trace.c linux-3.0.9/kernel/trace/trace.c
  	if (splice_grow_spd(pipe, &spd))
  		return -ENOMEM;
  
-@@ -3822,6 +3824,8 @@ tracing_buffers_splice_read(struct file 
+@@ -3926,6 +3928,8 @@ tracing_buffers_splice_read(struct file 
  	int entries, size, i;
  	size_t ret;
  
@@ -66700,7 +66494,7 @@ diff -urNp linux-3.0.9/kernel/trace/trace.c linux-3.0.9/kernel/trace/trace.c
  	if (splice_grow_spd(pipe, &spd))
  		return -ENOMEM;
  
-@@ -3990,10 +3994,9 @@ static const struct file_operations trac
+@@ -4093,10 +4097,9 @@ static const struct file_operations trac
  };
  #endif
  
@@ -66712,7 +66506,7 @@ diff -urNp linux-3.0.9/kernel/trace/trace.c linux-3.0.9/kernel/trace/trace.c
  	static int once;
  
  	if (d_tracer)
-@@ -4013,10 +4016,9 @@ struct dentry *tracing_init_dentry(void)
+@@ -4116,10 +4119,9 @@ struct dentry *tracing_init_dentry(void)
  	return d_tracer;
  }
  
@@ -66724,10 +66518,10 @@ diff -urNp linux-3.0.9/kernel/trace/trace.c linux-3.0.9/kernel/trace/trace.c
  	static int once;
  	struct dentry *d_tracer;
  
-diff -urNp linux-3.0.9/kernel/trace/trace_events.c linux-3.0.9/kernel/trace/trace_events.c
---- linux-3.0.9/kernel/trace/trace_events.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace_events.c	2011-11-15 20:03:00.000000000 -0500
-@@ -1318,10 +1318,6 @@ static LIST_HEAD(ftrace_module_file_list
+diff -urNp linux-3.1.1/kernel/trace/trace_events.c linux-3.1.1/kernel/trace/trace_events.c
+--- linux-3.1.1/kernel/trace/trace_events.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace_events.c	2011-11-16 18:39:08.000000000 -0500
+@@ -1300,10 +1300,6 @@ static LIST_HEAD(ftrace_module_file_list
  struct ftrace_module_file_ops {
  	struct list_head		list;
  	struct module			*mod;
@@ -66738,7 +66532,7 @@ diff -urNp linux-3.0.9/kernel/trace/trace_events.c linux-3.0.9/kernel/trace/trac
  };
  
  static struct ftrace_module_file_ops *
-@@ -1342,17 +1338,12 @@ trace_create_file_ops(struct module *mod
+@@ -1324,17 +1320,12 @@ trace_create_file_ops(struct module *mod
  
  	file_ops->mod = mod;
  
@@ -66762,7 +66556,7 @@ diff -urNp linux-3.0.9/kernel/trace/trace_events.c linux-3.0.9/kernel/trace/trac
  
  	list_add(&file_ops->list, &ftrace_module_file_list);
  
-@@ -1376,8 +1367,8 @@ static void trace_module_add_events(stru
+@@ -1358,8 +1349,8 @@ static void trace_module_add_events(stru
  
  	for_each_event(call, start, end) {
  		__trace_add_event_call(*call, mod,
@@ -66773,9 +66567,9 @@ diff -urNp linux-3.0.9/kernel/trace/trace_events.c linux-3.0.9/kernel/trace/trac
  	}
  }
  
-diff -urNp linux-3.0.9/kernel/trace/trace_kprobe.c linux-3.0.9/kernel/trace/trace_kprobe.c
---- linux-3.0.9/kernel/trace/trace_kprobe.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace_kprobe.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/trace/trace_kprobe.c linux-3.1.1/kernel/trace/trace_kprobe.c
+--- linux-3.1.1/kernel/trace/trace_kprobe.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace_kprobe.c	2011-11-16 18:39:08.000000000 -0500
 @@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(me
  	long ret;
  	int maxlen = get_rloc_len(*(u32 *)dest);
@@ -66812,9 +66606,9 @@ diff -urNp linux-3.0.9/kernel/trace/trace_kprobe.c linux-3.0.9/kernel/trace/trac
  		len++;
  	} while (c && ret == 0 && len < MAX_STRING_SIZE);
  	pagefault_enable();
-diff -urNp linux-3.0.9/kernel/trace/trace_mmiotrace.c linux-3.0.9/kernel/trace/trace_mmiotrace.c
---- linux-3.0.9/kernel/trace/trace_mmiotrace.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace_mmiotrace.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/trace/trace_mmiotrace.c linux-3.1.1/kernel/trace/trace_mmiotrace.c
+--- linux-3.1.1/kernel/trace/trace_mmiotrace.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace_mmiotrace.c	2011-11-16 18:39:08.000000000 -0500
 @@ -24,7 +24,7 @@ struct header_iter {
  static struct trace_array *mmio_trace_array;
  static bool overrun_detected;
@@ -66851,9 +66645,9 @@ diff -urNp linux-3.0.9/kernel/trace/trace_mmiotrace.c linux-3.0.9/kernel/trace/t
  		return;
  	}
  	entry	= ring_buffer_event_data(event);
-diff -urNp linux-3.0.9/kernel/trace/trace_output.c linux-3.0.9/kernel/trace/trace_output.c
---- linux-3.0.9/kernel/trace/trace_output.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace_output.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/trace/trace_output.c linux-3.1.1/kernel/trace/trace_output.c
+--- linux-3.1.1/kernel/trace/trace_output.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace_output.c	2011-11-16 18:39:08.000000000 -0500
 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, 
  
  	p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -66863,9 +66657,9 @@ diff -urNp linux-3.0.9/kernel/trace/trace_output.c linux-3.0.9/kernel/trace/trac
  		if (p) {
  			s->len = p - s->buffer;
  			return 1;
-diff -urNp linux-3.0.9/kernel/trace/trace_stack.c linux-3.0.9/kernel/trace/trace_stack.c
---- linux-3.0.9/kernel/trace/trace_stack.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace_stack.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/trace/trace_stack.c linux-3.1.1/kernel/trace/trace_stack.c
+--- linux-3.1.1/kernel/trace/trace_stack.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace_stack.c	2011-11-16 18:39:08.000000000 -0500
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
  		return;
  
@@ -66875,9 +66669,9 @@ diff -urNp linux-3.0.9/kernel/trace/trace_stack.c linux-3.0.9/kernel/trace/trace
  		return;
  
  	local_irq_save(flags);
-diff -urNp linux-3.0.9/kernel/trace/trace_workqueue.c linux-3.0.9/kernel/trace/trace_workqueue.c
---- linux-3.0.9/kernel/trace/trace_workqueue.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace_workqueue.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/kernel/trace/trace_workqueue.c linux-3.1.1/kernel/trace/trace_workqueue.c
+--- linux-3.1.1/kernel/trace/trace_workqueue.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace_workqueue.c	2011-11-16 18:39:08.000000000 -0500
 @@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
  	int		            cpu;
  	pid_t			    pid;
@@ -66905,10 +66699,10 @@ diff -urNp linux-3.0.9/kernel/trace/trace_workqueue.c linux-3.0.9/kernel/trace/t
  				   tsk->comm);
  			put_task_struct(tsk);
  		}
-diff -urNp linux-3.0.9/lib/bitmap.c linux-3.0.9/lib/bitmap.c
---- linux-3.0.9/lib/bitmap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/bitmap.c	2011-11-15 20:03:00.000000000 -0500
-@@ -421,7 +421,7 @@ int __bitmap_parse(const char *buf, unsi
+diff -urNp linux-3.1.1/lib/bitmap.c linux-3.1.1/lib/bitmap.c
+--- linux-3.1.1/lib/bitmap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/bitmap.c	2011-11-16 18:39:08.000000000 -0500
+@@ -419,7 +419,7 @@ int __bitmap_parse(const char *buf, unsi
  {
  	int c, old_c, totaldigits, ndigits, nchunks, nbits;
  	u32 chunk;
@@ -66917,7 +66711,7 @@ diff -urNp linux-3.0.9/lib/bitmap.c linux-3.0.9/lib/bitmap.c
  
  	bitmap_zero(maskp, nmaskbits);
  
-@@ -506,7 +506,7 @@ int bitmap_parse_user(const char __user 
+@@ -504,7 +504,7 @@ int bitmap_parse_user(const char __user 
  {
  	if (!access_ok(VERIFY_READ, ubuf, ulen))
  		return -EFAULT;
@@ -66926,7 +66720,7 @@ diff -urNp linux-3.0.9/lib/bitmap.c linux-3.0.9/lib/bitmap.c
  }
  EXPORT_SYMBOL(bitmap_parse_user);
  
-@@ -596,7 +596,7 @@ static int __bitmap_parselist(const char
+@@ -594,7 +594,7 @@ static int __bitmap_parselist(const char
  {
  	unsigned a, b;
  	int c, old_c, totaldigits;
@@ -66935,7 +66729,7 @@ diff -urNp linux-3.0.9/lib/bitmap.c linux-3.0.9/lib/bitmap.c
  	int exp_digit, in_range;
  
  	totaldigits = c = 0;
-@@ -696,7 +696,7 @@ int bitmap_parselist_user(const char __u
+@@ -694,7 +694,7 @@ int bitmap_parselist_user(const char __u
  {
  	if (!access_ok(VERIFY_READ, ubuf, ulen))
  		return -EFAULT;
@@ -66944,9 +66738,9 @@ diff -urNp linux-3.0.9/lib/bitmap.c linux-3.0.9/lib/bitmap.c
  					ulen, 1, maskp, nmaskbits);
  }
  EXPORT_SYMBOL(bitmap_parselist_user);
-diff -urNp linux-3.0.9/lib/bug.c linux-3.0.9/lib/bug.c
---- linux-3.0.9/lib/bug.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/bug.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/lib/bug.c linux-3.1.1/lib/bug.c
+--- linux-3.1.1/lib/bug.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/bug.c	2011-11-16 18:39:08.000000000 -0500
 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
  		return BUG_TRAP_TYPE_NONE;
  
@@ -66956,9 +66750,9 @@ diff -urNp linux-3.0.9/lib/bug.c linux-3.0.9/lib/bug.c
  
  	file = NULL;
  	line = 0;
-diff -urNp linux-3.0.9/lib/debugobjects.c linux-3.0.9/lib/debugobjects.c
---- linux-3.0.9/lib/debugobjects.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/debugobjects.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/lib/debugobjects.c linux-3.1.1/lib/debugobjects.c
+--- linux-3.1.1/lib/debugobjects.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/debugobjects.c	2011-11-16 18:39:08.000000000 -0500
 @@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi
  	if (limit > 4)
  		return;
@@ -66968,18 +66762,18 @@ diff -urNp linux-3.0.9/lib/debugobjects.c linux-3.0.9/lib/debugobjects.c
  	if (is_on_stack == onstack)
  		return;
  
-diff -urNp linux-3.0.9/lib/devres.c linux-3.0.9/lib/devres.c
---- linux-3.0.9/lib/devres.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/devres.c	2011-11-15 20:03:00.000000000 -0500
-@@ -81,7 +81,7 @@ void devm_iounmap(struct device *dev, vo
+diff -urNp linux-3.1.1/lib/devres.c linux-3.1.1/lib/devres.c
+--- linux-3.1.1/lib/devres.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/devres.c	2011-11-16 18:39:08.000000000 -0500
+@@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
+ void devm_iounmap(struct device *dev, void __iomem *addr)
  {
- 	iounmap(addr);
  	WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
 -			       (void *)addr));
 +			       (void __force *)addr));
+ 	iounmap(addr);
  }
  EXPORT_SYMBOL(devm_iounmap);
- 
 @@ -141,7 +141,7 @@ void devm_ioport_unmap(struct device *de
  {
  	ioport_unmap(addr);
@@ -66989,9 +66783,9 @@ diff -urNp linux-3.0.9/lib/devres.c linux-3.0.9/lib/devres.c
  }
  EXPORT_SYMBOL(devm_ioport_unmap);
  
-diff -urNp linux-3.0.9/lib/dma-debug.c linux-3.0.9/lib/dma-debug.c
---- linux-3.0.9/lib/dma-debug.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/dma-debug.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/lib/dma-debug.c linux-3.1.1/lib/dma-debug.c
+--- linux-3.1.1/lib/dma-debug.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/dma-debug.c	2011-11-16 18:39:08.000000000 -0500
 @@ -870,7 +870,7 @@ out:
  
  static void check_for_stack(struct device *dev, void *addr)
@@ -67001,9 +66795,9 @@ diff -urNp linux-3.0.9/lib/dma-debug.c linux-3.0.9/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.9/lib/extable.c linux-3.0.9/lib/extable.c
---- linux-3.0.9/lib/extable.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/extable.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/lib/extable.c linux-3.1.1/lib/extable.c
+--- linux-3.1.1/lib/extable.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/extable.c	2011-11-16 18:39:08.000000000 -0500
 @@ -13,6 +13,7 @@
  #include <linux/init.h>
  #include <linux/sort.h>
@@ -67023,9 +66817,9 @@ diff -urNp linux-3.0.9/lib/extable.c linux-3.0.9/lib/extable.c
  }
  
  #ifdef CONFIG_MODULES
-diff -urNp linux-3.0.9/lib/inflate.c linux-3.0.9/lib/inflate.c
---- linux-3.0.9/lib/inflate.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/inflate.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/lib/inflate.c linux-3.1.1/lib/inflate.c
+--- linux-3.1.1/lib/inflate.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/inflate.c	2011-11-16 18:39:08.000000000 -0500
 @@ -269,7 +269,7 @@ static void free(void *where)
  		malloc_ptr = free_mem_ptr;
  }
@@ -67035,10 +66829,10 @@ diff -urNp linux-3.0.9/lib/inflate.c linux-3.0.9/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-3.0.9/lib/Kconfig.debug linux-3.0.9/lib/Kconfig.debug
---- linux-3.0.9/lib/Kconfig.debug	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/Kconfig.debug	2011-11-15 20:03:00.000000000 -0500
-@@ -1088,6 +1088,7 @@ config LATENCYTOP
+diff -urNp linux-3.1.1/lib/Kconfig.debug linux-3.1.1/lib/Kconfig.debug
+--- linux-3.1.1/lib/Kconfig.debug	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/Kconfig.debug	2011-11-16 18:40:44.000000000 -0500
+@@ -1091,6 +1091,7 @@ config LATENCYTOP
  	depends on DEBUG_KERNEL
  	depends on STACKTRACE_SUPPORT
  	depends on PROC_FS
@@ -67046,9 +66840,9 @@ diff -urNp linux-3.0.9/lib/Kconfig.debug linux-3.0.9/lib/Kconfig.debug
  	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
  	select KALLSYMS
  	select KALLSYMS_ALL
-diff -urNp linux-3.0.9/lib/kref.c linux-3.0.9/lib/kref.c
---- linux-3.0.9/lib/kref.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/kref.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/lib/kref.c linux-3.1.1/lib/kref.c
+--- linux-3.1.1/lib/kref.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/kref.c	2011-11-16 18:39:08.000000000 -0500
 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
   */
  int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -67058,9 +66852,9 @@ diff -urNp linux-3.0.9/lib/kref.c linux-3.0.9/lib/kref.c
  	WARN_ON(release == (void (*)(struct kref *))kfree);
  
  	if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-3.0.9/lib/radix-tree.c linux-3.0.9/lib/radix-tree.c
---- linux-3.0.9/lib/radix-tree.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/radix-tree.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/lib/radix-tree.c linux-3.1.1/lib/radix-tree.c
+--- linux-3.1.1/lib/radix-tree.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/radix-tree.c	2011-11-16 18:39:08.000000000 -0500
 @@ -80,7 +80,7 @@ struct radix_tree_preload {
  	int nr;
  	struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -67070,9 +66864,9 @@ diff -urNp linux-3.0.9/lib/radix-tree.c linux-3.0.9/lib/radix-tree.c
  
  static inline void *ptr_to_indirect(void *ptr)
  {
-diff -urNp linux-3.0.9/lib/vsprintf.c linux-3.0.9/lib/vsprintf.c
---- linux-3.0.9/lib/vsprintf.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/vsprintf.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/lib/vsprintf.c linux-3.1.1/lib/vsprintf.c
+--- linux-3.1.1/lib/vsprintf.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/vsprintf.c	2011-11-16 18:40:44.000000000 -0500
 @@ -16,6 +16,9 @@
   * - scnprintf and vscnprintf
   */
@@ -67083,7 +66877,7 @@ diff -urNp linux-3.0.9/lib/vsprintf.c linux-3.0.9/lib/vsprintf.c
  #include <stdarg.h>
  #include <linux/module.h>
  #include <linux/types.h>
-@@ -435,7 +438,7 @@ char *symbol_string(char *buf, char *end
+@@ -432,7 +435,7 @@ char *symbol_string(char *buf, char *end
  	char sym[KSYM_SYMBOL_LEN];
  	if (ext == 'B')
  		sprint_backtrace(sym, value);
@@ -67092,7 +66886,7 @@ diff -urNp linux-3.0.9/lib/vsprintf.c linux-3.0.9/lib/vsprintf.c
  		sprint_symbol(sym, value);
  	else
  		kallsyms_lookup(value, NULL, NULL, NULL, sym);
-@@ -799,7 +802,11 @@ char *uuid_string(char *buf, char *end, 
+@@ -796,7 +799,11 @@ char *uuid_string(char *buf, char *end, 
  	return string(buf, end, uuid, spec);
  }
  
@@ -67104,7 +66898,7 @@ diff -urNp linux-3.0.9/lib/vsprintf.c linux-3.0.9/lib/vsprintf.c
  
  /*
   * Show a '%p' thing.  A kernel extension is that the '%p' is followed
-@@ -813,6 +820,8 @@ int kptr_restrict __read_mostly;
+@@ -810,6 +817,8 @@ int kptr_restrict __read_mostly;
   * - 'S' For symbolic direct pointers with offset
   * - 's' For symbolic direct pointers without offset
   * - 'B' For backtraced symbolic direct pointers with offset
@@ -67113,7 +66907,7 @@ diff -urNp linux-3.0.9/lib/vsprintf.c linux-3.0.9/lib/vsprintf.c
   * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
   * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
   * - 'M' For a 6-byte MAC address, it prints the address in the
-@@ -857,12 +866,12 @@ char *pointer(const char *fmt, char *buf
+@@ -854,12 +863,12 @@ char *pointer(const char *fmt, char *buf
  {
  	if (!ptr && *fmt != 'K') {
  		/*
@@ -67128,7 +66922,7 @@ diff -urNp linux-3.0.9/lib/vsprintf.c linux-3.0.9/lib/vsprintf.c
  	}
  
  	switch (*fmt) {
-@@ -872,6 +881,13 @@ char *pointer(const char *fmt, char *buf
+@@ -869,6 +878,13 @@ char *pointer(const char *fmt, char *buf
  		/* Fallthrough */
  	case 'S':
  	case 's':
@@ -67142,7 +66936,7 @@ diff -urNp linux-3.0.9/lib/vsprintf.c linux-3.0.9/lib/vsprintf.c
  	case 'B':
  		return symbol_string(buf, end, ptr, spec, *fmt);
  	case 'R':
-@@ -1631,11 +1647,11 @@ int bstr_printf(char *buf, size_t size, 
+@@ -1627,11 +1643,11 @@ int bstr_printf(char *buf, size_t size, 
  	typeof(type) value;						\
  	if (sizeof(type) == 8) {					\
  		args = PTR_ALIGN(args, sizeof(u32));			\
@@ -67157,7 +66951,7 @@ diff -urNp linux-3.0.9/lib/vsprintf.c linux-3.0.9/lib/vsprintf.c
  	}								\
  	args += sizeof(type);						\
  	value;								\
-@@ -1698,7 +1714,7 @@ int bstr_printf(char *buf, size_t size, 
+@@ -1694,7 +1710,7 @@ int bstr_printf(char *buf, size_t size, 
  		case FORMAT_TYPE_STR: {
  			const char *str_arg = args;
  			args += strlen(str_arg) + 1;
@@ -67166,14 +66960,14 @@ diff -urNp linux-3.0.9/lib/vsprintf.c linux-3.0.9/lib/vsprintf.c
  			break;
  		}
  
-diff -urNp linux-3.0.9/localversion-grsec linux-3.0.9/localversion-grsec
---- linux-3.0.9/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/localversion-grsec	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/localversion-grsec linux-3.1.1/localversion-grsec
+--- linux-3.1.1/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/localversion-grsec	2011-11-16 18:40:44.000000000 -0500
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
---- linux-3.0.9/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/Makefile	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/Makefile linux-3.1.1/Makefile
+--- linux-3.1.1/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/Makefile	2011-11-16 18:45:38.000000000 -0500
 @@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
  HOSTCC       = gcc
@@ -67210,14 +67004,15 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
  	$(Q)$(MAKE) $(build)=scripts/basic
  	$(Q)rm -f .tmp_quiet_recordmcount
  
-@@ -564,6 +567,36 @@ else
+@@ -564,6 +567,37 @@ 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
++STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
++STACKLEAK_PLUGIN += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
 +endif
 +ifdef CONFIG_KALLOCSTAT_PLUGIN
 +KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
@@ -67247,7 +67042,7 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
  include $(srctree)/arch/$(SRCARCH)/Makefile
  
  ifneq ($(CONFIG_FRAME_WARN),0)
-@@ -708,7 +741,7 @@ export mod_strip_cmd
+@@ -708,7 +742,7 @@ export mod_strip_cmd
  
  
  ifeq ($(KBUILD_EXTMOD),)
@@ -67256,7 +67051,7 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
  
  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
+@@ -932,6 +966,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
  
  # The actual objects are generated when descending, 
  # make sure no implicit rule kicks in
@@ -67264,7 +67059,7 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
  $(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)) 
+@@ -941,7 +976,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) 
  # Error messages still appears in the original language
  
  PHONY += $(vmlinux-dirs)
@@ -67273,7 +67068,7 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
  	$(Q)$(MAKE) $(build)=$@
  
  # Store (new) KERNELRELASE string in include/config/kernel.release
-@@ -986,6 +1020,7 @@ prepare0: archprepare FORCE
+@@ -986,6 +1021,7 @@ prepare0: archprepare FORCE
  	$(Q)$(MAKE) $(build)=. missing-syscalls
  
  # All the preparing..
@@ -67281,7 +67076,7 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
  prepare: prepare0
  
  # Generate some files
-@@ -1087,6 +1122,7 @@ all: modules
+@@ -1087,6 +1123,7 @@ all: modules
  #	using awk while concatenating to the final file.
  
  PHONY += modules
@@ -67289,7 +67084,7 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
  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
+@@ -1102,7 +1139,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu
  
  # Target to prepare building external modules
  PHONY += modules_prepare
@@ -67298,7 +67093,7 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
  
  # Target to install modules
  PHONY += modules_install
-@@ -1198,7 +1234,7 @@ distclean: mrproper
+@@ -1198,7 +1235,7 @@ distclean: mrproper
  	@find $(srctree) $(RCS_FIND_IGNORE) \
  		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
  		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
@@ -67307,7 +67102,7 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
  		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
  		-type f -print | xargs rm -f
  
-@@ -1359,6 +1395,7 @@ PHONY += $(module-dirs) modules
+@@ -1360,6 +1397,7 @@ PHONY += $(module-dirs) modules
  $(module-dirs): crmodverdir $(objtree)/Module.symvers
  	$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
  
@@ -67315,7 +67110,7 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
  modules: $(module-dirs)
  	@$(kecho) '  Building modules, stage 2.';
  	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1485,17 +1522,19 @@ else
+@@ -1486,17 +1524,19 @@ else
          target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
  endif
  
@@ -67339,7 +67134,7 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
  	$(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
+@@ -1506,11 +1546,13 @@ endif
  	$(cmd_crmodverdir)
  	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
  	$(build)=$(build-dir)
@@ -67355,10 +67150,10 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
  	$(cmd_crmodverdir)
  	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
  	$(build)=$(build-dir) $(@:.ko=.o)
-diff -urNp linux-3.0.9/mm/filemap.c linux-3.0.9/mm/filemap.c
---- linux-3.0.9/mm/filemap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/filemap.c	2011-11-15 20:03:00.000000000 -0500
-@@ -1763,7 +1763,7 @@ int generic_file_mmap(struct file * file
+diff -urNp linux-3.1.1/mm/filemap.c linux-3.1.1/mm/filemap.c
+--- linux-3.1.1/mm/filemap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/filemap.c	2011-11-16 18:40:44.000000000 -0500
+@@ -1784,7 +1784,7 @@ int generic_file_mmap(struct file * file
  	struct address_space *mapping = file->f_mapping;
  
  	if (!mapping->a_ops->readpage)
@@ -67367,7 +67162,7 @@ diff -urNp linux-3.0.9/mm/filemap.c linux-3.0.9/mm/filemap.c
  	file_accessed(file);
  	vma->vm_ops = &generic_file_vm_ops;
  	vma->vm_flags |= VM_CAN_NONLINEAR;
-@@ -2169,6 +2169,7 @@ inline int generic_write_checks(struct f
+@@ -2190,6 +2190,7 @@ inline int generic_write_checks(struct f
                          *pos = i_size_read(inode);
  
  		if (limit != RLIM_INFINITY) {
@@ -67375,9 +67170,9 @@ diff -urNp linux-3.0.9/mm/filemap.c linux-3.0.9/mm/filemap.c
  			if (*pos >= limit) {
  				send_sig(SIGXFSZ, current, 0);
  				return -EFBIG;
-diff -urNp linux-3.0.9/mm/fremap.c linux-3.0.9/mm/fremap.c
---- linux-3.0.9/mm/fremap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/fremap.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/fremap.c linux-3.1.1/mm/fremap.c
+--- linux-3.1.1/mm/fremap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/fremap.c	2011-11-16 18:39:08.000000000 -0500
 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
   retry:
  	vma = find_vma(mm, start);
@@ -67390,9 +67185,9 @@ diff -urNp linux-3.0.9/mm/fremap.c linux-3.0.9/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.9/mm/highmem.c linux-3.0.9/mm/highmem.c
---- linux-3.0.9/mm/highmem.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/highmem.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/highmem.c linux-3.1.1/mm/highmem.c
+--- linux-3.1.1/mm/highmem.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/highmem.c	2011-11-16 18:39:08.000000000 -0500
 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
  		 * So no dangers, even with speculative execution.
  		 */
@@ -67418,9 +67213,9 @@ diff -urNp linux-3.0.9/mm/highmem.c linux-3.0.9/mm/highmem.c
  	pkmap_count[last_pkmap_nr] = 1;
  	set_page_address(page, (void *)vaddr);
  
-diff -urNp linux-3.0.9/mm/huge_memory.c linux-3.0.9/mm/huge_memory.c
---- linux-3.0.9/mm/huge_memory.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/huge_memory.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/huge_memory.c linux-3.1.1/mm/huge_memory.c
+--- linux-3.1.1/mm/huge_memory.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/huge_memory.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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.
@@ -67430,10 +67225,10 @@ diff -urNp linux-3.0.9/mm/huge_memory.c linux-3.0.9/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.9/mm/hugetlb.c linux-3.0.9/mm/hugetlb.c
---- linux-3.0.9/mm/hugetlb.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/hugetlb.c	2011-11-15 20:03:00.000000000 -0500
-@@ -2339,6 +2339,27 @@ static int unmap_ref_private(struct mm_s
+diff -urNp linux-3.1.1/mm/hugetlb.c linux-3.1.1/mm/hugetlb.c
+--- linux-3.1.1/mm/hugetlb.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/hugetlb.c	2011-11-16 18:39:08.000000000 -0500
+@@ -2346,6 +2346,27 @@ static int unmap_ref_private(struct mm_s
  	return 1;
  }
  
@@ -67461,7 +67256,7 @@ diff -urNp linux-3.0.9/mm/hugetlb.c linux-3.0.9/mm/hugetlb.c
  /*
   * Hugetlb_cow() should be called with page lock of the original hugepage held.
   */
-@@ -2440,6 +2461,11 @@ retry_avoidcopy:
+@@ -2447,6 +2468,11 @@ retry_avoidcopy:
  				make_huge_pte(vma, new_page, 1));
  		page_remove_rmap(old_page);
  		hugepage_add_new_anon_rmap(new_page, vma, address);
@@ -67473,7 +67268,7 @@ diff -urNp linux-3.0.9/mm/hugetlb.c linux-3.0.9/mm/hugetlb.c
  		/* Make the old page be freed below */
  		new_page = old_page;
  		mmu_notifier_invalidate_range_end(mm,
-@@ -2591,6 +2617,10 @@ retry:
+@@ -2598,6 +2624,10 @@ retry:
  				&& (vma->vm_flags & VM_SHARED)));
  	set_huge_pte_at(mm, address, ptep, new_pte);
  
@@ -67484,7 +67279,7 @@ diff -urNp linux-3.0.9/mm/hugetlb.c linux-3.0.9/mm/hugetlb.c
  	if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
  		/* Optimization, do the COW without a second fault */
  		ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
-@@ -2620,6 +2650,10 @@ int hugetlb_fault(struct mm_struct *mm, 
+@@ -2627,6 +2657,10 @@ int hugetlb_fault(struct mm_struct *mm, 
  	static DEFINE_MUTEX(hugetlb_instantiation_mutex);
  	struct hstate *h = hstate_vma(vma);
  
@@ -67495,7 +67290,7 @@ diff -urNp linux-3.0.9/mm/hugetlb.c linux-3.0.9/mm/hugetlb.c
  	ptep = huge_pte_offset(mm, address);
  	if (ptep) {
  		entry = huge_ptep_get(ptep);
-@@ -2631,6 +2665,26 @@ int hugetlb_fault(struct mm_struct *mm, 
+@@ -2638,6 +2672,26 @@ int hugetlb_fault(struct mm_struct *mm, 
  			       VM_FAULT_SET_HINDEX(h - hstates);
  	}
  
@@ -67522,9 +67317,9 @@ diff -urNp linux-3.0.9/mm/hugetlb.c linux-3.0.9/mm/hugetlb.c
  	ptep = huge_pte_alloc(mm, address, huge_page_size(h));
  	if (!ptep)
  		return VM_FAULT_OOM;
-diff -urNp linux-3.0.9/mm/internal.h linux-3.0.9/mm/internal.h
---- linux-3.0.9/mm/internal.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/internal.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/internal.h linux-3.1.1/mm/internal.h
+--- linux-3.1.1/mm/internal.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/internal.h	2011-11-16 18:39:08.000000000 -0500
 @@ -95,6 +95,7 @@ extern void putback_lru_page(struct page
   * in mm/page_alloc.c
   */
@@ -67533,9 +67328,9 @@ diff -urNp linux-3.0.9/mm/internal.h linux-3.0.9/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.9/mm/Kconfig linux-3.0.9/mm/Kconfig
---- linux-3.0.9/mm/Kconfig	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/Kconfig	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/Kconfig linux-3.1.1/mm/Kconfig
+--- linux-3.1.1/mm/Kconfig	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/Kconfig	2011-11-16 18:40:44.000000000 -0500
 @@ -240,7 +240,7 @@ config KSM
  config DEFAULT_MMAP_MIN_ADDR
          int "Low address space to protect from user allocation"
@@ -67545,9 +67340,9 @@ diff -urNp linux-3.0.9/mm/Kconfig linux-3.0.9/mm/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-3.0.9/mm/kmemleak.c linux-3.0.9/mm/kmemleak.c
---- linux-3.0.9/mm/kmemleak.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/kmemleak.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/kmemleak.c linux-3.1.1/mm/kmemleak.c
+--- linux-3.1.1/mm/kmemleak.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/kmemleak.c	2011-11-16 18:40:44.000000000 -0500
 @@ -357,7 +357,7 @@ static void print_unreferenced(struct se
  
  	for (i = 0; i < object->trace_len; i++) {
@@ -67557,9 +67352,9 @@ diff -urNp linux-3.0.9/mm/kmemleak.c linux-3.0.9/mm/kmemleak.c
  	}
  }
  
-diff -urNp linux-3.0.9/mm/maccess.c linux-3.0.9/mm/maccess.c
---- linux-3.0.9/mm/maccess.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/maccess.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/maccess.c linux-3.1.1/mm/maccess.c
+--- linux-3.1.1/mm/maccess.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/maccess.c	2011-11-16 18:39:08.000000000 -0500
 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, cons
  	set_fs(KERNEL_DS);
  	pagefault_disable();
@@ -67578,9 +67373,9 @@ diff -urNp linux-3.0.9/mm/maccess.c linux-3.0.9/mm/maccess.c
  	pagefault_enable();
  	set_fs(old_fs);
  
-diff -urNp linux-3.0.9/mm/madvise.c linux-3.0.9/mm/madvise.c
---- linux-3.0.9/mm/madvise.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/madvise.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/madvise.c linux-3.1.1/mm/madvise.c
+--- linux-3.1.1/mm/madvise.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/madvise.c	2011-11-16 18:39:08.000000000 -0500
 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
  	pgoff_t pgoff;
  	unsigned long new_flags = vma->vm_flags;
@@ -67657,9 +67452,9 @@ diff -urNp linux-3.0.9/mm/madvise.c linux-3.0.9/mm/madvise.c
  	error = 0;
  	if (end == start)
  		goto out;
-diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
---- linux-3.0.9/mm/memory.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/memory.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/memory.c linux-3.1.1/mm/memory.c
+--- linux-3.1.1/mm/memory.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/memory.c	2011-11-16 18:39:08.000000000 -0500
 @@ -457,8 +457,12 @@ static inline void free_pmd_range(struct
  		return;
  
@@ -67686,7 +67481,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  }
  
  /*
-@@ -1577,12 +1584,6 @@ no_page_table:
+@@ -1566,12 +1573,6 @@ no_page_table:
  	return page;
  }
  
@@ -67699,7 +67494,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  /**
   * __get_user_pages() - pin user pages in memory
   * @tsk:	task_struct of target task
-@@ -1655,10 +1656,10 @@ int __get_user_pages(struct task_struct 
+@@ -1644,10 +1645,10 @@ int __get_user_pages(struct task_struct 
  			(VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
  	i = 0;
  
@@ -67712,7 +67507,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  		if (!vma && in_gate_area(mm, start)) {
  			unsigned long pg = start & PAGE_MASK;
  			pgd_t *pgd;
-@@ -1706,7 +1707,7 @@ int __get_user_pages(struct task_struct 
+@@ -1695,7 +1696,7 @@ int __get_user_pages(struct task_struct 
  			goto next_page;
  		}
  
@@ -67721,7 +67516,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  		    (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
  		    !(vm_flags & vma->vm_flags))
  			return i ? : -EFAULT;
-@@ -1733,11 +1734,6 @@ int __get_user_pages(struct task_struct 
+@@ -1722,11 +1723,6 @@ int __get_user_pages(struct task_struct 
  				int ret;
  				unsigned int fault_flags = 0;
  
@@ -67733,7 +67528,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  				if (foll_flags & FOLL_WRITE)
  					fault_flags |= FAULT_FLAG_WRITE;
  				if (nonblocking)
-@@ -1811,7 +1807,7 @@ next_page:
+@@ -1800,7 +1796,7 @@ next_page:
  			start += PAGE_SIZE;
  			nr_pages--;
  		} while (nr_pages && start < vma->vm_end);
@@ -67742,7 +67537,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  	return i;
  }
  EXPORT_SYMBOL(__get_user_pages);
-@@ -2018,6 +2014,10 @@ static int insert_page(struct vm_area_st
+@@ -2007,6 +2003,10 @@ static int insert_page(struct vm_area_st
  	page_add_file_rmap(page);
  	set_pte_at(mm, addr, pte, mk_pte(page, prot));
  
@@ -67753,7 +67548,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  	retval = 0;
  	pte_unmap_unlock(pte, ptl);
  	return retval;
-@@ -2052,10 +2052,22 @@ out:
+@@ -2041,10 +2041,22 @@ out:
  int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
  			struct page *page)
  {
@@ -67776,7 +67571,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  	vma->vm_flags |= VM_INSERTPAGE;
  	return insert_page(vma, addr, page, vma->vm_page_prot);
  }
-@@ -2141,6 +2153,7 @@ int vm_insert_mixed(struct vm_area_struc
+@@ -2130,6 +2142,7 @@ int vm_insert_mixed(struct vm_area_struc
  			unsigned long pfn)
  {
  	BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
@@ -67784,7 +67579,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  
  	if (addr < vma->vm_start || addr >= vma->vm_end)
  		return -EFAULT;
-@@ -2456,6 +2469,186 @@ static inline void cow_user_page(struct 
+@@ -2445,6 +2458,186 @@ static inline void cow_user_page(struct 
  		copy_user_highpage(dst, src, va, vma);
  }
  
@@ -67971,7 +67766,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  /*
   * This routine handles present pages, when users try to write
   * to a shared page. It is done by copying the page to a new address
-@@ -2667,6 +2860,12 @@ gotten:
+@@ -2656,6 +2849,12 @@ gotten:
  	 */
  	page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
  	if (likely(pte_same(*page_table, orig_pte))) {
@@ -67984,7 +67779,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  		if (old_page) {
  			if (!PageAnon(old_page)) {
  				dec_mm_counter_fast(mm, MM_FILEPAGES);
-@@ -2718,6 +2917,10 @@ gotten:
+@@ -2707,6 +2906,10 @@ gotten:
  			page_remove_rmap(old_page);
  		}
  
@@ -67995,7 +67790,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  		/* Free the old page.. */
  		new_page = old_page;
  		ret |= VM_FAULT_WRITE;
-@@ -2997,6 +3200,11 @@ static int do_swap_page(struct mm_struct
+@@ -2986,6 +3189,11 @@ static int do_swap_page(struct mm_struct
  	swap_free(entry);
  	if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
  		try_to_free_swap(page);
@@ -68007,7 +67802,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  	unlock_page(page);
  	if (swapcache) {
  		/*
-@@ -3020,6 +3228,11 @@ static int do_swap_page(struct mm_struct
+@@ -3009,6 +3217,11 @@ static int do_swap_page(struct mm_struct
  
  	/* No need to invalidate - it was non-present before */
  	update_mmu_cache(vma, address, page_table);
@@ -68019,7 +67814,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  unlock:
  	pte_unmap_unlock(page_table, ptl);
  out:
-@@ -3039,40 +3252,6 @@ out_release:
+@@ -3028,40 +3241,6 @@ out_release:
  }
  
  /*
@@ -68060,7 +67855,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
   * We enter with non-exclusive mmap_sem (to exclude vma changes,
   * but allow concurrent faults), and pte mapped but not yet locked.
   * We return with mmap_sem still held, but pte unmapped and unlocked.
-@@ -3081,27 +3260,23 @@ static int do_anonymous_page(struct mm_s
+@@ -3070,27 +3249,23 @@ static int do_anonymous_page(struct mm_s
  		unsigned long address, pte_t *page_table, pmd_t *pmd,
  		unsigned int flags)
  {
@@ -68093,7 +67888,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  	if (unlikely(anon_vma_prepare(vma)))
  		goto oom;
  	page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -3120,6 +3295,11 @@ static int do_anonymous_page(struct mm_s
+@@ -3109,6 +3284,11 @@ static int do_anonymous_page(struct mm_s
  	if (!pte_none(*page_table))
  		goto release;
  
@@ -68105,7 +67900,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  	inc_mm_counter_fast(mm, MM_ANONPAGES);
  	page_add_new_anon_rmap(page, vma, address);
  setpte:
-@@ -3127,6 +3307,12 @@ setpte:
+@@ -3116,6 +3296,12 @@ setpte:
  
  	/* No need to invalidate - it was non-present before */
  	update_mmu_cache(vma, address, page_table);
@@ -68118,7 +67913,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  unlock:
  	pte_unmap_unlock(page_table, ptl);
  	return 0;
-@@ -3264,6 +3450,12 @@ static int __do_fault(struct mm_struct *
+@@ -3259,6 +3445,12 @@ static int __do_fault(struct mm_struct *
  	 */
  	/* Only go through if we didn't race with anybody else... */
  	if (likely(pte_same(*page_table, orig_pte))) {
@@ -68131,7 +67926,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  		flush_icache_page(vma, page);
  		entry = mk_pte(page, vma->vm_page_prot);
  		if (flags & FAULT_FLAG_WRITE)
-@@ -3283,6 +3475,14 @@ static int __do_fault(struct mm_struct *
+@@ -3278,6 +3470,14 @@ static int __do_fault(struct mm_struct *
  
  		/* no need to invalidate: a not-present page won't be cached */
  		update_mmu_cache(vma, address, page_table);
@@ -68144,9 +67939,9 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
 +#endif
 +
  	} else {
- 		if (charged)
- 			mem_cgroup_uncharge_page(page);
-@@ -3430,6 +3630,12 @@ int handle_pte_fault(struct mm_struct *m
+ 		if (cow_page)
+ 			mem_cgroup_uncharge_page(cow_page);
+@@ -3431,6 +3631,12 @@ int handle_pte_fault(struct mm_struct *m
  		if (flags & FAULT_FLAG_WRITE)
  			flush_tlb_fix_spurious_fault(vma, address);
  	}
@@ -68159,7 +67954,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  unlock:
  	pte_unmap_unlock(pte, ptl);
  	return 0;
-@@ -3446,6 +3652,10 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3447,6 +3653,10 @@ int handle_mm_fault(struct mm_struct *mm
  	pmd_t *pmd;
  	pte_t *pte;
  
@@ -68170,7 +67965,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  	__set_current_state(TASK_RUNNING);
  
  	count_vm_event(PGFAULT);
-@@ -3457,6 +3667,34 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3458,6 +3668,34 @@ int handle_mm_fault(struct mm_struct *mm
  	if (unlikely(is_vm_hugetlb_page(vma)))
  		return hugetlb_fault(mm, vma, address, flags);
  
@@ -68205,7 +68000,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  	pgd = pgd_offset(mm, address);
  	pud = pud_alloc(mm, pgd, address);
  	if (!pud)
-@@ -3486,7 +3724,7 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3487,7 +3725,7 @@ int handle_mm_fault(struct mm_struct *mm
  	 * run pte_offset_map on the pmd, if an huge pmd could
  	 * materialize from under us from a different thread.
  	 */
@@ -68214,7 +68009,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
  		return VM_FAULT_OOM;
  	/* if an huge pmd materialized from under us just retry later */
  	if (unlikely(pmd_trans_huge(*pmd)))
-@@ -3590,7 +3828,7 @@ static int __init gate_vma_init(void)
+@@ -3591,7 +3829,7 @@ static int __init gate_vma_init(void)
  	gate_vma.vm_start = FIXADDR_USER_START;
  	gate_vma.vm_end = FIXADDR_USER_END;
  	gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
@@ -68223,10 +68018,10 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/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.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c
---- linux-3.0.9/mm/memory-failure.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/memory-failure.c	2011-11-15 20:03:00.000000000 -0500
-@@ -59,7 +59,7 @@ int sysctl_memory_failure_early_kill __r
+diff -urNp linux-3.1.1/mm/memory-failure.c linux-3.1.1/mm/memory-failure.c
+--- linux-3.1.1/mm/memory-failure.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/memory-failure.c	2011-11-16 18:39:08.000000000 -0500
+@@ -60,7 +60,7 @@ int sysctl_memory_failure_early_kill __r
  
  int sysctl_memory_failure_recovery __read_mostly = 1;
  
@@ -68235,7 +68030,7 @@ diff -urNp linux-3.0.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c
  
  #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
  
-@@ -200,7 +200,7 @@ static int kill_proc_ao(struct task_stru
+@@ -201,7 +201,7 @@ static int kill_proc_ao(struct task_stru
  	si.si_signo = SIGBUS;
  	si.si_errno = 0;
  	si.si_code = BUS_MCEERR_AO;
@@ -68244,7 +68039,7 @@ diff -urNp linux-3.0.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c
  #ifdef __ARCH_SI_TRAPNO
  	si.si_trapno = trapno;
  #endif
-@@ -1008,7 +1008,7 @@ int __memory_failure(unsigned long pfn, 
+@@ -1009,7 +1009,7 @@ int __memory_failure(unsigned long pfn, 
  	}
  
  	nr_pages = 1 << compound_trans_order(hpage);
@@ -68253,7 +68048,7 @@ diff -urNp linux-3.0.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c
  
  	/*
  	 * We need/can do nothing about count=0 pages.
-@@ -1038,7 +1038,7 @@ int __memory_failure(unsigned long pfn, 
+@@ -1039,7 +1039,7 @@ int __memory_failure(unsigned long pfn, 
  			if (!PageHWPoison(hpage)
  			    || (hwpoison_filter(p) && TestClearPageHWPoison(p))
  			    || (p != hpage && TestSetPageHWPoison(hpage))) {
@@ -68262,7 +68057,7 @@ diff -urNp linux-3.0.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c
  				return 0;
  			}
  			set_page_hwpoison_huge_page(hpage);
-@@ -1096,7 +1096,7 @@ int __memory_failure(unsigned long pfn, 
+@@ -1097,7 +1097,7 @@ int __memory_failure(unsigned long pfn, 
  	}
  	if (hwpoison_filter(p)) {
  		if (TestClearPageHWPoison(p))
@@ -68271,7 +68066,7 @@ diff -urNp linux-3.0.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c
  		unlock_page(hpage);
  		put_page(hpage);
  		return 0;
-@@ -1222,7 +1222,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1314,7 +1314,7 @@ int unpoison_memory(unsigned long pfn)
  			return 0;
  		}
  		if (TestClearPageHWPoison(p))
@@ -68280,7 +68075,7 @@ diff -urNp linux-3.0.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c
  		pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
  		return 0;
  	}
-@@ -1236,7 +1236,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1328,7 +1328,7 @@ int unpoison_memory(unsigned long pfn)
  	 */
  	if (TestClearPageHWPoison(page)) {
  		pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
@@ -68289,7 +68084,7 @@ diff -urNp linux-3.0.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c
  		freeit = 1;
  		if (PageHuge(page))
  			clear_page_hwpoison_huge_page(page);
-@@ -1349,7 +1349,7 @@ static int soft_offline_huge_page(struct
+@@ -1441,7 +1441,7 @@ static int soft_offline_huge_page(struct
  	}
  done:
  	if (!PageHWPoison(hpage))
@@ -68298,7 +68093,7 @@ diff -urNp linux-3.0.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c
  	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,
+@@ -1572,7 +1572,7 @@ int soft_offline_page(struct page *page,
  		return ret;
  
  done:
@@ -68307,9 +68102,9 @@ diff -urNp linux-3.0.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c
  	SetPageHWPoison(page);
  	/* keep elevated page count for bad page */
  	return ret;
-diff -urNp linux-3.0.9/mm/mempolicy.c linux-3.0.9/mm/mempolicy.c
---- linux-3.0.9/mm/mempolicy.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/mempolicy.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/mempolicy.c linux-3.1.1/mm/mempolicy.c
+--- linux-3.1.1/mm/mempolicy.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/mempolicy.c	2011-11-16 18:40:44.000000000 -0500
 @@ -639,6 +639,10 @@ static int mbind_range(struct mm_struct 
  	unsigned long vmstart;
  	unsigned long vmend;
@@ -68381,9 +68176,9 @@ diff -urNp linux-3.0.9/mm/mempolicy.c linux-3.0.9/mm/mempolicy.c
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-diff -urNp linux-3.0.9/mm/migrate.c linux-3.0.9/mm/migrate.c
---- linux-3.0.9/mm/migrate.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/migrate.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/migrate.c linux-3.1.1/mm/migrate.c
+--- linux-3.1.1/mm/migrate.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/migrate.c	2011-11-16 18:40:44.000000000 -0500
 @@ -1124,6 +1124,8 @@ static int do_pages_move(struct mm_struc
  	unsigned long chunk_start;
  	int err;
@@ -68418,9 +68213,9 @@ diff -urNp linux-3.0.9/mm/migrate.c linux-3.0.9/mm/migrate.c
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-diff -urNp linux-3.0.9/mm/mlock.c linux-3.0.9/mm/mlock.c
---- linux-3.0.9/mm/mlock.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/mlock.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/mlock.c linux-3.1.1/mm/mlock.c
+--- linux-3.1.1/mm/mlock.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/mlock.c	2011-11-16 18:40:44.000000000 -0500
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -68494,9 +68289,9 @@ diff -urNp linux-3.0.9/mm/mlock.c linux-3.0.9/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.9/mm/mmap.c linux-3.0.9/mm/mmap.c
---- linux-3.0.9/mm/mmap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/mmap.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/mmap.c linux-3.1.1/mm/mmap.c
+--- linux-3.1.1/mm/mmap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/mmap.c	2011-11-16 18:40:44.000000000 -0500
 @@ -46,6 +46,16 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
@@ -68550,7 +68345,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  /*
   * Make sure vm_committed_as in one cacheline and not cacheline shared with
   * other variables. It can be updated by several CPUs frequently.
-@@ -236,6 +256,7 @@ static struct vm_area_struct *remove_vma
+@@ -228,6 +248,7 @@ static struct vm_area_struct *remove_vma
  	struct vm_area_struct *next = vma->vm_next;
  
  	might_sleep();
@@ -68558,7 +68353,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file) {
-@@ -280,6 +301,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
+@@ -272,6 +293,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
  	 * not page aligned -Ram Gupta
  	 */
  	rlim = rlimit(RLIMIT_DATA);
@@ -68566,7 +68361,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
  			(mm->end_data - mm->start_data) > rlim)
  		goto out;
-@@ -697,6 +719,12 @@ static int
+@@ -689,6 +711,12 @@ static int
  can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
  	struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
  {
@@ -68579,7 +68374,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	if (is_mergeable_vma(vma, file, vm_flags) &&
  	    is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
  		if (vma->vm_pgoff == vm_pgoff)
-@@ -716,6 +744,12 @@ static int
+@@ -708,6 +736,12 @@ static int
  can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
  	struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
  {
@@ -68592,7 +68387,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	if (is_mergeable_vma(vma, file, vm_flags) &&
  	    is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
  		pgoff_t vm_pglen;
-@@ -758,13 +792,20 @@ can_vma_merge_after(struct vm_area_struc
+@@ -750,13 +784,20 @@ can_vma_merge_after(struct vm_area_struc
  struct vm_area_struct *vma_merge(struct mm_struct *mm,
  			struct vm_area_struct *prev, unsigned long addr,
  			unsigned long end, unsigned long vm_flags,
@@ -68614,7 +68409,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	/*
  	 * We later require that vma->vm_flags == vm_flags,
  	 * so this tests vma->vm_flags & VM_SPECIAL, too.
-@@ -780,6 +821,15 @@ struct vm_area_struct *vma_merge(struct 
+@@ -772,6 +813,15 @@ struct vm_area_struct *vma_merge(struct 
  	if (next && next->vm_end == end)		/* cases 6, 7, 8 */
  		next = next->vm_next;
  
@@ -68630,7 +68425,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	/*
  	 * Can it merge with the predecessor?
  	 */
-@@ -799,9 +849,24 @@ struct vm_area_struct *vma_merge(struct 
+@@ -791,9 +841,24 @@ struct vm_area_struct *vma_merge(struct 
  							/* cases 1, 6 */
  			err = vma_adjust(prev, prev->vm_start,
  				next->vm_end, prev->vm_pgoff, NULL);
@@ -68656,7 +68451,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		if (err)
  			return NULL;
  		khugepaged_enter_vma_merge(prev);
-@@ -815,12 +880,27 @@ struct vm_area_struct *vma_merge(struct 
+@@ -807,12 +872,27 @@ struct vm_area_struct *vma_merge(struct 
   			mpol_equal(policy, vma_policy(next)) &&
  			can_vma_merge_before(next, vm_flags,
  					anon_vma, file, pgoff+pglen)) {
@@ -68686,7 +68481,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		if (err)
  			return NULL;
  		khugepaged_enter_vma_merge(area);
-@@ -929,14 +1009,11 @@ none:
+@@ -921,14 +1001,11 @@ none:
  void vm_stat_account(struct mm_struct *mm, unsigned long flags,
  						struct file *file, long pages)
  {
@@ -68702,7 +68497,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		mm->stack_vm += pages;
  	if (flags & (VM_RESERVED|VM_IO))
  		mm->reserved_vm += pages;
-@@ -963,7 +1040,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -955,7 +1032,7 @@ unsigned long do_mmap_pgoff(struct file 
  	 * (the exception is when the underlying filesystem is noexec
  	 *  mounted, in which case we dont add PROT_EXEC.)
  	 */
@@ -68711,7 +68506,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
  			prot |= PROT_EXEC;
  
-@@ -989,7 +1066,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -981,7 +1058,7 @@ unsigned long do_mmap_pgoff(struct file 
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -68720,7 +68515,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1000,6 +1077,36 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -992,6 +1069,36 @@ unsigned long do_mmap_pgoff(struct file 
  	vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
  			mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
  
@@ -68757,7 +68552,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	if (flags & MAP_LOCKED)
  		if (!can_do_mlock())
  			return -EPERM;
-@@ -1011,6 +1118,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1003,6 +1110,7 @@ unsigned long do_mmap_pgoff(struct file 
  		locked += mm->locked_vm;
  		lock_limit = rlimit(RLIMIT_MEMLOCK);
  		lock_limit >>= PAGE_SHIFT;
@@ -68765,7 +68560,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		if (locked > lock_limit && !capable(CAP_IPC_LOCK))
  			return -EAGAIN;
  	}
-@@ -1081,6 +1189,9 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1073,6 +1181,9 @@ unsigned long do_mmap_pgoff(struct file 
  	if (error)
  		return error;
  
@@ -68775,7 +68570,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	return mmap_region(file, addr, len, flags, vm_flags, pgoff);
  }
  EXPORT_SYMBOL(do_mmap_pgoff);
-@@ -1161,7 +1272,7 @@ int vma_wants_writenotify(struct vm_area
+@@ -1153,7 +1264,7 @@ int vma_wants_writenotify(struct vm_area
  	vm_flags_t vm_flags = vma->vm_flags;
  
  	/* If it was private or non-writable, the write bit is already clear */
@@ -68784,7 +68579,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		return 0;
  
  	/* The backer wishes to know when pages are first written to? */
-@@ -1210,14 +1321,24 @@ unsigned long mmap_region(struct file *f
+@@ -1202,14 +1313,24 @@ unsigned long mmap_region(struct file *f
  	unsigned long charged = 0;
  	struct inode *inode =  file ? file->f_path.dentry->d_inode : NULL;
  
@@ -68811,7 +68606,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	}
  
  	/* Check against address space limit. */
-@@ -1266,6 +1387,16 @@ munmap_back:
+@@ -1258,6 +1379,16 @@ munmap_back:
  		goto unacct_error;
  	}
  
@@ -68828,7 +68623,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	vma->vm_mm = mm;
  	vma->vm_start = addr;
  	vma->vm_end = addr + len;
-@@ -1289,6 +1420,19 @@ munmap_back:
+@@ -1281,6 +1412,19 @@ munmap_back:
  		error = file->f_op->mmap(file, vma);
  		if (error)
  			goto unmap_and_free_vma;
@@ -68848,7 +68643,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		if (vm_flags & VM_EXECUTABLE)
  			added_exe_file_vma(mm);
  
-@@ -1324,6 +1468,11 @@ munmap_back:
+@@ -1316,6 +1460,11 @@ munmap_back:
  	vma_link(mm, vma, prev, rb_link, rb_parent);
  	file = vma->vm_file;
  
@@ -68860,7 +68655,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	/* Once vma denies write, undo our temporary denial count */
  	if (correct_wcount)
  		atomic_inc(&inode->i_writecount);
-@@ -1332,6 +1481,7 @@ out:
+@@ -1324,6 +1473,7 @@ out:
  
  	mm->total_vm += len >> PAGE_SHIFT;
  	vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
@@ -68868,7 +68663,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	if (vm_flags & VM_LOCKED) {
  		if (!mlock_vma_pages_range(vma, addr, addr + len))
  			mm->locked_vm += (len >> PAGE_SHIFT);
-@@ -1349,6 +1499,12 @@ unmap_and_free_vma:
+@@ -1341,6 +1491,12 @@ unmap_and_free_vma:
  	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
  	charged = 0;
  free_vma:
@@ -68881,7 +68676,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	kmem_cache_free(vm_area_cachep, vma);
  unacct_error:
  	if (charged)
-@@ -1356,6 +1512,44 @@ unacct_error:
+@@ -1348,6 +1504,44 @@ unacct_error:
  	return error;
  }
  
@@ -68926,7 +68721,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  /* Get an address range which is currently unmapped.
   * For shmat() with addr=0.
   *
-@@ -1382,18 +1576,23 @@ arch_get_unmapped_area(struct file *filp
+@@ -1374,18 +1568,23 @@ arch_get_unmapped_area(struct file *filp
  	if (flags & MAP_FIXED)
  		return addr;
  
@@ -68957,7 +68752,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	}
  
  full_search:
-@@ -1404,34 +1603,40 @@ full_search:
+@@ -1396,34 +1595,40 @@ full_search:
  			 * Start a new search - just in case we missed
  			 * some holes.
  			 */
@@ -69009,7 +68804,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		mm->free_area_cache = addr;
  		mm->cached_hole_size = ~0UL;
  	}
-@@ -1449,7 +1654,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1441,7 +1646,7 @@ arch_get_unmapped_area_topdown(struct fi
  {
  	struct vm_area_struct *vma;
  	struct mm_struct *mm = current->mm;
@@ -69018,7 +68813,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  
  	/* requested length too big for entire address space */
  	if (len > TASK_SIZE)
-@@ -1458,13 +1663,18 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1450,13 +1655,18 @@ arch_get_unmapped_area_topdown(struct fi
  	if (flags & MAP_FIXED)
  		return addr;
  
@@ -69041,7 +68836,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	}
  
  	/* check if free_area_cache is useful for us */
-@@ -1479,7 +1689,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1471,7 +1681,7 @@ arch_get_unmapped_area_topdown(struct fi
  	/* make sure it can fit in the remaining address space */
  	if (addr > len) {
  		vma = find_vma(mm, addr-len);
@@ -69050,7 +68845,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  			/* remember the address as a hint for next time */
  			return (mm->free_area_cache = addr-len);
  	}
-@@ -1496,7 +1706,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1488,7 +1698,7 @@ arch_get_unmapped_area_topdown(struct fi
  		 * return with success:
  		 */
  		vma = find_vma(mm, addr);
@@ -69059,7 +68854,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  			/* remember the address as a hint for next time */
  			return (mm->free_area_cache = addr);
  
-@@ -1505,8 +1715,8 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1497,8 +1707,8 @@ arch_get_unmapped_area_topdown(struct fi
   		        mm->cached_hole_size = vma->vm_start - addr;
  
  		/* try just below the current vma->vm_start */
@@ -69070,7 +68865,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  
  bottomup:
  	/*
-@@ -1515,13 +1725,21 @@ bottomup:
+@@ -1507,13 +1717,21 @@ bottomup:
  	 * can happen with large stack limits and large mmap()
  	 * allocations.
  	 */
@@ -69094,7 +68889,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
-@@ -1530,6 +1748,12 @@ bottomup:
+@@ -1522,6 +1740,12 @@ bottomup:
  
  void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  {
@@ -69107,7 +68902,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	/*
  	 * Is this a new hole at the highest possible address?
  	 */
-@@ -1537,8 +1761,10 @@ void arch_unmap_area_topdown(struct mm_s
+@@ -1529,8 +1753,10 @@ void arch_unmap_area_topdown(struct mm_s
  		mm->free_area_cache = addr;
  
  	/* dont allow allocations above current base */
@@ -69119,7 +68914,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  }
  
  unsigned long
-@@ -1646,6 +1872,28 @@ out:
+@@ -1638,6 +1864,28 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -69148,7 +68943,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1662,6 +1910,7 @@ static int acct_stack_growth(struct vm_a
+@@ -1654,6 +1902,7 @@ static int acct_stack_growth(struct vm_a
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -69156,7 +68951,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
  		return -ENOMEM;
  
-@@ -1672,6 +1921,7 @@ static int acct_stack_growth(struct vm_a
+@@ -1664,6 +1913,7 @@ static int acct_stack_growth(struct vm_a
  		locked = mm->locked_vm + grow;
  		limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
  		limit >>= PAGE_SHIFT;
@@ -69164,7 +68959,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		if (locked > limit && !capable(CAP_IPC_LOCK))
  			return -ENOMEM;
  	}
-@@ -1702,37 +1952,48 @@ static int acct_stack_growth(struct vm_a
+@@ -1694,37 +1944,48 @@ static int acct_stack_growth(struct vm_a
   * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
   * vma is the last one with address > vma->vm_end.  Have to extend vma.
   */
@@ -69222,7 +69017,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		unsigned long size, grow;
  
  		size = address - vma->vm_start;
-@@ -1747,6 +2008,8 @@ int expand_upwards(struct vm_area_struct
+@@ -1739,6 +2000,8 @@ int expand_upwards(struct vm_area_struct
  			}
  		}
  	}
@@ -69231,7 +69026,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	vma_unlock_anon_vma(vma);
  	khugepaged_enter_vma_merge(vma);
  	return error;
-@@ -1760,6 +2023,8 @@ int expand_downwards(struct vm_area_stru
+@@ -1752,6 +2015,8 @@ int expand_downwards(struct vm_area_stru
  				   unsigned long address)
  {
  	int error;
@@ -69240,7 +69035,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  
  	/*
  	 * We must make sure the anon_vma is allocated
-@@ -1773,6 +2038,15 @@ int expand_downwards(struct vm_area_stru
+@@ -1765,6 +2030,15 @@ int expand_downwards(struct vm_area_stru
  	if (error)
  		return error;
  
@@ -69256,7 +69051,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	vma_lock_anon_vma(vma);
  
  	/*
-@@ -1782,9 +2056,17 @@ int expand_downwards(struct vm_area_stru
+@@ -1774,9 +2048,17 @@ int expand_downwards(struct vm_area_stru
  	 */
  
  	/* Somebody else might have raced and expanded it already */
@@ -69275,7 +69070,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		size = vma->vm_end - address;
  		grow = (vma->vm_start - address) >> PAGE_SHIFT;
  
-@@ -1794,11 +2076,22 @@ int expand_downwards(struct vm_area_stru
+@@ -1786,11 +2068,22 @@ int expand_downwards(struct vm_area_stru
  			if (!error) {
  				vma->vm_start = address;
  				vma->vm_pgoff -= grow;
@@ -69298,7 +69093,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	khugepaged_enter_vma_merge(vma);
  	return error;
  }
-@@ -1868,6 +2161,13 @@ static void remove_vma_list(struct mm_st
+@@ -1860,6 +2153,13 @@ static void remove_vma_list(struct mm_st
  	do {
  		long nrpages = vma_pages(vma);
  
@@ -69312,7 +69107,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		mm->total_vm -= nrpages;
  		vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
  		vma = remove_vma(vma);
-@@ -1913,6 +2213,16 @@ detach_vmas_to_be_unmapped(struct mm_str
+@@ -1905,6 +2205,16 @@ detach_vmas_to_be_unmapped(struct mm_str
  	insertion_point = (prev ? &prev->vm_next : &mm->mmap);
  	vma->vm_prev = NULL;
  	do {
@@ -69329,7 +69124,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		rb_erase(&vma->vm_rb, &mm->mm_rb);
  		mm->map_count--;
  		tail_vma = vma;
-@@ -1941,14 +2251,33 @@ static int __split_vma(struct mm_struct 
+@@ -1933,14 +2243,33 @@ static int __split_vma(struct mm_struct 
  	struct vm_area_struct *new;
  	int err = -ENOMEM;
  
@@ -69363,7 +69158,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	/* most fields are the same, copy all, and then fixup */
  	*new = *vma;
  
-@@ -1961,6 +2290,22 @@ static int __split_vma(struct mm_struct 
+@@ -1953,6 +2282,22 @@ static int __split_vma(struct mm_struct 
  		new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
  	}
  
@@ -69386,7 +69181,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	pol = mpol_dup(vma_policy(vma));
  	if (IS_ERR(pol)) {
  		err = PTR_ERR(pol);
-@@ -1986,6 +2331,42 @@ static int __split_vma(struct mm_struct 
+@@ -1978,6 +2323,42 @@ static int __split_vma(struct mm_struct 
  	else
  		err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
@@ -69429,7 +69224,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	/* Success. */
  	if (!err)
  		return 0;
-@@ -1998,10 +2379,18 @@ static int __split_vma(struct mm_struct 
+@@ -1990,10 +2371,18 @@ static int __split_vma(struct mm_struct 
  			removed_exe_file_vma(mm);
  		fput(new->vm_file);
  	}
@@ -69449,7 +69244,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	kmem_cache_free(vm_area_cachep, new);
   out_err:
  	return err;
-@@ -2014,6 +2403,15 @@ static int __split_vma(struct mm_struct 
+@@ -2006,6 +2395,15 @@ static int __split_vma(struct mm_struct 
  int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  	      unsigned long addr, int new_below)
  {
@@ -69465,7 +69260,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	if (mm->map_count >= sysctl_max_map_count)
  		return -ENOMEM;
  
-@@ -2025,11 +2423,30 @@ int split_vma(struct mm_struct *mm, stru
+@@ -2017,11 +2415,30 @@ int split_vma(struct mm_struct *mm, stru
   * work.  This now handles partial unmappings.
   * Jeremy Fitzhardinge <jeremy@goop.org>
   */
@@ -69496,7 +69291,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
  		return -EINVAL;
  
-@@ -2104,6 +2521,8 @@ int do_munmap(struct mm_struct *mm, unsi
+@@ -2096,6 +2513,8 @@ int do_munmap(struct mm_struct *mm, unsi
  	/* Fix up all other VM information */
  	remove_vma_list(mm, vma);
  
@@ -69505,7 +69300,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	return 0;
  }
  
-@@ -2116,22 +2535,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
+@@ -2108,22 +2527,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
  
  	profile_munmap(addr);
  
@@ -69534,7 +69329,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  /*
   *  this is really a simplified "do_mmap".  it only handles
   *  anonymous maps.  eventually we may be able to do some
-@@ -2145,6 +2560,7 @@ unsigned long do_brk(unsigned long addr,
+@@ -2137,6 +2552,7 @@ unsigned long do_brk(unsigned long addr,
  	struct rb_node ** rb_link, * rb_parent;
  	pgoff_t pgoff = addr >> PAGE_SHIFT;
  	int error;
@@ -69542,7 +69337,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  
  	len = PAGE_ALIGN(len);
  	if (!len)
-@@ -2156,16 +2572,30 @@ unsigned long do_brk(unsigned long addr,
+@@ -2148,16 +2564,30 @@ unsigned long do_brk(unsigned long addr,
  
  	flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
  
@@ -69574,7 +69369,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		locked += mm->locked_vm;
  		lock_limit = rlimit(RLIMIT_MEMLOCK);
  		lock_limit >>= PAGE_SHIFT;
-@@ -2182,22 +2612,22 @@ unsigned long do_brk(unsigned long addr,
+@@ -2174,22 +2604,22 @@ unsigned long do_brk(unsigned long addr,
  	/*
  	 * Clear old maps.  this also does some error checking for us
  	 */
@@ -69601,7 +69396,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		return -ENOMEM;
  
  	/* Can we just expand an old private anonymous mapping? */
-@@ -2211,7 +2641,7 @@ unsigned long do_brk(unsigned long addr,
+@@ -2203,7 +2633,7 @@ unsigned long do_brk(unsigned long addr,
  	 */
  	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
  	if (!vma) {
@@ -69610,7 +69405,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  		return -ENOMEM;
  	}
  
-@@ -2225,11 +2655,12 @@ unsigned long do_brk(unsigned long addr,
+@@ -2217,11 +2647,12 @@ unsigned long do_brk(unsigned long addr,
  	vma_link(mm, vma, prev, rb_link, rb_parent);
  out:
  	perf_event_mmap(vma);
@@ -69625,7 +69420,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	return addr;
  }
  
-@@ -2276,8 +2707,10 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2268,8 +2699,10 @@ void exit_mmap(struct mm_struct *mm)
  	 * Walk the list again, actually closing and freeing it,
  	 * with preemption enabled, without holding any MM locks.
  	 */
@@ -69637,7 +69432,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  
  	BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
  }
-@@ -2291,6 +2724,13 @@ int insert_vm_struct(struct mm_struct * 
+@@ -2283,6 +2716,13 @@ int insert_vm_struct(struct mm_struct * 
  	struct vm_area_struct * __vma, * prev;
  	struct rb_node ** rb_link, * rb_parent;
  
@@ -69651,7 +69446,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	/*
  	 * The vm_pgoff of a purely anonymous vma should be irrelevant
  	 * until its first write fault, when page's anon_vma and index
-@@ -2313,7 +2753,22 @@ int insert_vm_struct(struct mm_struct * 
+@@ -2305,7 +2745,22 @@ int insert_vm_struct(struct mm_struct * 
  	if ((vma->vm_flags & VM_ACCOUNT) &&
  	     security_vm_enough_memory_mm(mm, vma_pages(vma)))
  		return -ENOMEM;
@@ -69674,7 +69469,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	return 0;
  }
  
-@@ -2331,6 +2786,8 @@ struct vm_area_struct *copy_vma(struct v
+@@ -2323,6 +2778,8 @@ struct vm_area_struct *copy_vma(struct v
  	struct rb_node **rb_link, *rb_parent;
  	struct mempolicy *pol;
  
@@ -69683,7 +69478,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	/*
  	 * If anonymous vma has not yet been faulted, update new pgoff
  	 * to match new location, to increase its chance of merging.
-@@ -2381,6 +2838,39 @@ struct vm_area_struct *copy_vma(struct v
+@@ -2373,6 +2830,39 @@ struct vm_area_struct *copy_vma(struct v
  	return NULL;
  }
  
@@ -69723,7 +69518,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  /*
   * Return true if the calling process may expand its vm space by the passed
   * number of pages
-@@ -2391,7 +2881,7 @@ int may_expand_vm(struct mm_struct *mm, 
+@@ -2383,7 +2873,7 @@ int may_expand_vm(struct mm_struct *mm, 
  	unsigned long lim;
  
  	lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
@@ -69732,7 +69527,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
  	if (cur + npages > lim)
  		return 0;
  	return 1;
-@@ -2462,6 +2952,22 @@ int install_special_mapping(struct mm_st
+@@ -2454,6 +2944,22 @@ int install_special_mapping(struct mm_st
  	vma->vm_start = addr;
  	vma->vm_end = addr + len;
  
@@ -69755,9 +69550,9 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/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.9/mm/mprotect.c linux-3.0.9/mm/mprotect.c
---- linux-3.0.9/mm/mprotect.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/mprotect.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/mprotect.c linux-3.1.1/mm/mprotect.c
+--- linux-3.1.1/mm/mprotect.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/mprotect.c	2011-11-16 18:40:44.000000000 -0500
 @@ -23,10 +23,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -69984,9 +69779,9 @@ diff -urNp linux-3.0.9/mm/mprotect.c linux-3.0.9/mm/mprotect.c
  		nstart = tmp;
  
  		if (nstart < prev->vm_end)
-diff -urNp linux-3.0.9/mm/mremap.c linux-3.0.9/mm/mremap.c
---- linux-3.0.9/mm/mremap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/mremap.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/mremap.c linux-3.1.1/mm/mremap.c
+--- linux-3.1.1/mm/mremap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/mremap.c	2011-11-16 18:39:08.000000000 -0500
 @@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
  			continue;
  		pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -70091,9 +69886,9 @@ diff -urNp linux-3.0.9/mm/mremap.c linux-3.0.9/mm/mremap.c
  	}
  out:
  	if (ret & ~PAGE_MASK)
-diff -urNp linux-3.0.9/mm/nobootmem.c linux-3.0.9/mm/nobootmem.c
---- linux-3.0.9/mm/nobootmem.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/nobootmem.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/nobootmem.c linux-3.1.1/mm/nobootmem.c
+--- linux-3.1.1/mm/nobootmem.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/nobootmem.c	2011-11-16 18:39:08.000000000 -0500
 @@ -110,19 +110,30 @@ static void __init __free_pages_memory(u
  unsigned long __init free_all_memory_core_early(int nodeid)
  {
@@ -70127,10 +69922,10 @@ diff -urNp linux-3.0.9/mm/nobootmem.c linux-3.0.9/mm/nobootmem.c
  
  	return count;
  }
-diff -urNp linux-3.0.9/mm/nommu.c linux-3.0.9/mm/nommu.c
---- linux-3.0.9/mm/nommu.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/nommu.c	2011-11-15 20:03:00.000000000 -0500
-@@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI
+diff -urNp linux-3.1.1/mm/nommu.c linux-3.1.1/mm/nommu.c
+--- linux-3.1.1/mm/nommu.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/nommu.c	2011-11-16 18:39:08.000000000 -0500
+@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMI
  int sysctl_overcommit_ratio = 50; /* default is 50% */
  int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
  int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
@@ -70138,7 +69933,7 @@ diff -urNp linux-3.0.9/mm/nommu.c linux-3.0.9/mm/nommu.c
  
  atomic_long_t mmap_pages_allocated;
  
-@@ -826,15 +825,6 @@ struct vm_area_struct *find_vma(struct m
+@@ -825,15 +824,6 @@ struct vm_area_struct *find_vma(struct m
  EXPORT_SYMBOL(find_vma);
  
  /*
@@ -70154,7 +69949,7 @@ diff -urNp linux-3.0.9/mm/nommu.c linux-3.0.9/mm/nommu.c
   * expand a stack to a given address
   * - not supported under NOMMU conditions
   */
-@@ -1554,6 +1544,7 @@ int split_vma(struct mm_struct *mm, stru
+@@ -1553,6 +1543,7 @@ int split_vma(struct mm_struct *mm, stru
  
  	/* most fields are the same, copy all, and then fixup */
  	*new = *vma;
@@ -70162,9 +69957,9 @@ diff -urNp linux-3.0.9/mm/nommu.c linux-3.0.9/mm/nommu.c
  	*region = *vma->vm_region;
  	new->vm_region = region;
  
-diff -urNp linux-3.0.9/mm/page_alloc.c linux-3.0.9/mm/page_alloc.c
---- linux-3.0.9/mm/page_alloc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/page_alloc.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/page_alloc.c linux-3.1.1/mm/page_alloc.c
+--- linux-3.1.1/mm/page_alloc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/page_alloc.c	2011-11-16 18:40:44.000000000 -0500
 @@ -340,7 +340,7 @@ out:
   * This usage means that zero-order pages may not be compound.
   */
@@ -70209,7 +70004,7 @@ diff -urNp linux-3.0.9/mm/page_alloc.c linux-3.0.9/mm/page_alloc.c
  
  	if (order && (gfp_flags & __GFP_COMP))
  		prep_compound_page(page, order);
-@@ -2557,6 +2569,8 @@ void show_free_areas(unsigned int filter
+@@ -2539,6 +2551,8 @@ void show_free_areas(unsigned int filter
  	int cpu;
  	struct zone *zone;
  
@@ -70218,7 +70013,7 @@ diff -urNp linux-3.0.9/mm/page_alloc.c linux-3.0.9/mm/page_alloc.c
  	for_each_populated_zone(zone) {
  		if (skip_free_areas_node(filter, zone_to_nid(zone)))
  			continue;
-@@ -3368,7 +3382,13 @@ static int pageblock_is_reserved(unsigne
+@@ -3350,7 +3364,13 @@ static int pageblock_is_reserved(unsigne
  	unsigned long pfn;
  
  	for (pfn = start_pfn; pfn < end_pfn; pfn++) {
@@ -70232,9 +70027,9 @@ diff -urNp linux-3.0.9/mm/page_alloc.c linux-3.0.9/mm/page_alloc.c
  			return 1;
  	}
  	return 0;
-diff -urNp linux-3.0.9/mm/percpu.c linux-3.0.9/mm/percpu.c
---- linux-3.0.9/mm/percpu.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/percpu.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/percpu.c linux-3.1.1/mm/percpu.c
+--- linux-3.1.1/mm/percpu.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/percpu.c	2011-11-16 18:39:08.000000000 -0500
 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu 
  static unsigned int pcpu_last_unit_cpu __read_mostly;
  
@@ -70244,10 +70039,10 @@ diff -urNp linux-3.0.9/mm/percpu.c linux-3.0.9/mm/percpu.c
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;		/* cpu -> unit */
-diff -urNp linux-3.0.9/mm/rmap.c linux-3.0.9/mm/rmap.c
---- linux-3.0.9/mm/rmap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/rmap.c	2011-11-15 20:03:00.000000000 -0500
-@@ -153,6 +153,10 @@ int anon_vma_prepare(struct vm_area_stru
+diff -urNp linux-3.1.1/mm/rmap.c linux-3.1.1/mm/rmap.c
+--- linux-3.1.1/mm/rmap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/rmap.c	2011-11-16 18:39:08.000000000 -0500
+@@ -152,6 +152,10 @@ int anon_vma_prepare(struct vm_area_stru
  	struct anon_vma *anon_vma = vma->anon_vma;
  	struct anon_vma_chain *avc;
  
@@ -70258,7 +70053,7 @@ diff -urNp linux-3.0.9/mm/rmap.c linux-3.0.9/mm/rmap.c
  	might_sleep();
  	if (unlikely(!anon_vma)) {
  		struct mm_struct *mm = vma->vm_mm;
-@@ -162,6 +166,12 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -161,6 +165,12 @@ int anon_vma_prepare(struct vm_area_stru
  		if (!avc)
  			goto out_enomem;
  
@@ -70271,7 +70066,7 @@ diff -urNp linux-3.0.9/mm/rmap.c linux-3.0.9/mm/rmap.c
  		anon_vma = find_mergeable_anon_vma(vma);
  		allocated = NULL;
  		if (!anon_vma) {
-@@ -175,6 +185,21 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -174,6 +184,21 @@ int anon_vma_prepare(struct vm_area_stru
  		/* page_table_lock to protect against threads */
  		spin_lock(&mm->page_table_lock);
  		if (likely(!vma->anon_vma)) {
@@ -70293,7 +70088,7 @@ diff -urNp linux-3.0.9/mm/rmap.c linux-3.0.9/mm/rmap.c
  			vma->anon_vma = anon_vma;
  			avc->anon_vma = anon_vma;
  			avc->vma = vma;
-@@ -188,12 +213,24 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -187,12 +212,24 @@ int anon_vma_prepare(struct vm_area_stru
  
  		if (unlikely(allocated))
  			put_anon_vma(allocated);
@@ -70318,7 +70113,7 @@ diff -urNp linux-3.0.9/mm/rmap.c linux-3.0.9/mm/rmap.c
  	anon_vma_chain_free(avc);
   out_enomem:
  	return -ENOMEM;
-@@ -244,7 +281,7 @@ static void anon_vma_chain_link(struct v
+@@ -243,7 +280,7 @@ static void anon_vma_chain_link(struct v
   * Attach the anon_vmas from src to dst.
   * Returns 0 on success, -ENOMEM on failure.
   */
@@ -70327,7 +70122,7 @@ diff -urNp linux-3.0.9/mm/rmap.c linux-3.0.9/mm/rmap.c
  {
  	struct anon_vma_chain *avc, *pavc;
  	struct anon_vma *root = NULL;
-@@ -277,7 +314,7 @@ int anon_vma_clone(struct vm_area_struct
+@@ -276,7 +313,7 @@ int anon_vma_clone(struct vm_area_struct
   * the corresponding VMA in the parent process is attached to.
   * Returns 0 on success, non-zero on failure.
   */
@@ -70336,11 +70131,11 @@ diff -urNp linux-3.0.9/mm/rmap.c linux-3.0.9/mm/rmap.c
  {
  	struct anon_vma_chain *avc;
  	struct anon_vma *anon_vma;
-diff -urNp linux-3.0.9/mm/shmem.c linux-3.0.9/mm/shmem.c
---- linux-3.0.9/mm/shmem.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/shmem.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/shmem.c linux-3.1.1/mm/shmem.c
+--- linux-3.1.1/mm/shmem.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/shmem.c	2011-11-16 19:28:28.000000000 -0500
 @@ -31,7 +31,7 @@
- #include <linux/percpu_counter.h>
+ #include <linux/module.h>
  #include <linux/swap.h>
  
 -static struct vfsmount *shm_mnt;
@@ -70348,25 +70143,25 @@ diff -urNp linux-3.0.9/mm/shmem.c linux-3.0.9/mm/shmem.c
  
  #ifdef CONFIG_SHMEM
  /*
-@@ -1101,6 +1101,8 @@ static int shmem_writepage(struct page *
- 		goto unlock;
- 	}
- 	entry = shmem_swp_entry(info, index, NULL);
-+	if (!entry)
-+		goto unlock;
- 	if (entry->val) {
- 		/*
- 		 * The more uptodate page coming down from a stacked
-@@ -1172,6 +1174,8 @@ static struct page *shmem_swapin(swp_ent
+@@ -74,7 +74,7 @@ static struct vfsmount *shm_mnt;
+ #define BOGO_DIRENT_SIZE 20
+ 
+ /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
+-#define SHORT_SYMLINK_LEN 128
++#define SHORT_SYMLINK_LEN 64
+ 
+ struct shmem_xattr {
+ 	struct list_head list;	/* anchored by shmem_inode_info->xattr_list */
+@@ -769,6 +769,8 @@ static struct page *shmem_swapin(swp_ent
+ 	struct mempolicy mpol, *spol;
  	struct vm_area_struct pvma;
- 	struct page *page;
  
 +	pax_track_stack();
 +
  	spol = mpol_cond_copy(&mpol,
- 				mpol_shared_policy_lookup(&info->policy, idx));
+ 			mpol_shared_policy_lookup(&info->policy, index));
  
-@@ -2568,8 +2572,7 @@ int shmem_fill_super(struct super_block 
+@@ -2149,8 +2151,7 @@ int shmem_fill_super(struct super_block 
  	int err = -ENOMEM;
  
  	/* Round up to L1_CACHE_BYTES to resist false sharing */
@@ -70376,9 +70171,9 @@ diff -urNp linux-3.0.9/mm/shmem.c linux-3.0.9/mm/shmem.c
  	if (!sbinfo)
  		return -ENOMEM;
  
-diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c
---- linux-3.0.9/mm/slab.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/slab.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/slab.c linux-3.1.1/mm/slab.c
+--- linux-3.1.1/mm/slab.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/slab.c	2011-11-16 18:40:44.000000000 -0500
 @@ -151,7 +151,7 @@
  
  /* Legal flag mask for kmem_cache_create(). */
@@ -70439,7 +70234,7 @@ diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c
  #undef CACHE
  };
  
-@@ -1530,7 +1530,7 @@ void __init kmem_cache_init(void)
+@@ -1571,7 +1571,7 @@ void __init kmem_cache_init(void)
  	sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
  					sizes[INDEX_AC].cs_size,
  					ARCH_KMALLOC_MINALIGN,
@@ -70448,7 +70243,7 @@ diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c
  					NULL);
  
  	if (INDEX_AC != INDEX_L3) {
-@@ -1538,7 +1538,7 @@ void __init kmem_cache_init(void)
+@@ -1579,7 +1579,7 @@ void __init kmem_cache_init(void)
  			kmem_cache_create(names[INDEX_L3].name,
  				sizes[INDEX_L3].cs_size,
  				ARCH_KMALLOC_MINALIGN,
@@ -70457,7 +70252,7 @@ diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c
  				NULL);
  	}
  
-@@ -1556,7 +1556,7 @@ void __init kmem_cache_init(void)
+@@ -1597,7 +1597,7 @@ void __init kmem_cache_init(void)
  			sizes->cs_cachep = kmem_cache_create(names->name,
  					sizes->cs_size,
  					ARCH_KMALLOC_MINALIGN,
@@ -70466,7 +70261,7 @@ diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c
  					NULL);
  		}
  #ifdef CONFIG_ZONE_DMA
-@@ -4272,10 +4272,10 @@ static int s_show(struct seq_file *m, vo
+@@ -4324,10 +4324,10 @@ static int s_show(struct seq_file *m, vo
  	}
  	/* cpu stats */
  	{
@@ -70481,7 +70276,7 @@ diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c
  
  		seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
  			   allochit, allocmiss, freehit, freemiss);
-@@ -4532,15 +4532,66 @@ static const struct file_operations proc
+@@ -4584,15 +4584,70 @@ static const struct file_operations proc
  
  static int __init slab_proc_init(void)
  {
@@ -70511,10 +70306,12 @@ diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c
 +	struct slab *slabp;
 +	unsigned int objnr;
 +	unsigned long offset;
++	const char *type;
 +
 +	if (!n)
 +		return;
 +
++	type = "<null>";
 +	if (ZERO_OR_NULL_PTR(ptr))
 +		goto report;
 +
@@ -70523,6 +70320,7 @@ diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c
 +
 +	page = virt_to_head_page(ptr);
 +
++	type = "<process stack>";
 +	if (!PageSlab(page)) {
 +		if (object_is_on_stack(ptr, n) == -1)
 +			goto report;
@@ -70530,6 +70328,7 @@ diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c
 +	}
 +
 +	cachep = page_get_cache(page);
++	type = cachep->name;
 +	if (!(cachep->flags & SLAB_USERCOPY))
 +		goto report;
 +
@@ -70541,7 +70340,7 @@ diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c
 +		return;
 +
 +report:
-+	pax_report_usercopy(ptr, n, to, cachep ? cachep->name : NULL);
++	pax_report_usercopy(ptr, n, to, type);
 +#endif
 +
 +}
@@ -70550,9 +70349,9 @@ diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/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.9/mm/slob.c linux-3.0.9/mm/slob.c
---- linux-3.0.9/mm/slob.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/slob.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/slob.c linux-3.1.1/mm/slob.c
+--- linux-3.1.1/mm/slob.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/slob.c	2011-11-16 18:39:08.000000000 -0500
 @@ -29,7 +29,7 @@
   * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
   * alloc_pages() directly, allocating compound pages so the page order
@@ -70658,8 +70457,8 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
 +	slob_t *m;
  	void *ret;
  
- 	lockdep_trace_alloc(gfp);
-@@ -492,7 +494,10 @@ void *__kmalloc_node(size_t size, gfp_t 
+ 	gfp &= gfp_allowed_mask;
+@@ -494,7 +496,10 @@ void *__kmalloc_node(size_t size, gfp_t 
  
  		if (!m)
  			return NULL;
@@ -70671,7 +70470,7 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
  		ret = (void *)m + align;
  
  		trace_kmalloc_node(_RET_IP_, ret,
-@@ -504,16 +509,25 @@ void *__kmalloc_node(size_t size, gfp_t 
+@@ -506,16 +511,25 @@ void *__kmalloc_node(size_t size, gfp_t 
  			gfp |= __GFP_COMP;
  		ret = slob_new_pages(gfp, order, node);
  		if (ret) {
@@ -70701,7 +70500,7 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
  	return ret;
  }
  EXPORT_SYMBOL(__kmalloc_node);
-@@ -531,13 +545,88 @@ void kfree(const void *block)
+@@ -533,13 +547,92 @@ void kfree(const void *block)
  	sp = slob_page(block);
  	if (is_slob_page(sp)) {
  		int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
@@ -70727,16 +70526,19 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
 +	const slob_t *free;
 +	const void *base;
 +	unsigned long flags;
++	const char *type;
 +
 +	if (!n)
 +		return;
 +
++	type = "<null>";
 +	if (ZERO_OR_NULL_PTR(ptr))
 +		goto report;
 +
 +	if (!virt_addr_valid(ptr))
 +		return;
 +
++	type = "<process stack>";
 +	sp = slob_page(ptr);
 +	if (!PageSlab((struct page*)sp)) {
 +		if (object_is_on_stack(ptr, n) == -1)
@@ -70744,6 +70546,7 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
 +		return;
 +	}
 +
++	type = "<slob>";
 +	if (sp->size) {
 +		base = page_address(&sp->page);
 +		if (base <= ptr && n <= sp->size - (ptr - base))
@@ -70784,7 +70587,7 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
 +
 +	spin_unlock_irqrestore(&slob_lock, flags);
 +report:
-+	pax_report_usercopy(ptr, n, to, NULL);
++	pax_report_usercopy(ptr, n, to, type);
 +#endif
 +
 +}
@@ -70793,7 +70596,7 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
  /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
  size_t ksize(const void *block)
  {
-@@ -550,10 +639,10 @@ size_t ksize(const void *block)
+@@ -552,10 +645,10 @@ size_t ksize(const void *block)
  	sp = slob_page(block);
  	if (is_slob_page(sp)) {
  		int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
@@ -70807,7 +70610,7 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
  }
  EXPORT_SYMBOL(ksize);
  
-@@ -569,8 +658,13 @@ struct kmem_cache *kmem_cache_create(con
+@@ -571,8 +664,13 @@ struct kmem_cache *kmem_cache_create(con
  {
  	struct kmem_cache *c;
  
@@ -70821,9 +70624,9 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
  
  	if (c) {
  		c->name = name;
-@@ -608,17 +702,25 @@ void *kmem_cache_alloc_node(struct kmem_
- {
- 	void *b;
+@@ -614,17 +712,25 @@ void *kmem_cache_alloc_node(struct kmem_
+ 
+ 	lockdep_trace_alloc(flags);
  
 +#ifdef CONFIG_PAX_USERCOPY
 +	b = __kmalloc_node_align(c->size, flags, node, c->align);
@@ -70847,7 +70650,7 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
  
  	if (c->ctor)
  		c->ctor(b);
-@@ -630,10 +732,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
+@@ -636,10 +742,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
  
  static void __kmem_cache_free(void *b, int size)
  {
@@ -70866,7 +70669,7 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
  }
  
  static void kmem_rcu_free(struct rcu_head *head)
-@@ -646,17 +754,31 @@ static void kmem_rcu_free(struct rcu_hea
+@@ -652,17 +764,31 @@ static void kmem_rcu_free(struct rcu_hea
  
  void kmem_cache_free(struct kmem_cache *c, void *b)
  {
@@ -70901,10 +70704,10 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
  }
  EXPORT_SYMBOL(kmem_cache_free);
  
-diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
---- linux-3.0.9/mm/slub.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/slub.c	2011-11-15 20:03:00.000000000 -0500
-@@ -200,7 +200,7 @@ struct track {
+diff -urNp linux-3.1.1/mm/slub.c linux-3.1.1/mm/slub.c
+--- linux-3.1.1/mm/slub.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/slub.c	2011-11-16 19:27:25.000000000 -0500
+@@ -208,7 +208,7 @@ struct track {
  
  enum track_item { TRACK_ALLOC, TRACK_FREE };
  
@@ -70913,16 +70716,16 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  static int sysfs_slab_add(struct kmem_cache *);
  static int sysfs_slab_alias(struct kmem_cache *, const char *);
  static void sysfs_slab_remove(struct kmem_cache *);
-@@ -442,7 +442,7 @@ static void print_track(const char *s, s
+@@ -556,7 +556,7 @@ static void print_track(const char *s, s
  	if (!t->addr)
  		return;
  
 -	printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
 +	printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
  		s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
- }
- 
-@@ -2137,6 +2137,8 @@ void kmem_cache_free(struct kmem_cache *
+ #ifdef CONFIG_STACKTRACE
+ 	{
+@@ -2456,6 +2456,8 @@ void kmem_cache_free(struct kmem_cache *
  
  	page = virt_to_head_page(x);
  
@@ -70931,7 +70734,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  	slab_free(s, page, x, _RET_IP_);
  
  	trace_kmem_cache_free(_RET_IP_, x);
-@@ -2170,7 +2172,7 @@ static int slub_min_objects;
+@@ -2489,7 +2491,7 @@ static int slub_min_objects;
   * Merge control. If this is set then no merging of slab caches will occur.
   * (Could be removed. This was introduced to pacify the merge skeptics.)
   */
@@ -70940,7 +70743,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  
  /*
   * Calculate the order of allocation given an slab object size.
-@@ -2594,7 +2596,7 @@ static int kmem_cache_open(struct kmem_c
+@@ -2912,7 +2914,7 @@ static int kmem_cache_open(struct kmem_c
  	 * list to avoid pounding the page allocator excessively.
  	 */
  	set_min_partial(s, ilog2(s->size));
@@ -70949,7 +70752,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  #ifdef CONFIG_NUMA
  	s->remote_node_defrag_ratio = 1000;
  #endif
-@@ -2699,8 +2701,7 @@ static inline int kmem_cache_close(struc
+@@ -3017,8 +3019,7 @@ static inline int kmem_cache_close(struc
  void kmem_cache_destroy(struct kmem_cache *s)
  {
  	down_write(&slub_lock);
@@ -70959,7 +70762,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  		list_del(&s->list);
  		if (kmem_cache_close(s)) {
  			printk(KERN_ERR "SLUB %s: %s called for cache that "
-@@ -2910,6 +2911,46 @@ void *__kmalloc_node(size_t size, gfp_t 
+@@ -3228,6 +3229,50 @@ void *__kmalloc_node(size_t size, gfp_t 
  EXPORT_SYMBOL(__kmalloc_node);
  #endif
  
@@ -70970,10 +70773,12 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
 +	struct page *page;
 +	struct kmem_cache *s = NULL;
 +	unsigned long offset;
++	const char *type;
 +
 +	if (!n)
 +		return;
 +
++	type = "<null>";
 +	if (ZERO_OR_NULL_PTR(ptr))
 +		goto report;
 +
@@ -70982,6 +70787,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
 +
 +	page = virt_to_head_page(ptr);
 +
++	type = "<process stack>";
 +	if (!PageSlab(page)) {
 +		if (object_is_on_stack(ptr, n) == -1)
 +			goto report;
@@ -70989,6 +70795,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
 +	}
 +
 +	s = page->slab;
++	type = s->name;
 +	if (!(s->flags & SLAB_USERCOPY))
 +		goto report;
 +
@@ -70997,7 +70804,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
 +		return;
 +
 +report:
-+	pax_report_usercopy(ptr, n, to, s ? s->name : NULL);
++	pax_report_usercopy(ptr, n, to, type);
 +#endif
 +
 +}
@@ -71006,7 +70813,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  size_t ksize(const void *object)
  {
  	struct page *page;
-@@ -3154,7 +3195,7 @@ static void __init kmem_cache_bootstrap_
+@@ -3502,7 +3547,7 @@ static void __init kmem_cache_bootstrap_
  	int node;
  
  	list_add(&s->list, &slab_caches);
@@ -71015,7 +70822,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  
  	for_each_node_state(node, N_NORMAL_MEMORY) {
  		struct kmem_cache_node *n = get_node(s, node);
-@@ -3271,17 +3312,17 @@ void __init kmem_cache_init(void)
+@@ -3619,17 +3664,17 @@ void __init kmem_cache_init(void)
  
  	/* Caches that are not of the two-to-the-power-of size */
  	if (KMALLOC_MIN_SIZE <= 32) {
@@ -71036,7 +70843,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  		caches++;
  	}
  
-@@ -3349,7 +3390,7 @@ static int slab_unmergeable(struct kmem_
+@@ -3697,7 +3742,7 @@ static int slab_unmergeable(struct kmem_
  	/*
  	 * We may have set a slab to be unmergeable during bootstrap.
  	 */
@@ -71045,7 +70852,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  		return 1;
  
  	return 0;
-@@ -3408,7 +3449,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3756,7 +3801,7 @@ struct kmem_cache *kmem_cache_create(con
  	down_write(&slub_lock);
  	s = find_mergeable(size, align, flags, name, ctor);
  	if (s) {
@@ -71054,7 +70861,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  		/*
  		 * Adjust the object sizes so that we clear
  		 * the complete object on kzalloc.
-@@ -3417,7 +3458,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3765,7 +3810,7 @@ struct kmem_cache *kmem_cache_create(con
  		s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
  
  		if (sysfs_slab_alias(s, name)) {
@@ -71063,7 +70870,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  			goto err;
  		}
  		up_write(&slub_lock);
-@@ -3545,7 +3586,7 @@ void *__kmalloc_node_track_caller(size_t
+@@ -3893,7 +3938,7 @@ void *__kmalloc_node_track_caller(size_t
  }
  #endif
  
@@ -71072,7 +70879,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  static int count_inuse(struct page *page)
  {
  	return page->inuse;
-@@ -3935,12 +3976,12 @@ static void resiliency_test(void)
+@@ -4280,12 +4325,12 @@ static void resiliency_test(void)
  	validate_slab_cache(kmalloc_caches[9]);
  }
  #else
@@ -71087,7 +70894,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  enum slab_stat_type {
  	SL_ALL,			/* All slabs */
  	SL_PARTIAL,		/* Only partially allocated slabs */
-@@ -4150,7 +4191,7 @@ SLAB_ATTR_RO(ctor);
+@@ -4495,7 +4540,7 @@ SLAB_ATTR_RO(ctor);
  
  static ssize_t aliases_show(struct kmem_cache *s, char *buf)
  {
@@ -71096,7 +70903,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  }
  SLAB_ATTR_RO(aliases);
  
-@@ -4662,6 +4703,7 @@ static char *create_unique_id(struct kme
+@@ -5025,6 +5070,7 @@ static char *create_unique_id(struct kme
  	return name;
  }
  
@@ -71104,7 +70911,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  static int sysfs_slab_add(struct kmem_cache *s)
  {
  	int err;
-@@ -4724,6 +4766,7 @@ static void sysfs_slab_remove(struct kme
+@@ -5087,6 +5133,7 @@ static void sysfs_slab_remove(struct kme
  	kobject_del(&s->kobj);
  	kobject_put(&s->kobj);
  }
@@ -71112,7 +70919,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  
  /*
   * Need to buffer aliases during bootup until sysfs becomes
-@@ -4737,6 +4780,7 @@ struct saved_alias {
+@@ -5100,6 +5147,7 @@ struct saved_alias {
  
  static struct saved_alias *alias_list;
  
@@ -71120,7 +70927,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
  {
  	struct saved_alias *al;
-@@ -4759,6 +4803,7 @@ static int sysfs_slab_alias(struct kmem_
+@@ -5122,6 +5170,7 @@ static int sysfs_slab_alias(struct kmem_
  	alias_list = al;
  	return 0;
  }
@@ -71128,7 +70935,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  
  static int __init slab_sysfs_init(void)
  {
-@@ -4894,7 +4939,13 @@ static const struct file_operations proc
+@@ -5257,7 +5306,13 @@ static const struct file_operations proc
  
  static int __init slab_proc_init(void)
  {
@@ -71143,9 +70950,9 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
  	return 0;
  }
  module_init(slab_proc_init);
-diff -urNp linux-3.0.9/mm/swap.c linux-3.0.9/mm/swap.c
---- linux-3.0.9/mm/swap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/swap.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/swap.c linux-3.1.1/mm/swap.c
+--- linux-3.1.1/mm/swap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/swap.c	2011-11-16 18:39:08.000000000 -0500
 @@ -31,6 +31,7 @@
  #include <linux/backing-dev.h>
  #include <linux/memcontrol.h>
@@ -71163,9 +70970,9 @@ diff -urNp linux-3.0.9/mm/swap.c linux-3.0.9/mm/swap.c
  	(*dtor)(page);
  }
  
-diff -urNp linux-3.0.9/mm/swapfile.c linux-3.0.9/mm/swapfile.c
---- linux-3.0.9/mm/swapfile.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/swapfile.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/swapfile.c linux-3.1.1/mm/swapfile.c
+--- linux-3.1.1/mm/swapfile.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/swapfile.c	2011-11-16 18:39:08.000000000 -0500
 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(swapon_mutex);
  
  static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
@@ -71184,27 +70991,27 @@ diff -urNp linux-3.0.9/mm/swapfile.c linux-3.0.9/mm/swapfile.c
  	wake_up_interruptible(&proc_poll_wait);
  
  out_dput:
-@@ -1692,8 +1692,8 @@ static unsigned swaps_poll(struct file *
+@@ -1687,8 +1687,8 @@ static unsigned swaps_poll(struct file *
  
  	poll_wait(file, &proc_poll_wait, wait);
  
--	if (s->event != atomic_read(&proc_poll_event)) {
--		s->event = atomic_read(&proc_poll_event);
-+	if (s->event != atomic_read_unchecked(&proc_poll_event)) {
-+		s->event = atomic_read_unchecked(&proc_poll_event);
+-	if (seq->poll_event != atomic_read(&proc_poll_event)) {
+-		seq->poll_event = atomic_read(&proc_poll_event);
++	if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
++		seq->poll_event = atomic_read_unchecked(&proc_poll_event);
  		return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
  	}
  
-@@ -1799,7 +1799,7 @@ static int swaps_open(struct inode *inod
- 	}
+@@ -1786,7 +1786,7 @@ static int swaps_open(struct inode *inod
+ 		return ret;
  
- 	s->seq.private = s;
--	s->event = atomic_read(&proc_poll_event);
-+	s->event = atomic_read_unchecked(&proc_poll_event);
- 	return ret;
+ 	seq = file->private_data;
+-	seq->poll_event = atomic_read(&proc_poll_event);
++	seq->poll_event = atomic_read_unchecked(&proc_poll_event);
+ 	return 0;
  }
  
-@@ -2133,7 +2133,7 @@ SYSCALL_DEFINE2(swapon, const char __use
+@@ -2124,7 +2124,7 @@ SYSCALL_DEFINE2(swapon, const char __use
  		(p->flags & SWP_DISCARDABLE) ? "D" : "");
  
  	mutex_unlock(&swapon_mutex);
@@ -71213,9 +71020,9 @@ diff -urNp linux-3.0.9/mm/swapfile.c linux-3.0.9/mm/swapfile.c
  	wake_up_interruptible(&proc_poll_wait);
  
  	if (S_ISREG(inode->i_mode))
-diff -urNp linux-3.0.9/mm/util.c linux-3.0.9/mm/util.c
---- linux-3.0.9/mm/util.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/util.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/util.c linux-3.1.1/mm/util.c
+--- linux-3.1.1/mm/util.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/util.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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.
@@ -71245,9 +71052,9 @@ diff -urNp linux-3.0.9/mm/util.c linux-3.0.9/mm/util.c
  	mm->get_unmapped_area = arch_get_unmapped_area;
  	mm->unmap_area = arch_unmap_area;
  }
-diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
---- linux-3.0.9/mm/vmalloc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/vmalloc.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/vmalloc.c linux-3.1.1/mm/vmalloc.c
+--- linux-3.1.1/mm/vmalloc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/vmalloc.c	2011-11-16 18:40:44.000000000 -0500
 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
  
  	pte = pte_offset_kernel(pmd, addr);
@@ -71351,7 +71158,7 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  			if (!pmd_none(*pmd)) {
  				pte_t *ptep, pte;
  
-@@ -1308,6 +1348,16 @@ static struct vm_struct *__get_vm_area_n
+@@ -1294,6 +1334,16 @@ static struct vm_struct *__get_vm_area_n
  	struct vm_struct *area;
  
  	BUG_ON(in_interrupt());
@@ -71368,7 +71175,7 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  	if (flags & VM_IOREMAP) {
  		int bit = fls(size);
  
-@@ -1540,6 +1590,11 @@ void *vmap(struct page **pages, unsigned
+@@ -1526,6 +1576,11 @@ void *vmap(struct page **pages, unsigned
  	if (count > totalram_pages)
  		return NULL;
  
@@ -71380,21 +71187,21 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  	area = get_vm_area_caller((count << PAGE_SHIFT), flags,
  					__builtin_return_address(0));
  	if (!area)
-@@ -1641,6 +1696,13 @@ void *__vmalloc_node_range(unsigned long
+@@ -1627,6 +1682,13 @@ void *__vmalloc_node_range(unsigned long
  	if (!size || (size >> PAGE_SHIFT) > totalram_pages)
  		return NULL;
  
 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
 +	if (!(pgprot_val(prot) & _PAGE_NX))
-+		area = __get_vm_area_node(size, align, VM_ALLOC | VM_KERNEXEC, VMALLOC_START, VMALLOC_END,
-+						node, gfp_mask, caller);
++		area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
++					  VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
 +	else
 +#endif
 +
  	area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
  				  start, end, node, gfp_mask, caller);
  
-@@ -1686,6 +1748,7 @@ static void *__vmalloc_node(unsigned lon
+@@ -1672,6 +1734,7 @@ static void *__vmalloc_node(unsigned lon
  				gfp_mask, prot, node, caller);
  }
  
@@ -71402,7 +71209,7 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
  {
  	return __vmalloc_node(size, 1, gfp_mask, prot, -1,
-@@ -1709,6 +1772,7 @@ static inline void *__vmalloc_node_flags
+@@ -1695,6 +1758,7 @@ static inline void *__vmalloc_node_flags
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -71410,7 +71217,7 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  void *vmalloc(unsigned long size)
  {
  	return __vmalloc_node_flags(size, -1, GFP_KERNEL | __GFP_HIGHMEM);
-@@ -1725,6 +1789,7 @@ EXPORT_SYMBOL(vmalloc);
+@@ -1711,6 +1775,7 @@ EXPORT_SYMBOL(vmalloc);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -71418,7 +71225,7 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  void *vzalloc(unsigned long size)
  {
  	return __vmalloc_node_flags(size, -1,
-@@ -1739,6 +1804,7 @@ EXPORT_SYMBOL(vzalloc);
+@@ -1725,6 +1790,7 @@ EXPORT_SYMBOL(vzalloc);
   * The resulting memory area is zeroed so it can be mapped to userspace
   * without leaking data.
   */
@@ -71426,7 +71233,7 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  void *vmalloc_user(unsigned long size)
  {
  	struct vm_struct *area;
-@@ -1766,6 +1832,7 @@ EXPORT_SYMBOL(vmalloc_user);
+@@ -1752,6 +1818,7 @@ EXPORT_SYMBOL(vmalloc_user);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -71434,7 +71241,7 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  void *vmalloc_node(unsigned long size, int node)
  {
  	return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1785,6 +1852,7 @@ EXPORT_SYMBOL(vmalloc_node);
+@@ -1771,6 +1838,7 @@ EXPORT_SYMBOL(vmalloc_node);
   * For tight control over page level allocator and protection flags
   * use __vmalloc_node() instead.
   */
@@ -71442,7 +71249,7 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  void *vzalloc_node(unsigned long size, int node)
  {
  	return __vmalloc_node_flags(size, node,
-@@ -1807,10 +1875,10 @@ EXPORT_SYMBOL(vzalloc_node);
+@@ -1793,10 +1861,10 @@ EXPORT_SYMBOL(vzalloc_node);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -71455,7 +71262,7 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  			      -1, __builtin_return_address(0));
  }
  
-@@ -1829,6 +1897,7 @@ void *vmalloc_exec(unsigned long size)
+@@ -1815,6 +1883,7 @@ void *vmalloc_exec(unsigned long size)
   *	Allocate enough 32bit PA addressable pages to cover @size from the
   *	page level allocator and map them into contiguous kernel virtual space.
   */
@@ -71463,7 +71270,7 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  void *vmalloc_32(unsigned long size)
  {
  	return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
-@@ -1843,6 +1912,7 @@ EXPORT_SYMBOL(vmalloc_32);
+@@ -1829,6 +1898,7 @@ EXPORT_SYMBOL(vmalloc_32);
   * The resulting memory area is 32bit addressable and zeroed so it can be
   * mapped to userspace without leaking data.
   */
@@ -71471,7 +71278,7 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  void *vmalloc_32_user(unsigned long size)
  {
  	struct vm_struct *area;
-@@ -2105,6 +2175,8 @@ int remap_vmalloc_range(struct vm_area_s
+@@ -2091,6 +2161,8 @@ int remap_vmalloc_range(struct vm_area_s
  	unsigned long uaddr = vma->vm_start;
  	unsigned long usize = vma->vm_end - vma->vm_start;
  
@@ -71480,9 +71287,9 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
  	if ((PAGE_SIZE-1) & (unsigned long)addr)
  		return -EINVAL;
  
-diff -urNp linux-3.0.9/mm/vmstat.c linux-3.0.9/mm/vmstat.c
---- linux-3.0.9/mm/vmstat.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/vmstat.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/mm/vmstat.c linux-3.1.1/mm/vmstat.c
+--- linux-3.1.1/mm/vmstat.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/vmstat.c	2011-11-16 18:40:44.000000000 -0500
 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
   *
   * vm_stat contains the global counters
@@ -71535,10 +71342,10 @@ diff -urNp linux-3.0.9/mm/vmstat.c linux-3.0.9/mm/vmstat.c
  #endif
  	return 0;
  }
-diff -urNp linux-3.0.9/net/8021q/vlan.c linux-3.0.9/net/8021q/vlan.c
---- linux-3.0.9/net/8021q/vlan.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/8021q/vlan.c	2011-11-15 20:03:00.000000000 -0500
-@@ -591,8 +591,7 @@ static int vlan_ioctl_handler(struct net
+diff -urNp linux-3.1.1/net/8021q/vlan.c linux-3.1.1/net/8021q/vlan.c
+--- linux-3.1.1/net/8021q/vlan.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/8021q/vlan.c	2011-11-16 18:39:08.000000000 -0500
+@@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net
  		err = -EPERM;
  		if (!capable(CAP_NET_ADMIN))
  			break;
@@ -71548,9 +71355,9 @@ diff -urNp linux-3.0.9/net/8021q/vlan.c linux-3.0.9/net/8021q/vlan.c
  			struct vlan_net *vn;
  
  			vn = net_generic(net, vlan_net_id);
-diff -urNp linux-3.0.9/net/9p/trans_fd.c linux-3.0.9/net/9p/trans_fd.c
---- linux-3.0.9/net/9p/trans_fd.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/9p/trans_fd.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/9p/trans_fd.c linux-3.1.1/net/9p/trans_fd.c
+--- linux-3.1.1/net/9p/trans_fd.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/9p/trans_fd.c	2011-11-16 18:39:08.000000000 -0500
 @@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client 
  	oldfs = get_fs();
  	set_fs(get_ds());
@@ -71560,9 +71367,9 @@ diff -urNp linux-3.0.9/net/9p/trans_fd.c linux-3.0.9/net/9p/trans_fd.c
  	set_fs(oldfs);
  
  	if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
-diff -urNp linux-3.0.9/net/9p/trans_virtio.c linux-3.0.9/net/9p/trans_virtio.c
---- linux-3.0.9/net/9p/trans_virtio.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/9p/trans_virtio.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/9p/trans_virtio.c linux-3.1.1/net/9p/trans_virtio.c
+--- linux-3.1.1/net/9p/trans_virtio.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/9p/trans_virtio.c	2011-11-16 18:39:08.000000000 -0500
 @@ -327,7 +327,7 @@ req_retry_pinned:
  		} else {
  			char *pbuf;
@@ -71581,9 +71388,9 @@ diff -urNp linux-3.0.9/net/9p/trans_virtio.c linux-3.0.9/net/9p/trans_virtio.c
  			else
  				pbuf = req->tc->pkbuf;
  
-diff -urNp linux-3.0.9/net/atm/atm_misc.c linux-3.0.9/net/atm/atm_misc.c
---- linux-3.0.9/net/atm/atm_misc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/atm/atm_misc.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/atm/atm_misc.c linux-3.1.1/net/atm/atm_misc.c
+--- linux-3.1.1/net/atm/atm_misc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/atm/atm_misc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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;
@@ -71620,9 +71427,9 @@ diff -urNp linux-3.0.9/net/atm/atm_misc.c linux-3.0.9/net/atm/atm_misc.c
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-3.0.9/net/atm/lec.h linux-3.0.9/net/atm/lec.h
---- linux-3.0.9/net/atm/lec.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/atm/lec.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/atm/lec.h linux-3.1.1/net/atm/lec.h
+--- linux-3.1.1/net/atm/lec.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/atm/lec.h	2011-11-16 18:39:08.000000000 -0500
 @@ -48,7 +48,7 @@ struct lane2_ops {
  			      const u8 *tlvs, u32 sizeoftlvs);
  	void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
@@ -71632,9 +71439,9 @@ diff -urNp linux-3.0.9/net/atm/lec.h linux-3.0.9/net/atm/lec.h
  
  /*
   * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
-diff -urNp linux-3.0.9/net/atm/mpc.h linux-3.0.9/net/atm/mpc.h
---- linux-3.0.9/net/atm/mpc.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/atm/mpc.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/atm/mpc.h linux-3.1.1/net/atm/mpc.h
+--- linux-3.1.1/net/atm/mpc.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/atm/mpc.h	2011-11-16 18:39:08.000000000 -0500
 @@ -33,7 +33,7 @@ struct mpoa_client {
  	struct mpc_parameters parameters;  /* parameters for this client    */
  
@@ -71644,9 +71451,9 @@ diff -urNp linux-3.0.9/net/atm/mpc.h linux-3.0.9/net/atm/mpc.h
  };
  
  
-diff -urNp linux-3.0.9/net/atm/mpoa_caches.c linux-3.0.9/net/atm/mpoa_caches.c
---- linux-3.0.9/net/atm/mpoa_caches.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/atm/mpoa_caches.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/atm/mpoa_caches.c linux-3.1.1/net/atm/mpoa_caches.c
+--- linux-3.1.1/net/atm/mpoa_caches.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/atm/mpoa_caches.c	2011-11-16 18:40:44.000000000 -0500
 @@ -255,6 +255,8 @@ static void check_resolving_entries(stru
  	struct timeval now;
  	struct k_message msg;
@@ -71656,9 +71463,9 @@ diff -urNp linux-3.0.9/net/atm/mpoa_caches.c linux-3.0.9/net/atm/mpoa_caches.c
  	do_gettimeofday(&now);
  
  	read_lock_bh(&client->ingress_lock);
-diff -urNp linux-3.0.9/net/atm/proc.c linux-3.0.9/net/atm/proc.c
---- linux-3.0.9/net/atm/proc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/atm/proc.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/atm/proc.c linux-3.1.1/net/atm/proc.c
+--- linux-3.1.1/net/atm/proc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/atm/proc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
    const struct k_atm_aal_stats *stats)
  {
@@ -71672,9 +71479,9 @@ diff -urNp linux-3.0.9/net/atm/proc.c linux-3.0.9/net/atm/proc.c
  }
  
  static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-diff -urNp linux-3.0.9/net/atm/resources.c linux-3.0.9/net/atm/resources.c
---- linux-3.0.9/net/atm/resources.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/atm/resources.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/atm/resources.c linux-3.1.1/net/atm/resources.c
+--- linux-3.1.1/net/atm/resources.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/atm/resources.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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)
@@ -71693,10 +71500,10 @@ diff -urNp linux-3.0.9/net/atm/resources.c linux-3.0.9/net/atm/resources.c
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-3.0.9/net/batman-adv/hard-interface.c linux-3.0.9/net/batman-adv/hard-interface.c
---- linux-3.0.9/net/batman-adv/hard-interface.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/batman-adv/hard-interface.c	2011-11-15 20:03:00.000000000 -0500
-@@ -351,8 +351,8 @@ int hardif_enable_interface(struct hard_
+diff -urNp linux-3.1.1/net/batman-adv/hard-interface.c linux-3.1.1/net/batman-adv/hard-interface.c
+--- linux-3.1.1/net/batman-adv/hard-interface.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/batman-adv/hard-interface.c	2011-11-16 18:39:08.000000000 -0500
+@@ -347,8 +347,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);
  
@@ -71707,10 +71514,10 @@ diff -urNp linux-3.0.9/net/batman-adv/hard-interface.c linux-3.0.9/net/batman-ad
  	bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
  		 hard_iface->net_dev->name);
  
-diff -urNp linux-3.0.9/net/batman-adv/routing.c linux-3.0.9/net/batman-adv/routing.c
---- linux-3.0.9/net/batman-adv/routing.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/batman-adv/routing.c	2011-11-15 20:03:00.000000000 -0500
-@@ -627,7 +627,7 @@ void receive_bat_packet(struct ethhdr *e
+diff -urNp linux-3.1.1/net/batman-adv/routing.c linux-3.1.1/net/batman-adv/routing.c
+--- linux-3.1.1/net/batman-adv/routing.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/batman-adv/routing.c	2011-11-16 18:39:08.000000000 -0500
+@@ -656,7 +656,7 @@ void receive_bat_packet(const struct eth
  		return;
  
  	/* could be changed by schedule_own_packet() */
@@ -71719,51 +71526,51 @@ diff -urNp linux-3.0.9/net/batman-adv/routing.c linux-3.0.9/net/batman-adv/routi
  
  	has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
  
-diff -urNp linux-3.0.9/net/batman-adv/send.c linux-3.0.9/net/batman-adv/send.c
---- linux-3.0.9/net/batman-adv/send.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/batman-adv/send.c	2011-11-15 20:03:00.000000000 -0500
-@@ -279,7 +279,7 @@ void schedule_own_packet(struct hard_ifa
+diff -urNp linux-3.1.1/net/batman-adv/send.c linux-3.1.1/net/batman-adv/send.c
+--- linux-3.1.1/net/batman-adv/send.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/batman-adv/send.c	2011-11-16 18:39:08.000000000 -0500
+@@ -326,7 +326,7 @@ void schedule_own_packet(struct hard_ifa
  
  	/* change sequence number to network order */
  	batman_packet->seqno =
 -		htonl((uint32_t)atomic_read(&hard_iface->seqno));
 +		htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
  
- 	if (vis_server == VIS_TYPE_SERVER_SYNC)
- 		batman_packet->flags |= VIS_SERVER;
-@@ -293,7 +293,7 @@ void schedule_own_packet(struct hard_ifa
+ 	batman_packet->ttvn = atomic_read(&bat_priv->ttvn);
+ 	batman_packet->tt_crc = htons((uint16_t)atomic_read(&bat_priv->tt_crc));
+@@ -343,7 +343,7 @@ void schedule_own_packet(struct hard_ifa
  	else
- 		batman_packet->gw_flags = 0;
+ 		batman_packet->gw_flags = NO_FLAGS;
  
 -	atomic_inc(&hard_iface->seqno);
 +	atomic_inc_unchecked(&hard_iface->seqno);
  
  	slide_own_bcast_window(hard_iface);
  	send_time = own_send_time(bat_priv);
-diff -urNp linux-3.0.9/net/batman-adv/soft-interface.c linux-3.0.9/net/batman-adv/soft-interface.c
---- linux-3.0.9/net/batman-adv/soft-interface.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/batman-adv/soft-interface.c	2011-11-15 20:03:00.000000000 -0500
-@@ -628,7 +628,7 @@ int interface_tx(struct sk_buff *skb, st
+diff -urNp linux-3.1.1/net/batman-adv/soft-interface.c linux-3.1.1/net/batman-adv/soft-interface.c
+--- linux-3.1.1/net/batman-adv/soft-interface.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/batman-adv/soft-interface.c	2011-11-16 18:39:08.000000000 -0500
+@@ -632,7 +632,7 @@ static int interface_tx(struct sk_buff *
  
  		/* set broadcast sequence number */
  		bcast_packet->seqno =
 -			htonl(atomic_inc_return(&bat_priv->bcast_seqno));
 +			htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
  
- 		add_bcast_packet_to_list(bat_priv, skb);
+ 		add_bcast_packet_to_list(bat_priv, skb, 1);
  
-@@ -830,7 +830,7 @@ struct net_device *softif_create(char *n
+@@ -824,7 +824,7 @@ struct net_device *softif_create(const c
  	atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
  
  	atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
 -	atomic_set(&bat_priv->bcast_seqno, 1);
 +	atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
- 	atomic_set(&bat_priv->tt_local_changed, 0);
- 
- 	bat_priv->primary_if = NULL;
-diff -urNp linux-3.0.9/net/batman-adv/types.h linux-3.0.9/net/batman-adv/types.h
---- linux-3.0.9/net/batman-adv/types.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/batman-adv/types.h	2011-11-15 20:03:00.000000000 -0500
+ 	atomic_set(&bat_priv->ttvn, 0);
+ 	atomic_set(&bat_priv->tt_local_changes, 0);
+ 	atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
+diff -urNp linux-3.1.1/net/batman-adv/types.h linux-3.1.1/net/batman-adv/types.h
+--- linux-3.1.1/net/batman-adv/types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/batman-adv/types.h	2011-11-16 18:39:08.000000000 -0500
 @@ -38,8 +38,8 @@ struct hard_iface {
  	int16_t if_num;
  	char if_status;
@@ -71775,7 +71582,7 @@ diff -urNp linux-3.0.9/net/batman-adv/types.h linux-3.0.9/net/batman-adv/types.h
  	unsigned char *packet_buff;
  	int packet_len;
  	struct kobject *hardif_obj;
-@@ -142,7 +142,7 @@ struct bat_priv {
+@@ -153,7 +153,7 @@ struct bat_priv {
  	atomic_t orig_interval;		/* uint */
  	atomic_t hop_penalty;		/* uint */
  	atomic_t log_level;		/* uint */
@@ -71783,11 +71590,11 @@ diff -urNp linux-3.0.9/net/batman-adv/types.h linux-3.0.9/net/batman-adv/types.h
 +	atomic_unchecked_t bcast_seqno;
  	atomic_t bcast_queue_left;
  	atomic_t batman_queue_left;
- 	char num_ifaces;
-diff -urNp linux-3.0.9/net/batman-adv/unicast.c linux-3.0.9/net/batman-adv/unicast.c
---- linux-3.0.9/net/batman-adv/unicast.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/batman-adv/unicast.c	2011-11-15 20:03:00.000000000 -0500
-@@ -265,7 +265,7 @@ int frag_send_skb(struct sk_buff *skb, s
+ 	atomic_t ttvn; /* tranlation table version number */
+diff -urNp linux-3.1.1/net/batman-adv/unicast.c linux-3.1.1/net/batman-adv/unicast.c
+--- linux-3.1.1/net/batman-adv/unicast.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/batman-adv/unicast.c	2011-11-16 18:39:08.000000000 -0500
+@@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, s
  	frag1->flags = UNI_FRAG_HEAD | large_tail;
  	frag2->flags = large_tail;
  
@@ -71796,9 +71603,30 @@ diff -urNp linux-3.0.9/net/batman-adv/unicast.c linux-3.0.9/net/batman-adv/unica
  	frag1->seqno = htons(seqno - 1);
  	frag2->seqno = htons(seqno);
  
-diff -urNp linux-3.0.9/net/bridge/br_multicast.c linux-3.0.9/net/bridge/br_multicast.c
---- linux-3.0.9/net/bridge/br_multicast.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/bridge/br_multicast.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/bluetooth/hci_conn.c linux-3.1.1/net/bluetooth/hci_conn.c
+--- linux-3.1.1/net/bluetooth/hci_conn.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/bluetooth/hci_conn.c	2011-11-16 18:39:08.000000000 -0500
+@@ -218,7 +218,7 @@ void hci_le_start_enc(struct hci_conn *c
+ 	cp.handle = cpu_to_le16(conn->handle);
+ 	memcpy(cp.ltk, ltk, sizeof(cp.ltk));
+ 	cp.ediv = ediv;
+-	memcpy(cp.rand, rand, sizeof(rand));
++	memcpy(cp.rand, rand, sizeof(cp.rand));
+ 
+ 	hci_send_cmd(hdev, HCI_OP_LE_START_ENC, sizeof(cp), &cp);
+ }
+@@ -234,7 +234,7 @@ void hci_le_ltk_reply(struct hci_conn *c
+ 	memset(&cp, 0, sizeof(cp));
+ 
+ 	cp.handle = cpu_to_le16(conn->handle);
+-	memcpy(cp.ltk, ltk, sizeof(ltk));
++	memcpy(cp.ltk, ltk, sizeof(cp.ltk));
+ 
+ 	hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
+ }
+diff -urNp linux-3.1.1/net/bridge/br_multicast.c linux-3.1.1/net/bridge/br_multicast.c
+--- linux-3.1.1/net/bridge/br_multicast.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/bridge/br_multicast.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct 
  	nexthdr = ip6h->nexthdr;
  	offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
@@ -71808,10 +71636,10 @@ diff -urNp linux-3.0.9/net/bridge/br_multicast.c linux-3.0.9/net/bridge/br_multi
  		return 0;
  
  	/* Okay, we found ICMPv6 header */
-diff -urNp linux-3.0.9/net/bridge/netfilter/ebtables.c linux-3.0.9/net/bridge/netfilter/ebtables.c
---- linux-3.0.9/net/bridge/netfilter/ebtables.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/bridge/netfilter/ebtables.c	2011-11-15 20:03:00.000000000 -0500
-@@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s
+diff -urNp linux-3.1.1/net/bridge/netfilter/ebtables.c linux-3.1.1/net/bridge/netfilter/ebtables.c
+--- linux-3.1.1/net/bridge/netfilter/ebtables.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/bridge/netfilter/ebtables.c	2011-11-16 18:40:44.000000000 -0500
+@@ -1513,7 +1513,7 @@ static int do_ebt_get_ctl(struct sock *s
  			tmp.valid_hooks = t->table->valid_hooks;
  		}
  		mutex_unlock(&ebt_mutex);
@@ -71820,7 +71648,7 @@ diff -urNp linux-3.0.9/net/bridge/netfilter/ebtables.c linux-3.0.9/net/bridge/ne
  			BUGPRINT("c2u Didn't work\n");
  			ret = -EFAULT;
  			break;
-@@ -1780,6 +1780,8 @@ static int compat_copy_everything_to_use
+@@ -1781,6 +1781,8 @@ static int compat_copy_everything_to_use
  	int ret;
  	void __user *pos;
  
@@ -71829,9 +71657,9 @@ diff -urNp linux-3.0.9/net/bridge/netfilter/ebtables.c linux-3.0.9/net/bridge/ne
  	memset(&tinfo, 0, sizeof(tinfo));
  
  	if (cmd == EBT_SO_GET_ENTRIES) {
-diff -urNp linux-3.0.9/net/caif/caif_socket.c linux-3.0.9/net/caif/caif_socket.c
---- linux-3.0.9/net/caif/caif_socket.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/caif/caif_socket.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/caif/caif_socket.c linux-3.1.1/net/caif/caif_socket.c
+--- linux-3.1.1/net/caif/caif_socket.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/caif/caif_socket.c	2011-11-16 18:39:08.000000000 -0500
 @@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
  #ifdef CONFIG_DEBUG_FS
  struct debug_fs_counter {
@@ -71961,9 +71789,9 @@ diff -urNp linux-3.0.9/net/caif/caif_socket.c linux-3.0.9/net/caif/caif_socket.c
  #ifdef CONFIG_DEBUG_FS
  	if (!IS_ERR(debugfsdir)) {
  
-diff -urNp linux-3.0.9/net/caif/cfctrl.c linux-3.0.9/net/caif/cfctrl.c
---- linux-3.0.9/net/caif/cfctrl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/caif/cfctrl.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/caif/cfctrl.c linux-3.1.1/net/caif/cfctrl.c
+--- linux-3.1.1/net/caif/cfctrl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/caif/cfctrl.c	2011-11-16 18:40:44.000000000 -0500
 @@ -9,6 +9,7 @@
  #include <linux/stddef.h>
  #include <linux/spinlock.h>
@@ -72011,9 +71839,9 @@ diff -urNp linux-3.0.9/net/caif/cfctrl.c linux-3.0.9/net/caif/cfctrl.c
  
  	cfpkt_extr_head(pkt, &cmdrsp, 1);
  	cmd = cmdrsp & CFCTRL_CMD_MASK;
-diff -urNp linux-3.0.9/net/compat.c linux-3.0.9/net/compat.c
---- linux-3.0.9/net/compat.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/compat.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/compat.c linux-3.1.1/net/compat.c
+--- linux-3.1.1/net/compat.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/compat.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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))
@@ -72141,9 +71969,9 @@ diff -urNp linux-3.0.9/net/compat.c linux-3.0.9/net/compat.c
  	struct group_filter __user *kgf;
  	int __user	*koptlen;
  	u32 interface, fmode, numsrc;
-diff -urNp linux-3.0.9/net/core/datagram.c linux-3.0.9/net/core/datagram.c
---- linux-3.0.9/net/core/datagram.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/datagram.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/core/datagram.c linux-3.1.1/net/core/datagram.c
+--- linux-3.1.1/net/core/datagram.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/datagram.c	2011-11-16 18:39:08.000000000 -0500
 @@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s
  	}
  
@@ -72153,10 +71981,10 @@ diff -urNp linux-3.0.9/net/core/datagram.c linux-3.0.9/net/core/datagram.c
  	sk_mem_reclaim_partial(sk);
  
  	return err;
-diff -urNp linux-3.0.9/net/core/dev.c linux-3.0.9/net/core/dev.c
---- linux-3.0.9/net/core/dev.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/dev.c	2011-11-15 20:03:00.000000000 -0500
-@@ -1125,10 +1125,14 @@ void dev_load(struct net *net, const cha
+diff -urNp linux-3.1.1/net/core/dev.c linux-3.1.1/net/core/dev.c
+--- linux-3.1.1/net/core/dev.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/dev.c	2011-11-16 18:40:44.000000000 -0500
+@@ -1135,10 +1135,14 @@ void dev_load(struct net *net, const cha
  	if (no_module && capable(CAP_NET_ADMIN))
  		no_module = request_module("netdev-%s", name);
  	if (no_module && capable(CAP_SYS_MODULE)) {
@@ -72171,7 +71999,7 @@ diff -urNp linux-3.0.9/net/core/dev.c linux-3.0.9/net/core/dev.c
  	}
  }
  EXPORT_SYMBOL(dev_load);
-@@ -1959,7 +1963,7 @@ static int illegal_highdma(struct net_de
+@@ -1977,7 +1981,7 @@ static int illegal_highdma(struct net_de
  
  struct dev_gso_cb {
  	void (*destructor)(struct sk_buff *skb);
@@ -72180,7 +72008,7 @@ diff -urNp linux-3.0.9/net/core/dev.c linux-3.0.9/net/core/dev.c
  
  #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
  
-@@ -2912,7 +2916,7 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -2930,7 +2934,7 @@ int netif_rx_ni(struct sk_buff *skb)
  }
  EXPORT_SYMBOL(netif_rx_ni);
  
@@ -72189,7 +72017,7 @@ diff -urNp linux-3.0.9/net/core/dev.c linux-3.0.9/net/core/dev.c
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  
-@@ -3761,7 +3765,7 @@ void netif_napi_del(struct napi_struct *
+@@ -3779,7 +3783,7 @@ void netif_napi_del(struct napi_struct *
  }
  EXPORT_SYMBOL(netif_napi_del);
  
@@ -72198,10 +72026,10 @@ diff -urNp linux-3.0.9/net/core/dev.c linux-3.0.9/net/core/dev.c
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  	unsigned long time_limit = jiffies + 2;
-diff -urNp linux-3.0.9/net/core/flow.c linux-3.0.9/net/core/flow.c
---- linux-3.0.9/net/core/flow.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/flow.c	2011-11-15 20:03:00.000000000 -0500
-@@ -60,7 +60,7 @@ struct flow_cache {
+diff -urNp linux-3.1.1/net/core/flow.c linux-3.1.1/net/core/flow.c
+--- linux-3.1.1/net/core/flow.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/flow.c	2011-11-16 18:39:08.000000000 -0500
+@@ -61,7 +61,7 @@ struct flow_cache {
  	struct timer_list		rnd_timer;
  };
  
@@ -72210,7 +72038,7 @@ diff -urNp linux-3.0.9/net/core/flow.c linux-3.0.9/net/core/flow.c
  EXPORT_SYMBOL(flow_cache_genid);
  static struct flow_cache flow_cache_global;
  static struct kmem_cache *flow_cachep __read_mostly;
-@@ -85,7 +85,7 @@ static void flow_cache_new_hashrnd(unsig
+@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsig
  
  static int flow_entry_valid(struct flow_cache_entry *fle)
  {
@@ -72219,7 +72047,7 @@ diff -urNp linux-3.0.9/net/core/flow.c linux-3.0.9/net/core/flow.c
  		return 0;
  	if (fle->object && !fle->object->ops->check(fle->object))
  		return 0;
-@@ -256,7 +256,7 @@ flow_cache_lookup(struct net *net, const
+@@ -259,7 +259,7 @@ flow_cache_lookup(struct net *net, const
  			hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
  			fcp->hash_count++;
  		}
@@ -72228,7 +72056,7 @@ diff -urNp linux-3.0.9/net/core/flow.c linux-3.0.9/net/core/flow.c
  		flo = fle->object;
  		if (!flo)
  			goto ret_object;
-@@ -277,7 +277,7 @@ nocache:
+@@ -280,7 +280,7 @@ nocache:
  	}
  	flo = resolver(net, key, family, dir, flo, ctx);
  	if (fle) {
@@ -72237,9 +72065,9 @@ diff -urNp linux-3.0.9/net/core/flow.c linux-3.0.9/net/core/flow.c
  		if (!IS_ERR(flo))
  			fle->object = flo;
  		else
-diff -urNp linux-3.0.9/net/core/iovec.c linux-3.0.9/net/core/iovec.c
---- linux-3.0.9/net/core/iovec.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/iovec.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/core/iovec.c linux-3.1.1/net/core/iovec.c
+--- linux-3.1.1/net/core/iovec.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/iovec.c	2011-11-16 18:39:08.000000000 -0500
 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struc
  	if (m->msg_namelen) {
  		if (mode == VERIFY_READ) {
@@ -72258,21 +72086,21 @@ diff -urNp linux-3.0.9/net/core/iovec.c linux-3.0.9/net/core/iovec.c
  		return -EFAULT;
  
  	m->msg_iov = iov;
-diff -urNp linux-3.0.9/net/core/rtnetlink.c linux-3.0.9/net/core/rtnetlink.c
---- linux-3.0.9/net/core/rtnetlink.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/rtnetlink.c	2011-11-15 20:03:00.000000000 -0500
-@@ -56,7 +56,7 @@
- struct rtnl_link {
+diff -urNp linux-3.1.1/net/core/rtnetlink.c linux-3.1.1/net/core/rtnetlink.c
+--- linux-3.1.1/net/core/rtnetlink.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/rtnetlink.c	2011-11-16 18:39:08.000000000 -0500
+@@ -57,7 +57,7 @@ struct rtnl_link {
  	rtnl_doit_func		doit;
  	rtnl_dumpit_func	dumpit;
+ 	rtnl_calcit_func 	calcit;
 -};
 +} __no_const;
  
  static DEFINE_MUTEX(rtnl_mutex);
- 
-diff -urNp linux-3.0.9/net/core/scm.c linux-3.0.9/net/core/scm.c
---- linux-3.0.9/net/core/scm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/scm.c	2011-11-15 20:03:00.000000000 -0500
+ static u16 min_ifinfo_dump_size;
+diff -urNp linux-3.1.1/net/core/scm.c linux-3.1.1/net/core/scm.c
+--- linux-3.1.1/net/core/scm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/scm.c	2011-11-16 18:39:08.000000000 -0500
 @@ -218,7 +218,7 @@ EXPORT_SYMBOL(__scm_send);
  int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
  {
@@ -72309,10 +72137,10 @@ diff -urNp linux-3.0.9/net/core/scm.c linux-3.0.9/net/core/scm.c
  	     i++, cmfptr++)
  	{
  		int new_fd;
-diff -urNp linux-3.0.9/net/core/skbuff.c linux-3.0.9/net/core/skbuff.c
---- linux-3.0.9/net/core/skbuff.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/skbuff.c	2011-11-15 20:03:00.000000000 -0500
-@@ -1543,6 +1543,8 @@ int skb_splice_bits(struct sk_buff *skb,
+diff -urNp linux-3.1.1/net/core/skbuff.c linux-3.1.1/net/core/skbuff.c
+--- linux-3.1.1/net/core/skbuff.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/skbuff.c	2011-11-16 18:40:44.000000000 -0500
+@@ -1650,6 +1650,8 @@ int skb_splice_bits(struct sk_buff *skb,
  	struct sock *sk = skb->sk;
  	int ret = 0;
  
@@ -72321,19 +72149,19 @@ diff -urNp linux-3.0.9/net/core/skbuff.c linux-3.0.9/net/core/skbuff.c
  	if (splice_grow_spd(pipe, &spd))
  		return -ENOMEM;
  
-diff -urNp linux-3.0.9/net/core/sock.c linux-3.0.9/net/core/sock.c
---- linux-3.0.9/net/core/sock.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/sock.c	2011-11-15 20:03:00.000000000 -0500
-@@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
+diff -urNp linux-3.1.1/net/core/sock.c linux-3.1.1/net/core/sock.c
+--- linux-3.1.1/net/core/sock.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/sock.c	2011-11-16 18:40:44.000000000 -0500
+@@ -293,7 +293,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
  	 */
  	if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
  	    (unsigned)sk->sk_rcvbuf) {
 -		atomic_inc(&sk->sk_drops);
 +		atomic_inc_unchecked(&sk->sk_drops);
+ 		trace_sock_rcvqueue_full(sk, skb);
  		return -ENOMEM;
  	}
- 
-@@ -300,7 +300,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
+@@ -303,7 +303,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
  		return err;
  
  	if (!sk_rmem_schedule(sk, skb->truesize)) {
@@ -72342,7 +72170,7 @@ diff -urNp linux-3.0.9/net/core/sock.c linux-3.0.9/net/core/sock.c
  		return -ENOBUFS;
  	}
  
-@@ -320,7 +320,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
+@@ -323,7 +323,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
  	skb_dst_force(skb);
  
  	spin_lock_irqsave(&list->lock, flags);
@@ -72351,7 +72179,7 @@ diff -urNp linux-3.0.9/net/core/sock.c linux-3.0.9/net/core/sock.c
  	__skb_queue_tail(list, skb);
  	spin_unlock_irqrestore(&list->lock, flags);
  
-@@ -340,7 +340,7 @@ int sk_receive_skb(struct sock *sk, stru
+@@ -343,7 +343,7 @@ int sk_receive_skb(struct sock *sk, stru
  	skb->dev = NULL;
  
  	if (sk_rcvqueues_full(sk, skb)) {
@@ -72360,7 +72188,7 @@ diff -urNp linux-3.0.9/net/core/sock.c linux-3.0.9/net/core/sock.c
  		goto discard_and_relse;
  	}
  	if (nested)
-@@ -358,7 +358,7 @@ int sk_receive_skb(struct sock *sk, stru
+@@ -361,7 +361,7 @@ int sk_receive_skb(struct sock *sk, stru
  		mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
  	} else if (sk_add_backlog(sk, skb)) {
  		bh_unlock_sock(sk);
@@ -72369,7 +72197,7 @@ diff -urNp linux-3.0.9/net/core/sock.c linux-3.0.9/net/core/sock.c
  		goto discard_and_relse;
  	}
  
-@@ -921,7 +921,7 @@ int sock_getsockopt(struct socket *sock,
+@@ -924,7 +924,7 @@ int sock_getsockopt(struct socket *sock,
  		if (len > sizeof(peercred))
  			len = sizeof(peercred);
  		cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred);
@@ -72378,7 +72206,7 @@ diff -urNp linux-3.0.9/net/core/sock.c linux-3.0.9/net/core/sock.c
  			return -EFAULT;
  		goto lenout;
  	}
-@@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock,
+@@ -937,7 +937,7 @@ int sock_getsockopt(struct socket *sock,
  			return -ENOTCONN;
  		if (lv < len)
  			return -EINVAL;
@@ -72387,7 +72215,7 @@ diff -urNp linux-3.0.9/net/core/sock.c linux-3.0.9/net/core/sock.c
  			return -EFAULT;
  		goto lenout;
  	}
-@@ -967,7 +967,7 @@ int sock_getsockopt(struct socket *sock,
+@@ -970,7 +970,7 @@ int sock_getsockopt(struct socket *sock,
  
  	if (len > lv)
  		len = lv;
@@ -72396,7 +72224,7 @@ diff -urNp linux-3.0.9/net/core/sock.c linux-3.0.9/net/core/sock.c
  		return -EFAULT;
  lenout:
  	if (put_user(len, optlen))
-@@ -2024,7 +2024,7 @@ void sock_init_data(struct socket *sock,
+@@ -2029,7 +2029,7 @@ void sock_init_data(struct socket *sock,
  	 */
  	smp_wmb();
  	atomic_set(&sk->sk_refcnt, 1);
@@ -72405,10 +72233,10 @@ diff -urNp linux-3.0.9/net/core/sock.c linux-3.0.9/net/core/sock.c
  }
  EXPORT_SYMBOL(sock_init_data);
  
-diff -urNp linux-3.0.9/net/decnet/sysctl_net_decnet.c linux-3.0.9/net/decnet/sysctl_net_decnet.c
---- linux-3.0.9/net/decnet/sysctl_net_decnet.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/decnet/sysctl_net_decnet.c	2011-11-15 20:03:00.000000000 -0500
-@@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
+diff -urNp linux-3.1.1/net/decnet/sysctl_net_decnet.c linux-3.1.1/net/decnet/sysctl_net_decnet.c
+--- linux-3.1.1/net/decnet/sysctl_net_decnet.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/decnet/sysctl_net_decnet.c	2011-11-16 18:39:08.000000000 -0500
+@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_t
  
  	if (len > *lenp) len = *lenp;
  
@@ -72417,7 +72245,7 @@ diff -urNp linux-3.0.9/net/decnet/sysctl_net_decnet.c linux-3.0.9/net/decnet/sys
  		return -EFAULT;
  
  	*lenp = len;
-@@ -236,7 +236,7 @@ static int dn_def_dev_handler(ctl_table 
+@@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table 
  
  	if (len > *lenp) len = *lenp;
  
@@ -72426,9 +72254,9 @@ diff -urNp linux-3.0.9/net/decnet/sysctl_net_decnet.c linux-3.0.9/net/decnet/sys
  		return -EFAULT;
  
  	*lenp = len;
-diff -urNp linux-3.0.9/net/econet/Kconfig linux-3.0.9/net/econet/Kconfig
---- linux-3.0.9/net/econet/Kconfig	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/econet/Kconfig	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/econet/Kconfig linux-3.1.1/net/econet/Kconfig
+--- linux-3.1.1/net/econet/Kconfig	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/econet/Kconfig	2011-11-16 18:40:44.000000000 -0500
 @@ -4,7 +4,7 @@
  
  config ECONET
@@ -72438,9 +72266,9 @@ diff -urNp linux-3.0.9/net/econet/Kconfig linux-3.0.9/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.9/net/ipv4/fib_frontend.c linux-3.0.9/net/ipv4/fib_frontend.c
---- linux-3.0.9/net/ipv4/fib_frontend.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/fib_frontend.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/fib_frontend.c linux-3.1.1/net/ipv4/fib_frontend.c
+--- linux-3.1.1/net/ipv4/fib_frontend.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/fib_frontend.c	2011-11-16 18:39:08.000000000 -0500
 @@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct not
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
  		fib_sync_up(dev);
@@ -72465,10 +72293,10 @@ diff -urNp linux-3.0.9/net/ipv4/fib_frontend.c linux-3.0.9/net/ipv4/fib_frontend
  		rt_cache_flush(dev_net(dev), -1);
  		break;
  	case NETDEV_DOWN:
-diff -urNp linux-3.0.9/net/ipv4/fib_semantics.c linux-3.0.9/net/ipv4/fib_semantics.c
---- linux-3.0.9/net/ipv4/fib_semantics.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/fib_semantics.c	2011-11-15 20:03:00.000000000 -0500
-@@ -691,7 +691,7 @@ __be32 fib_info_update_nh_saddr(struct n
+diff -urNp linux-3.1.1/net/ipv4/fib_semantics.c linux-3.1.1/net/ipv4/fib_semantics.c
+--- linux-3.1.1/net/ipv4/fib_semantics.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/fib_semantics.c	2011-11-16 18:39:08.000000000 -0500
+@@ -699,7 +699,7 @@ __be32 fib_info_update_nh_saddr(struct n
  	nh->nh_saddr = inet_select_addr(nh->nh_dev,
  					nh->nh_gw,
  					nh->nh_parent->fib_scope);
@@ -72477,9 +72305,9 @@ diff -urNp linux-3.0.9/net/ipv4/fib_semantics.c linux-3.0.9/net/ipv4/fib_semanti
  
  	return nh->nh_saddr;
  }
-diff -urNp linux-3.0.9/net/ipv4/inet_diag.c linux-3.0.9/net/ipv4/inet_diag.c
---- linux-3.0.9/net/ipv4/inet_diag.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/inet_diag.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/inet_diag.c linux-3.1.1/net/ipv4/inet_diag.c
+--- linux-3.1.1/net/ipv4/inet_diag.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/inet_diag.c	2011-11-16 18:40:44.000000000 -0500
 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
  	r->idiag_retrans = 0;
  
@@ -72541,9 +72369,9 @@ diff -urNp linux-3.0.9/net/ipv4/inet_diag.c linux-3.0.9/net/ipv4/inet_diag.c
  
  	tmo = req->expires - jiffies;
  	if (tmo < 0)
-diff -urNp linux-3.0.9/net/ipv4/inet_hashtables.c linux-3.0.9/net/ipv4/inet_hashtables.c
---- linux-3.0.9/net/ipv4/inet_hashtables.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/inet_hashtables.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/inet_hashtables.c linux-3.1.1/net/ipv4/inet_hashtables.c
+--- linux-3.1.1/net/ipv4/inet_hashtables.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/inet_hashtables.c	2011-11-16 18:40:44.000000000 -0500
 @@ -18,12 +18,15 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
@@ -72569,32 +72397,32 @@ diff -urNp linux-3.0.9/net/ipv4/inet_hashtables.c linux-3.0.9/net/ipv4/inet_hash
  		if (tw) {
  			inet_twsk_deschedule(tw, death_row);
  			while (twrefcnt) {
-diff -urNp linux-3.0.9/net/ipv4/inetpeer.c linux-3.0.9/net/ipv4/inetpeer.c
---- linux-3.0.9/net/ipv4/inetpeer.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/inetpeer.c	2011-11-15 20:03:00.000000000 -0500
-@@ -481,6 +481,8 @@ struct inet_peer *inet_getpeer(struct in
+diff -urNp linux-3.1.1/net/ipv4/inetpeer.c linux-3.1.1/net/ipv4/inetpeer.c
+--- linux-3.1.1/net/ipv4/inetpeer.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/inetpeer.c	2011-11-16 19:18:22.000000000 -0500
+@@ -400,6 +400,8 @@ struct inet_peer *inet_getpeer(const str
  	unsigned int sequence;
- 	int invalidated, newrefcnt = 0;
+ 	int invalidated, gccnt = 0;
  
 +	pax_track_stack();
 +
- 	/* Look up for the address quickly, lockless.
+ 	/* Attempt a lockless lookup first.
  	 * Because of a concurrent writer, we might not find an existing entry.
  	 */
-@@ -517,8 +519,8 @@ found:		/* The existing node has been fo
+@@ -436,8 +438,8 @@ relookup:
  	if (p) {
  		p->daddr = *daddr;
  		atomic_set(&p->refcnt, 1);
 -		atomic_set(&p->rid, 0);
--		atomic_set(&p->ip_id_count, secure_ip_id(daddr->addr.a4));
+-		atomic_set(&p->ip_id_count,
 +		atomic_set_unchecked(&p->rid, 0);
-+		atomic_set_unchecked(&p->ip_id_count, secure_ip_id(daddr->addr.a4));
- 		p->tcp_ts_stamp = 0;
- 		p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
- 		p->rate_tokens = 0;
-diff -urNp linux-3.0.9/net/ipv4/ipconfig.c linux-3.0.9/net/ipv4/ipconfig.c
---- linux-3.0.9/net/ipv4/ipconfig.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/ipconfig.c	2011-11-15 20:03:00.000000000 -0500
++		atomic_set_unchecked(&p->ip_id_count,
+ 				(daddr->family == AF_INET) ?
+ 					secure_ip_id(daddr->addr.a4) :
+ 					secure_ipv6_id(daddr->addr.a6));
+diff -urNp linux-3.1.1/net/ipv4/ipconfig.c linux-3.1.1/net/ipv4/ipconfig.c
+--- linux-3.1.1/net/ipv4/ipconfig.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/ipconfig.c	2011-11-16 18:39:08.000000000 -0500
 @@ -313,7 +313,7 @@ static int __init ic_devinet_ioctl(unsig
  
  	mm_segment_t oldfs = get_fs();
@@ -72622,10 +72450,10 @@ diff -urNp linux-3.0.9/net/ipv4/ipconfig.c linux-3.0.9/net/ipv4/ipconfig.c
  	set_fs(oldfs);
  	return res;
  }
-diff -urNp linux-3.0.9/net/ipv4/ip_fragment.c linux-3.0.9/net/ipv4/ip_fragment.c
---- linux-3.0.9/net/ipv4/ip_fragment.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/ip_fragment.c	2011-11-15 20:03:00.000000000 -0500
-@@ -315,7 +315,7 @@ static inline int ip_frag_too_far(struct
+diff -urNp linux-3.1.1/net/ipv4/ip_fragment.c linux-3.1.1/net/ipv4/ip_fragment.c
+--- linux-3.1.1/net/ipv4/ip_fragment.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/ip_fragment.c	2011-11-16 18:39:08.000000000 -0500
+@@ -316,7 +316,7 @@ static inline int ip_frag_too_far(struct
  		return 0;
  
  	start = qp->rid;
@@ -72634,9 +72462,9 @@ diff -urNp linux-3.0.9/net/ipv4/ip_fragment.c linux-3.0.9/net/ipv4/ip_fragment.c
  	qp->rid = end;
  
  	rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-3.0.9/net/ipv4/ip_sockglue.c linux-3.0.9/net/ipv4/ip_sockglue.c
---- linux-3.0.9/net/ipv4/ip_sockglue.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/ip_sockglue.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/ip_sockglue.c linux-3.1.1/net/ipv4/ip_sockglue.c
+--- linux-3.1.1/net/ipv4/ip_sockglue.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/ip_sockglue.c	2011-11-16 18:40:44.000000000 -0500
 @@ -1073,6 +1073,8 @@ static int do_ip_getsockopt(struct sock 
  	int val;
  	int len;
@@ -72663,11 +72491,11 @@ diff -urNp linux-3.0.9/net/ipv4/ip_sockglue.c linux-3.0.9/net/ipv4/ip_sockglue.c
 -		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.9/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.1.1/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-3.1.1/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-11-16 18:39:08.000000000 -0500
 @@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode(
  
  	*len = 0;
@@ -72677,9 +72505,9 @@ diff -urNp linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.9/net/ip
  	if (*octets == NULL) {
  		if (net_ratelimit())
  			pr_notice("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-3.0.9/net/ipv4/ping.c linux-3.0.9/net/ipv4/ping.c
---- linux-3.0.9/net/ipv4/ping.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/ping.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/ping.c linux-3.1.1/net/ipv4/ping.c
+--- linux-3.1.1/net/ipv4/ping.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/ping.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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),
@@ -72689,9 +72517,9 @@ diff -urNp linux-3.0.9/net/ipv4/ping.c linux-3.0.9/net/ipv4/ping.c
  }
  
  static int ping_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.9/net/ipv4/raw.c linux-3.0.9/net/ipv4/raw.c
---- linux-3.0.9/net/ipv4/raw.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/raw.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/raw.c linux-3.1.1/net/ipv4/raw.c
+--- linux-3.1.1/net/ipv4/raw.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/raw.c	2011-11-16 18:40:44.000000000 -0500
 @@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk,
  int raw_rcv(struct sock *sk, struct sk_buff *skb)
  {
@@ -72701,7 +72529,7 @@ diff -urNp linux-3.0.9/net/ipv4/raw.c linux-3.0.9/net/ipv4/raw.c
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-@@ -736,16 +736,20 @@ static int raw_init(struct sock *sk)
+@@ -737,16 +737,20 @@ static int raw_init(struct sock *sk)
  
  static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
  {
@@ -72723,7 +72551,7 @@ diff -urNp linux-3.0.9/net/ipv4/raw.c linux-3.0.9/net/ipv4/raw.c
  
  	if (get_user(len, optlen))
  		goto out;
-@@ -755,8 +759,9 @@ static int raw_geticmpfilter(struct sock
+@@ -756,8 +760,9 @@ static int raw_geticmpfilter(struct sock
  	if (len > sizeof(struct icmp_filter))
  		len = sizeof(struct icmp_filter);
  	ret = -EFAULT;
@@ -72735,7 +72563,7 @@ diff -urNp linux-3.0.9/net/ipv4/raw.c linux-3.0.9/net/ipv4/raw.c
  		goto out;
  	ret = 0;
  out:	return ret;
-@@ -984,7 +989,13 @@ static void raw_sock_seq_show(struct seq
+@@ -985,7 +990,13 @@ static void raw_sock_seq_show(struct seq
  		sk_wmem_alloc_get(sp),
  		sk_rmem_alloc_get(sp),
  		0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
@@ -72750,10 +72578,10 @@ diff -urNp linux-3.0.9/net/ipv4/raw.c linux-3.0.9/net/ipv4/raw.c
  }
  
  static int raw_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.9/net/ipv4/route.c linux-3.0.9/net/ipv4/route.c
---- linux-3.0.9/net/ipv4/route.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/route.c	2011-11-15 20:03:00.000000000 -0500
-@@ -304,7 +304,7 @@ static inline unsigned int rt_hash(__be3
+diff -urNp linux-3.1.1/net/ipv4/route.c linux-3.1.1/net/ipv4/route.c
+--- linux-3.1.1/net/ipv4/route.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/route.c	2011-11-16 18:39:08.000000000 -0500
+@@ -308,7 +308,7 @@ static inline unsigned int rt_hash(__be3
  
  static inline int rt_genid(struct net *net)
  {
@@ -72762,7 +72590,7 @@ diff -urNp linux-3.0.9/net/ipv4/route.c linux-3.0.9/net/ipv4/route.c
  }
  
  #ifdef CONFIG_PROC_FS
-@@ -832,7 +832,7 @@ static void rt_cache_invalidate(struct n
+@@ -837,7 +837,7 @@ static void rt_cache_invalidate(struct n
  	unsigned char shuffle;
  
  	get_random_bytes(&shuffle, sizeof(shuffle));
@@ -72771,7 +72599,7 @@ diff -urNp linux-3.0.9/net/ipv4/route.c linux-3.0.9/net/ipv4/route.c
  }
  
  /*
-@@ -2832,7 +2832,7 @@ static int rt_fill_info(struct net *net,
+@@ -2872,7 +2872,7 @@ static int rt_fill_info(struct net *net,
  	error = rt->dst.error;
  	if (peer) {
  		inet_peer_refcheck(rt->peer);
@@ -72780,9 +72608,9 @@ diff -urNp linux-3.0.9/net/ipv4/route.c linux-3.0.9/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.9/net/ipv4/tcp.c linux-3.0.9/net/ipv4/tcp.c
---- linux-3.0.9/net/ipv4/tcp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/tcp.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/tcp.c linux-3.1.1/net/ipv4/tcp.c
+--- linux-3.1.1/net/ipv4/tcp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/tcp.c	2011-11-16 18:40:44.000000000 -0500
 @@ -2122,6 +2122,8 @@ static int do_tcp_setsockopt(struct sock
  	int val;
  	int err = 0;
@@ -72801,9 +72629,9 @@ diff -urNp linux-3.0.9/net/ipv4/tcp.c linux-3.0.9/net/ipv4/tcp.c
  	if (get_user(len, optlen))
  		return -EFAULT;
  
-diff -urNp linux-3.0.9/net/ipv4/tcp_ipv4.c linux-3.0.9/net/ipv4/tcp_ipv4.c
---- linux-3.0.9/net/ipv4/tcp_ipv4.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/tcp_ipv4.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/tcp_ipv4.c linux-3.1.1/net/ipv4/tcp_ipv4.c
+--- linux-3.1.1/net/ipv4/tcp_ipv4.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/tcp_ipv4.c	2011-11-16 18:40:44.000000000 -0500
 @@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
  EXPORT_SYMBOL(sysctl_tcp_low_latency);
@@ -72814,7 +72642,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_ipv4.c linux-3.0.9/net/ipv4/tcp_ipv4.c
  
  #ifdef CONFIG_TCP_MD5SIG
  static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
-@@ -1610,6 +1613,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
+@@ -1622,6 +1625,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
  	return 0;
  
  reset:
@@ -72824,7 +72652,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_ipv4.c linux-3.0.9/net/ipv4/tcp_ipv4.c
  	tcp_v4_send_reset(rsk, skb);
  discard:
  	kfree_skb(skb);
-@@ -1672,12 +1678,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1684,12 +1690,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
  	TCP_SKB_CB(skb)->sacked	 = 0;
  
  	sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
@@ -72847,7 +72675,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_ipv4.c linux-3.0.9/net/ipv4/tcp_ipv4.c
  
  	if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
  		NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1727,6 +1740,10 @@ no_tcp_socket:
+@@ -1739,6 +1752,10 @@ no_tcp_socket:
  bad_packet:
  		TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
  	} else {
@@ -72858,7 +72686,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_ipv4.c linux-3.0.9/net/ipv4/tcp_ipv4.c
  		tcp_v4_send_reset(NULL, skb);
  	}
  
-@@ -2391,7 +2408,11 @@ static void get_openreq4(struct sock *sk
+@@ -2403,7 +2420,11 @@ static void get_openreq4(struct sock *sk
  		0,  /* non standard timer */
  		0, /* open_requests have no inode */
  		atomic_read(&sk->sk_refcnt),
@@ -72870,7 +72698,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_ipv4.c linux-3.0.9/net/ipv4/tcp_ipv4.c
  		len);
  }
  
-@@ -2441,7 +2462,12 @@ static void get_tcp4_sock(struct sock *s
+@@ -2453,7 +2474,12 @@ static void get_tcp4_sock(struct sock *s
  		sock_i_uid(sk),
  		icsk->icsk_probes_out,
  		sock_i_ino(sk),
@@ -72884,7 +72712,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_ipv4.c linux-3.0.9/net/ipv4/tcp_ipv4.c
  		jiffies_to_clock_t(icsk->icsk_rto),
  		jiffies_to_clock_t(icsk->icsk_ack.ato),
  		(icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
-@@ -2469,7 +2495,13 @@ static void get_timewait4_sock(struct in
+@@ -2481,7 +2507,13 @@ static void get_timewait4_sock(struct in
  		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
  		i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
  		3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
@@ -72899,9 +72727,9 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_ipv4.c linux-3.0.9/net/ipv4/tcp_ipv4.c
  }
  
  #define TMPSZ 150
-diff -urNp linux-3.0.9/net/ipv4/tcp_minisocks.c linux-3.0.9/net/ipv4/tcp_minisocks.c
---- linux-3.0.9/net/ipv4/tcp_minisocks.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/tcp_minisocks.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/tcp_minisocks.c linux-3.1.1/net/ipv4/tcp_minisocks.c
+--- linux-3.1.1/net/ipv4/tcp_minisocks.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/tcp_minisocks.c	2011-11-16 18:40:44.000000000 -0500
 @@ -27,6 +27,10 @@
  #include <net/inet_common.h>
  #include <net/xfrm.h>
@@ -72913,7 +72741,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_minisocks.c linux-3.0.9/net/ipv4/tcp_minisoc
  int sysctl_tcp_syncookies __read_mostly = 1;
  EXPORT_SYMBOL(sysctl_tcp_syncookies);
  
-@@ -745,6 +749,10 @@ listen_overflow:
+@@ -750,6 +754,10 @@ listen_overflow:
  
  embryonic_reset:
  	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
@@ -72924,9 +72752,9 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_minisocks.c linux-3.0.9/net/ipv4/tcp_minisoc
  	if (!(flg & TCP_FLAG_RST))
  		req->rsk_ops->send_reset(sk, skb);
  
-diff -urNp linux-3.0.9/net/ipv4/tcp_output.c linux-3.0.9/net/ipv4/tcp_output.c
---- linux-3.0.9/net/ipv4/tcp_output.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/tcp_output.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/tcp_output.c linux-3.1.1/net/ipv4/tcp_output.c
+--- linux-3.1.1/net/ipv4/tcp_output.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/tcp_output.c	2011-11-16 18:40:44.000000000 -0500
 @@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s
  	int mss;
  	int s_data_desired = 0;
@@ -72936,9 +72764,9 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_output.c linux-3.0.9/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.9/net/ipv4/tcp_probe.c linux-3.0.9/net/ipv4/tcp_probe.c
---- linux-3.0.9/net/ipv4/tcp_probe.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/tcp_probe.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/tcp_probe.c linux-3.1.1/net/ipv4/tcp_probe.c
+--- linux-3.1.1/net/ipv4/tcp_probe.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/tcp_probe.c	2011-11-16 18:39:08.000000000 -0500
 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
  		if (cnt + width >= len)
  			break;
@@ -72948,9 +72776,9 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_probe.c linux-3.0.9/net/ipv4/tcp_probe.c
  			return -EFAULT;
  		cnt += width;
  	}
-diff -urNp linux-3.0.9/net/ipv4/tcp_timer.c linux-3.0.9/net/ipv4/tcp_timer.c
---- linux-3.0.9/net/ipv4/tcp_timer.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/tcp_timer.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/tcp_timer.c linux-3.1.1/net/ipv4/tcp_timer.c
+--- linux-3.1.1/net/ipv4/tcp_timer.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/tcp_timer.c	2011-11-16 18:40:44.000000000 -0500
 @@ -22,6 +22,10 @@
  #include <linux/gfp.h>
  #include <net/tcp.h>
@@ -72976,9 +72804,9 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_timer.c linux-3.0.9/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.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
---- linux-3.0.9/net/ipv4/udp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/udp.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv4/udp.c linux-3.1.1/net/ipv4/udp.c
+--- linux-3.1.1/net/ipv4/udp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/udp.c	2011-11-16 19:17:54.000000000 -0500
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -72987,8 +72815,8 @@ diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
  #include <linux/socket.h>
  #include <linux/sockios.h>
  #include <linux/igmp.h>
-@@ -107,6 +108,10 @@
- #include <net/xfrm.h>
+@@ -108,6 +109,10 @@
+ #include <trace/events/udp.h>
  #include "udp_impl.h"
  
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
@@ -72998,7 +72826,7 @@ diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
  struct udp_table udp_table __read_mostly;
  EXPORT_SYMBOL(udp_table);
  
-@@ -564,6 +569,9 @@ found:
+@@ -565,6 +570,9 @@ found:
  	return s;
  }
  
@@ -73008,7 +72836,7 @@ diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
  /*
   * This routine is called by the ICMP module when it gets some
   * sort of error condition.  If err < 0 then the socket should
-@@ -855,9 +863,18 @@ int udp_sendmsg(struct kiocb *iocb, stru
+@@ -856,9 +864,18 @@ int udp_sendmsg(struct kiocb *iocb, stru
  		dport = usin->sin_port;
  		if (dport == 0)
  			return -EINVAL;
@@ -73027,7 +72855,7 @@ diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
  		daddr = inet->inet_daddr;
  		dport = inet->inet_dport;
  		/* Open fast path for connected socket.
-@@ -1098,7 +1115,7 @@ static unsigned int first_packet_length(
+@@ -1099,7 +1116,7 @@ static unsigned int first_packet_length(
  		udp_lib_checksum_complete(skb)) {
  		UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
  				 IS_UDPLITE(sk));
@@ -73036,7 +72864,7 @@ diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
  		__skb_unlink(skb, rcvq);
  		__skb_queue_tail(&list_kill, skb);
  	}
-@@ -1184,6 +1201,10 @@ try_again:
+@@ -1185,6 +1202,10 @@ try_again:
  	if (!skb)
  		goto out;
  
@@ -73047,7 +72875,7 @@ diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
  	ulen = skb->len - sizeof(struct udphdr);
  	if (len > ulen)
  		len = ulen;
-@@ -1483,7 +1504,7 @@ int udp_queue_rcv_skb(struct sock *sk, s
+@@ -1485,7 +1506,7 @@ int udp_queue_rcv_skb(struct sock *sk, s
  
  drop:
  	UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
@@ -73056,7 +72884,7 @@ diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
  	kfree_skb(skb);
  	return -1;
  }
-@@ -1502,7 +1523,7 @@ static void flush_stack(struct sock **st
+@@ -1504,7 +1525,7 @@ static void flush_stack(struct sock **st
  			skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
  
  		if (!skb1) {
@@ -73065,7 +72893,7 @@ diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
  			UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
  					 IS_UDPLITE(sk));
  			UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
-@@ -1671,6 +1692,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, 
+@@ -1673,6 +1694,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, 
  		goto csum_error;
  
  	UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
@@ -73075,7 +72903,7 @@ diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
  	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
  
  	/*
-@@ -2098,8 +2122,13 @@ static void udp4_format_sock(struct sock
+@@ -2100,8 +2124,13 @@ static void udp4_format_sock(struct sock
  		sk_wmem_alloc_get(sp),
  		sk_rmem_alloc_get(sp),
  		0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
@@ -73091,10 +72919,10 @@ diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
  }
  
  int udp4_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.9/net/ipv6/addrconf.c linux-3.0.9/net/ipv6/addrconf.c
---- linux-3.0.9/net/ipv6/addrconf.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv6/addrconf.c	2011-11-15 20:03:00.000000000 -0500
-@@ -2072,7 +2072,7 @@ int addrconf_set_dstaddr(struct net *net
+diff -urNp linux-3.1.1/net/ipv6/addrconf.c linux-3.1.1/net/ipv6/addrconf.c
+--- linux-3.1.1/net/ipv6/addrconf.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv6/addrconf.c	2011-11-16 18:39:08.000000000 -0500
+@@ -2083,7 +2083,7 @@ int addrconf_set_dstaddr(struct net *net
  		p.iph.ihl = 5;
  		p.iph.protocol = IPPROTO_IPV6;
  		p.iph.ttl = 64;
@@ -73103,9 +72931,9 @@ diff -urNp linux-3.0.9/net/ipv6/addrconf.c linux-3.0.9/net/ipv6/addrconf.c
  
  		if (ops->ndo_do_ioctl) {
  			mm_segment_t oldfs = get_fs();
-diff -urNp linux-3.0.9/net/ipv6/inet6_connection_sock.c linux-3.0.9/net/ipv6/inet6_connection_sock.c
---- linux-3.0.9/net/ipv6/inet6_connection_sock.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv6/inet6_connection_sock.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv6/inet6_connection_sock.c linux-3.1.1/net/ipv6/inet6_connection_sock.c
+--- linux-3.1.1/net/ipv6/inet6_connection_sock.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv6/inet6_connection_sock.c	2011-11-16 18:39:08.000000000 -0500
 @@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *
  #ifdef CONFIG_XFRM
  	{
@@ -73124,9 +72952,9 @@ diff -urNp linux-3.0.9/net/ipv6/inet6_connection_sock.c linux-3.0.9/net/ipv6/ine
  			__sk_dst_reset(sk);
  			dst = NULL;
  		}
-diff -urNp linux-3.0.9/net/ipv6/ipv6_sockglue.c linux-3.0.9/net/ipv6/ipv6_sockglue.c
---- linux-3.0.9/net/ipv6/ipv6_sockglue.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv6/ipv6_sockglue.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv6/ipv6_sockglue.c linux-3.1.1/net/ipv6/ipv6_sockglue.c
+--- linux-3.1.1/net/ipv6/ipv6_sockglue.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv6/ipv6_sockglue.c	2011-11-16 18:40:44.000000000 -0500
 @@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc
  	int val, valbool;
  	int retv = -ENOPROTOOPT;
@@ -73154,9 +72982,9 @@ diff -urNp linux-3.0.9/net/ipv6/ipv6_sockglue.c linux-3.0.9/net/ipv6/ipv6_sockgl
  		msg.msg_controllen = len;
  		msg.msg_flags = flags;
  
-diff -urNp linux-3.0.9/net/ipv6/raw.c linux-3.0.9/net/ipv6/raw.c
---- linux-3.0.9/net/ipv6/raw.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv6/raw.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv6/raw.c linux-3.1.1/net/ipv6/raw.c
+--- linux-3.1.1/net/ipv6/raw.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv6/raw.c	2011-11-16 18:40:44.000000000 -0500
 @@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s
  {
  	if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) &&
@@ -73237,7 +73065,7 @@ diff -urNp linux-3.0.9/net/ipv6/raw.c linux-3.0.9/net/ipv6/raw.c
  			return -EFAULT;
  		return 0;
  	default:
-@@ -1252,7 +1259,13 @@ static void raw6_sock_seq_show(struct se
+@@ -1245,7 +1252,13 @@ static void raw6_sock_seq_show(struct se
  		   0, 0L, 0,
  		   sock_i_uid(sp), 0,
  		   sock_i_ino(sp),
@@ -73252,9 +73080,9 @@ diff -urNp linux-3.0.9/net/ipv6/raw.c linux-3.0.9/net/ipv6/raw.c
  }
  
  static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.9/net/ipv6/tcp_ipv6.c linux-3.0.9/net/ipv6/tcp_ipv6.c
---- linux-3.0.9/net/ipv6/tcp_ipv6.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv6/tcp_ipv6.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv6/tcp_ipv6.c linux-3.1.1/net/ipv6/tcp_ipv6.c
+--- linux-3.1.1/net/ipv6/tcp_ipv6.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv6/tcp_ipv6.c	2011-11-16 18:40:44.000000000 -0500
 @@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
  }
  #endif
@@ -73266,7 +73094,7 @@ diff -urNp linux-3.0.9/net/ipv6/tcp_ipv6.c linux-3.0.9/net/ipv6/tcp_ipv6.c
  static void tcp_v6_hash(struct sock *sk)
  {
  	if (sk->sk_state != TCP_CLOSE) {
-@@ -1667,6 +1671,9 @@ static int tcp_v6_do_rcv(struct sock *sk
+@@ -1647,6 +1651,9 @@ static int tcp_v6_do_rcv(struct sock *sk
  	return 0;
  
  reset:
@@ -73276,7 +73104,7 @@ diff -urNp linux-3.0.9/net/ipv6/tcp_ipv6.c linux-3.0.9/net/ipv6/tcp_ipv6.c
  	tcp_v6_send_reset(sk, skb);
  discard:
  	if (opt_skb)
-@@ -1746,12 +1753,20 @@ static int tcp_v6_rcv(struct sk_buff *sk
+@@ -1726,12 +1733,20 @@ static int tcp_v6_rcv(struct sk_buff *sk
  	TCP_SKB_CB(skb)->sacked = 0;
  
  	sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
@@ -73299,7 +73127,7 @@ diff -urNp linux-3.0.9/net/ipv6/tcp_ipv6.c linux-3.0.9/net/ipv6/tcp_ipv6.c
  
  	if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
  		NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1799,6 +1814,10 @@ no_tcp_socket:
+@@ -1779,6 +1794,10 @@ no_tcp_socket:
  bad_packet:
  		TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
  	} else {
@@ -73310,7 +73138,7 @@ diff -urNp linux-3.0.9/net/ipv6/tcp_ipv6.c linux-3.0.9/net/ipv6/tcp_ipv6.c
  		tcp_v6_send_reset(NULL, skb);
  	}
  
-@@ -2059,7 +2078,13 @@ static void get_openreq6(struct seq_file
+@@ -2039,7 +2058,13 @@ static void get_openreq6(struct seq_file
  		   uid,
  		   0,  /* non standard timer */
  		   0, /* open_requests have no inode */
@@ -73325,7 +73153,7 @@ diff -urNp linux-3.0.9/net/ipv6/tcp_ipv6.c linux-3.0.9/net/ipv6/tcp_ipv6.c
  }
  
  static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
-@@ -2109,7 +2134,12 @@ static void get_tcp6_sock(struct seq_fil
+@@ -2089,7 +2114,12 @@ static void get_tcp6_sock(struct seq_fil
  		   sock_i_uid(sp),
  		   icsk->icsk_probes_out,
  		   sock_i_ino(sp),
@@ -73339,7 +73167,7 @@ diff -urNp linux-3.0.9/net/ipv6/tcp_ipv6.c linux-3.0.9/net/ipv6/tcp_ipv6.c
  		   jiffies_to_clock_t(icsk->icsk_rto),
  		   jiffies_to_clock_t(icsk->icsk_ack.ato),
  		   (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
-@@ -2144,7 +2174,13 @@ static void get_timewait6_sock(struct se
+@@ -2124,7 +2154,13 @@ static void get_timewait6_sock(struct se
  		   dest->s6_addr32[2], dest->s6_addr32[3], destp,
  		   tw->tw_substate, 0, 0,
  		   3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
@@ -73354,9 +73182,9 @@ diff -urNp linux-3.0.9/net/ipv6/tcp_ipv6.c linux-3.0.9/net/ipv6/tcp_ipv6.c
  }
  
  static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.9/net/ipv6/udp.c linux-3.0.9/net/ipv6/udp.c
---- linux-3.0.9/net/ipv6/udp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv6/udp.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/ipv6/udp.c linux-3.1.1/net/ipv6/udp.c
+--- linux-3.1.1/net/ipv6/udp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv6/udp.c	2011-11-16 18:40:44.000000000 -0500
 @@ -50,6 +50,10 @@
  #include <linux/seq_file.h>
  #include "udp_impl.h"
@@ -73405,7 +73233,7 @@ diff -urNp linux-3.0.9/net/ipv6/udp.c linux-3.0.9/net/ipv6/udp.c
  		bh_unlock_sock(sk);
  		sock_put(sk);
  		goto discard;
-@@ -1408,8 +1415,13 @@ static void udp6_sock_seq_show(struct se
+@@ -1406,8 +1413,13 @@ static void udp6_sock_seq_show(struct se
  		   0, 0L, 0,
  		   sock_i_uid(sp), 0,
  		   sock_i_ino(sp),
@@ -73421,9 +73249,9 @@ diff -urNp linux-3.0.9/net/ipv6/udp.c linux-3.0.9/net/ipv6/udp.c
  }
  
  int udp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.9/net/irda/ircomm/ircomm_tty.c linux-3.0.9/net/irda/ircomm/ircomm_tty.c
---- linux-3.0.9/net/irda/ircomm/ircomm_tty.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/irda/ircomm/ircomm_tty.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/irda/ircomm/ircomm_tty.c linux-3.1.1/net/irda/ircomm/ircomm_tty.c
+--- linux-3.1.1/net/irda/ircomm/ircomm_tty.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/irda/ircomm/ircomm_tty.c	2011-11-16 18:39:08.000000000 -0500
 @@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(st
  	add_wait_queue(&self->open_wait, &wait);
  
@@ -73546,9 +73374,9 @@ diff -urNp linux-3.0.9/net/irda/ircomm/ircomm_tty.c linux-3.0.9/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.9/net/iucv/af_iucv.c linux-3.0.9/net/iucv/af_iucv.c
---- linux-3.0.9/net/iucv/af_iucv.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/iucv/af_iucv.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/iucv/af_iucv.c linux-3.1.1/net/iucv/af_iucv.c
+--- linux-3.1.1/net/iucv/af_iucv.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/iucv/af_iucv.c	2011-11-16 18:39:08.000000000 -0500
 @@ -648,10 +648,10 @@ static int iucv_sock_autobind(struct soc
  
  	write_lock_bh(&iucv_sk_list.lock);
@@ -73562,9 +73390,9 @@ diff -urNp linux-3.0.9/net/iucv/af_iucv.c linux-3.0.9/net/iucv/af_iucv.c
  	}
  
  	write_unlock_bh(&iucv_sk_list.lock);
-diff -urNp linux-3.0.9/net/key/af_key.c linux-3.0.9/net/key/af_key.c
---- linux-3.0.9/net/key/af_key.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/key/af_key.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/key/af_key.c linux-3.1.1/net/key/af_key.c
+--- linux-3.1.1/net/key/af_key.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/key/af_key.c	2011-11-16 18:40:44.000000000 -0500
 @@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk
  	struct xfrm_migrate m[XFRM_MAX_DEPTH];
  	struct xfrm_kmaddress k;
@@ -73587,9 +73415,9 @@ diff -urNp linux-3.0.9/net/key/af_key.c linux-3.0.9/net/key/af_key.c
  	} while (!res);
  	return res;
  }
-diff -urNp linux-3.0.9/net/lapb/lapb_iface.c linux-3.0.9/net/lapb/lapb_iface.c
---- linux-3.0.9/net/lapb/lapb_iface.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/lapb/lapb_iface.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/lapb/lapb_iface.c linux-3.1.1/net/lapb/lapb_iface.c
+--- linux-3.1.1/net/lapb/lapb_iface.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/lapb/lapb_iface.c	2011-11-16 18:39:08.000000000 -0500
 @@ -158,7 +158,7 @@ int lapb_register(struct net_device *dev
  		goto out;
  
@@ -73653,9 +73481,9 @@ diff -urNp linux-3.0.9/net/lapb/lapb_iface.c linux-3.0.9/net/lapb/lapb_iface.c
  		used = 1;
  	}
  
-diff -urNp linux-3.0.9/net/mac80211/debugfs_sta.c linux-3.0.9/net/mac80211/debugfs_sta.c
---- linux-3.0.9/net/mac80211/debugfs_sta.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/debugfs_sta.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/mac80211/debugfs_sta.c linux-3.1.1/net/mac80211/debugfs_sta.c
+--- linux-3.1.1/net/mac80211/debugfs_sta.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/debugfs_sta.c	2011-11-16 18:40:44.000000000 -0500
 @@ -140,6 +140,8 @@ static ssize_t sta_agg_status_read(struc
  	struct tid_ampdu_rx *tid_rx;
  	struct tid_ampdu_tx *tid_tx;
@@ -73674,9 +73502,9 @@ diff -urNp linux-3.0.9/net/mac80211/debugfs_sta.c linux-3.0.9/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.9/net/mac80211/ieee80211_i.h linux-3.0.9/net/mac80211/ieee80211_i.h
---- linux-3.0.9/net/mac80211/ieee80211_i.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/ieee80211_i.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/mac80211/ieee80211_i.h linux-3.1.1/net/mac80211/ieee80211_i.h
+--- linux-3.1.1/net/mac80211/ieee80211_i.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/ieee80211_i.h	2011-11-16 18:39:08.000000000 -0500
 @@ -27,6 +27,7 @@
  #include <net/ieee80211_radiotap.h>
  #include <net/cfg80211.h>
@@ -73685,7 +73513,7 @@ diff -urNp linux-3.0.9/net/mac80211/ieee80211_i.h linux-3.0.9/net/mac80211/ieee8
  #include "key.h"
  #include "sta_info.h"
  
-@@ -723,7 +724,7 @@ struct ieee80211_local {
+@@ -754,7 +755,7 @@ struct ieee80211_local {
  	/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
  	spinlock_t queue_stop_reason_lock;
  
@@ -73694,9 +73522,9 @@ diff -urNp linux-3.0.9/net/mac80211/ieee80211_i.h linux-3.0.9/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.9/net/mac80211/iface.c linux-3.0.9/net/mac80211/iface.c
---- linux-3.0.9/net/mac80211/iface.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/iface.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/mac80211/iface.c linux-3.1.1/net/mac80211/iface.c
+--- linux-3.1.1/net/mac80211/iface.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/iface.c	2011-11-16 18:39:08.000000000 -0500
 @@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
  		break;
  	}
@@ -73733,7 +73561,7 @@ diff -urNp linux-3.0.9/net/mac80211/iface.c linux-3.0.9/net/mac80211/iface.c
  		drv_stop(local);
   err_del_bss:
  	sdata->bss = NULL;
-@@ -475,7 +475,7 @@ static void ieee80211_do_stop(struct iee
+@@ -474,7 +474,7 @@ static void ieee80211_do_stop(struct iee
  	}
  
  	if (going_down)
@@ -73742,7 +73570,7 @@ diff -urNp linux-3.0.9/net/mac80211/iface.c linux-3.0.9/net/mac80211/iface.c
  
  	switch (sdata->vif.type) {
  	case NL80211_IFTYPE_AP_VLAN:
-@@ -534,7 +534,7 @@ static void ieee80211_do_stop(struct iee
+@@ -533,7 +533,7 @@ static void ieee80211_do_stop(struct iee
  
  	ieee80211_recalc_ps(local, -1);
  
@@ -73751,9 +73579,9 @@ diff -urNp linux-3.0.9/net/mac80211/iface.c linux-3.0.9/net/mac80211/iface.c
  		if (local->ops->napi_poll)
  			napi_disable(&local->napi);
  		ieee80211_clear_tx_pending(local);
-diff -urNp linux-3.0.9/net/mac80211/main.c linux-3.0.9/net/mac80211/main.c
---- linux-3.0.9/net/mac80211/main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/main.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/mac80211/main.c linux-3.1.1/net/mac80211/main.c
+--- linux-3.1.1/net/mac80211/main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/main.c	2011-11-16 18:39:08.000000000 -0500
 @@ -209,7 +209,7 @@ int ieee80211_hw_config(struct ieee80211
  		local->hw.conf.power_level = power;
  	}
@@ -73763,10 +73591,10 @@ diff -urNp linux-3.0.9/net/mac80211/main.c linux-3.0.9/net/mac80211/main.c
  		ret = drv_config(local, changed);
  		/*
  		 * Goal:
-diff -urNp linux-3.0.9/net/mac80211/mlme.c linux-3.0.9/net/mac80211/mlme.c
---- linux-3.0.9/net/mac80211/mlme.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/mlme.c	2011-11-15 20:03:00.000000000 -0500
-@@ -1447,6 +1447,8 @@ static bool ieee80211_assoc_success(stru
+diff -urNp linux-3.1.1/net/mac80211/mlme.c linux-3.1.1/net/mac80211/mlme.c
+--- linux-3.1.1/net/mac80211/mlme.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/mlme.c	2011-11-16 18:40:44.000000000 -0500
+@@ -1464,6 +1464,8 @@ static bool ieee80211_assoc_success(stru
  	bool have_higher_than_11mbit = false;
  	u16 ap_ht_cap_flags;
  
@@ -73775,10 +73603,19 @@ diff -urNp linux-3.0.9/net/mac80211/mlme.c linux-3.0.9/net/mac80211/mlme.c
  	/* AssocResp and ReassocResp have identical structure */
  
  	aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
-diff -urNp linux-3.0.9/net/mac80211/pm.c linux-3.0.9/net/mac80211/pm.c
---- linux-3.0.9/net/mac80211/pm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/pm.c	2011-11-15 20:03:00.000000000 -0500
-@@ -47,7 +47,7 @@ int __ieee80211_suspend(struct ieee80211
+diff -urNp linux-3.1.1/net/mac80211/pm.c linux-3.1.1/net/mac80211/pm.c
+--- linux-3.1.1/net/mac80211/pm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/pm.c	2011-11-16 18:39:08.000000000 -0500
+@@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211
+ 	struct ieee80211_sub_if_data *sdata;
+ 	struct sta_info *sta;
+ 
+-	if (!local->open_count)
++	if (!local_read(&local->open_count))
+ 		goto suspend;
+ 
+ 	ieee80211_scan_cancel(local);
+@@ -72,7 +72,7 @@ int __ieee80211_suspend(struct ieee80211
  	cancel_work_sync(&local->dynamic_ps_enable_work);
  	del_timer_sync(&local->dynamic_ps_timer);
  
@@ -73786,8 +73623,8 @@ diff -urNp linux-3.0.9/net/mac80211/pm.c linux-3.0.9/net/mac80211/pm.c
 +	local->wowlan = wowlan && local_read(&local->open_count);
  	if (local->wowlan) {
  		int err = drv_suspend(local, wowlan);
- 		if (err) {
-@@ -111,7 +111,7 @@ int __ieee80211_suspend(struct ieee80211
+ 		if (err < 0) {
+@@ -129,7 +129,7 @@ int __ieee80211_suspend(struct ieee80211
  	}
  
  	/* stop hardware - this must stop RX */
@@ -73796,9 +73633,9 @@ diff -urNp linux-3.0.9/net/mac80211/pm.c linux-3.0.9/net/mac80211/pm.c
  		ieee80211_stop_device(local);
  
   suspend:
-diff -urNp linux-3.0.9/net/mac80211/rate.c linux-3.0.9/net/mac80211/rate.c
---- linux-3.0.9/net/mac80211/rate.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/rate.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/mac80211/rate.c linux-3.1.1/net/mac80211/rate.c
+--- linux-3.1.1/net/mac80211/rate.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/rate.c	2011-11-16 18:39:08.000000000 -0500
 @@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
  
  	ASSERT_RTNL();
@@ -73808,9 +73645,9 @@ diff -urNp linux-3.0.9/net/mac80211/rate.c linux-3.0.9/net/mac80211/rate.c
  		return -EBUSY;
  
  	if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -urNp linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c
---- linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/mac80211/rc80211_pid_debugfs.c linux-3.1.1/net/mac80211/rc80211_pid_debugfs.c
+--- linux-3.1.1/net/mac80211/rc80211_pid_debugfs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/rc80211_pid_debugfs.c	2011-11-16 18:39:08.000000000 -0500
 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
  
  	spin_unlock_irqrestore(&events->lock, status);
@@ -73820,21 +73657,21 @@ diff -urNp linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c linux-3.0.9/net/mac802
  		return -EFAULT;
  
  	return p;
-diff -urNp linux-3.0.9/net/mac80211/util.c linux-3.0.9/net/mac80211/util.c
---- linux-3.0.9/net/mac80211/util.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/util.c	2011-11-15 20:03:00.000000000 -0500
-@@ -1147,7 +1147,7 @@ int ieee80211_reconfig(struct ieee80211_
- #endif
+diff -urNp linux-3.1.1/net/mac80211/util.c linux-3.1.1/net/mac80211/util.c
+--- linux-3.1.1/net/mac80211/util.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/util.c	2011-11-16 18:39:08.000000000 -0500
+@@ -1166,7 +1166,7 @@ int ieee80211_reconfig(struct ieee80211_
+ 	drv_set_coverage_class(local, hw->wiphy->coverage_class);
  
- 	/* restart hardware */
--	if (local->open_count) {
-+	if (local_read(&local->open_count)) {
- 		/*
- 		 * Upon resume hardware can sometimes be goofy due to
- 		 * various platform / driver / bus issues, so restarting
-diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c
---- linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c	2011-11-15 20:03:00.000000000 -0500
+ 	/* everything else happens only if HW was up & running */
+-	if (!local->open_count)
++	if (!local_read(&local->open_count))
+ 		goto wake_up;
+ 
+ 	/*
+diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_conn.c linux-3.1.1/net/netfilter/ipvs/ip_vs_conn.c
+--- linux-3.1.1/net/netfilter/ipvs/ip_vs_conn.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/ipvs/ip_vs_conn.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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);
@@ -73862,9 +73699,9 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.9/net/netfilter
  	if (i > 8 || i < 0) return 0;
  
  	if (!todrop_rate[i]) return 0;
-diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c
---- linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_core.c linux-3.1.1/net/netfilter/ipvs/ip_vs_core.c
+--- linux-3.1.1/net/netfilter/ipvs/ip_vs_core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/ipvs/ip_vs_core.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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 */
@@ -73874,7 +73711,7 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c linux-3.0.9/net/netfilter
  		ip_vs_conn_put(cp);
  		return ret;
  	}
-@@ -1613,7 +1613,7 @@ ip_vs_in(unsigned int hooknum, struct sk
+@@ -1612,7 +1612,7 @@ ip_vs_in(unsigned int hooknum, struct sk
  	if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
  		pkts = sysctl_sync_threshold(ipvs);
  	else
@@ -73883,9 +73720,9 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c linux-3.0.9/net/netfilter
  
  	if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
  	    cp->protocol == IPPROTO_SCTP) {
-diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c
---- linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_ctl.c linux-3.1.1/net/netfilter/ipvs/ip_vs_ctl.c
+--- linux-3.1.1/net/netfilter/ipvs/ip_vs_ctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/ipvs/ip_vs_ctl.c	2011-11-16 19:13:12.000000000 -0500
 @@ -782,7 +782,7 @@ __ip_vs_update_dest(struct ip_vs_service
  		ip_vs_rs_hash(ipvs, dest);
  		write_unlock_bh(&ipvs->rs_lock);
@@ -73913,16 +73750,16 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.9/net/netfilter/
  					   atomic_read(&dest->weight),
  					   atomic_read(&dest->activeconns),
  					   atomic_read(&dest->inactconns));
-@@ -2284,6 +2284,8 @@ do_ip_vs_set_ctl(struct sock *sk, int cm
- 	struct ip_vs_dest_user *udest_compat;
+@@ -2285,6 +2285,8 @@ do_ip_vs_set_ctl(struct sock *sk, int cm
  	struct ip_vs_dest_user_kern udest;
+ 	struct netns_ipvs *ipvs = net_ipvs(net);
  
 +	pax_track_stack();
 +
  	if (!capable(CAP_NET_ADMIN))
  		return -EPERM;
  
-@@ -2498,7 +2500,7 @@ __ip_vs_get_dest_entries(struct net *net
+@@ -2508,7 +2510,7 @@ __ip_vs_get_dest_entries(struct net *net
  
  			entry.addr = dest->addr.ip;
  			entry.port = dest->port;
@@ -73931,7 +73768,7 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.9/net/netfilter/
  			entry.weight = atomic_read(&dest->weight);
  			entry.u_threshold = dest->u_threshold;
  			entry.l_threshold = dest->l_threshold;
-@@ -3026,7 +3028,7 @@ static int ip_vs_genl_fill_dest(struct s
+@@ -3041,7 +3043,7 @@ static int ip_vs_genl_fill_dest(struct s
  	NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
  
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
@@ -73940,10 +73777,10 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.9/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.9/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c
---- linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c	2011-11-15 20:03:00.000000000 -0500
-@@ -648,7 +648,7 @@ control:
+diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_sync.c linux-3.1.1/net/netfilter/ipvs/ip_vs_sync.c
+--- linux-3.1.1/net/netfilter/ipvs/ip_vs_sync.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/ipvs/ip_vs_sync.c	2011-11-16 18:39:08.000000000 -0500
+@@ -649,7 +649,7 @@ control:
  	 * i.e only increment in_pkts for Templates.
  	 */
  	if (cp->flags & IP_VS_CONN_F_TEMPLATE) {
@@ -73952,7 +73789,7 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.9/net/netfilter
  
  		if (pkts % sysctl_sync_period(ipvs) != 1)
  			return;
-@@ -794,7 +794,7 @@ static void ip_vs_proc_conn(struct net *
+@@ -795,7 +795,7 @@ static void ip_vs_proc_conn(struct net *
  
  	if (opt)
  		memcpy(&cp->in_seq, opt, sizeof(*opt));
@@ -73961,9 +73798,9 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.9/net/netfilter
  	cp->state = state;
  	cp->old_state = cp->state;
  	/*
-diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
  		else
  			rc = NF_ACCEPT;
@@ -73982,9 +73819,9 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.9/net/netfilter
  		goto out;
  	}
  
-diff -urNp linux-3.0.9/net/netfilter/Kconfig linux-3.0.9/net/netfilter/Kconfig
---- linux-3.0.9/net/netfilter/Kconfig	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/Kconfig	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/netfilter/Kconfig linux-3.1.1/net/netfilter/Kconfig
+--- linux-3.1.1/net/netfilter/Kconfig	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/Kconfig	2011-11-16 18:40:44.000000000 -0500
 @@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP
  
  	  To compile it as a module, choose M here.  If unsure, say N.
@@ -74002,9 +73839,9 @@ diff -urNp linux-3.0.9/net/netfilter/Kconfig linux-3.0.9/net/netfilter/Kconfig
  config NETFILTER_XT_MATCH_HASHLIMIT
  	tristate '"hashlimit" match support'
  	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-3.0.9/net/netfilter/Makefile linux-3.0.9/net/netfilter/Makefile
---- linux-3.0.9/net/netfilter/Makefile	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/Makefile	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/netfilter/Makefile linux-3.1.1/net/netfilter/Makefile
+--- linux-3.1.1/net/netfilter/Makefile	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/Makefile	2011-11-16 18:40:44.000000000 -0500
 @@ -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
@@ -74013,9 +73850,9 @@ diff -urNp linux-3.0.9/net/netfilter/Makefile linux-3.0.9/net/netfilter/Makefile
  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.9/net/netfilter/nfnetlink_log.c linux-3.0.9/net/netfilter/nfnetlink_log.c
---- linux-3.0.9/net/netfilter/nfnetlink_log.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/nfnetlink_log.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/netfilter/nfnetlink_log.c linux-3.1.1/net/netfilter/nfnetlink_log.c
+--- linux-3.1.1/net/netfilter/nfnetlink_log.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/nfnetlink_log.c	2011-11-16 18:39:08.000000000 -0500
 @@ -70,7 +70,7 @@ struct nfulnl_instance {
  };
  
@@ -74034,39 +73871,9 @@ diff -urNp linux-3.0.9/net/netfilter/nfnetlink_log.c linux-3.0.9/net/netfilter/n
  
  	if (data_len) {
  		struct nlattr *nla;
-diff -urNp linux-3.0.9/net/netfilter/nfnetlink_queue.c linux-3.0.9/net/netfilter/nfnetlink_queue.c
---- linux-3.0.9/net/netfilter/nfnetlink_queue.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/nfnetlink_queue.c	2011-11-15 20:03:00.000000000 -0500
-@@ -58,7 +58,7 @@ struct nfqnl_instance {
-  */
- 	spinlock_t	lock;
- 	unsigned int	queue_total;
--	atomic_t	id_sequence;		/* 'sequence' of pkt ids */
-+	atomic_unchecked_t	id_sequence;	/* 'sequence' of pkt ids */
- 	struct list_head queue_list;		/* packets in queue */
- };
- 
-@@ -272,7 +272,7 @@ nfqnl_build_packet_message(struct nfqnl_
- 	nfmsg->version = NFNETLINK_V0;
- 	nfmsg->res_id = htons(queue->queue_num);
- 
--	entry->id = atomic_inc_return(&queue->id_sequence);
-+	entry->id = atomic_inc_return_unchecked(&queue->id_sequence);
- 	pmsg.packet_id 		= htonl(entry->id);
- 	pmsg.hw_protocol	= entskb->protocol;
- 	pmsg.hook		= entry->hook;
-@@ -870,7 +870,7 @@ static int seq_show(struct seq_file *s, 
- 			  inst->peer_pid, inst->queue_total,
- 			  inst->copy_mode, inst->copy_range,
- 			  inst->queue_dropped, inst->queue_user_dropped,
--			  atomic_read(&inst->id_sequence), 1);
-+			  atomic_read_unchecked(&inst->id_sequence), 1);
- }
- 
- static const struct seq_operations nfqnl_seq_ops = {
-diff -urNp linux-3.0.9/net/netfilter/xt_gradm.c linux-3.0.9/net/netfilter/xt_gradm.c
---- linux-3.0.9/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/net/netfilter/xt_gradm.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/netfilter/xt_gradm.c linux-3.1.1/net/netfilter/xt_gradm.c
+--- linux-3.1.1/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/net/netfilter/xt_gradm.c	2011-11-16 18:40:44.000000000 -0500
 @@ -0,0 +1,51 @@
 +/*
 + *	gradm match for netfilter
@@ -74119,9 +73926,9 @@ diff -urNp linux-3.0.9/net/netfilter/xt_gradm.c linux-3.0.9/net/netfilter/xt_gra
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_gradm");
 +MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-3.0.9/net/netfilter/xt_statistic.c linux-3.0.9/net/netfilter/xt_statistic.c
---- linux-3.0.9/net/netfilter/xt_statistic.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/xt_statistic.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/netfilter/xt_statistic.c linux-3.1.1/net/netfilter/xt_statistic.c
+--- linux-3.1.1/net/netfilter/xt_statistic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/xt_statistic.c	2011-11-16 18:39:08.000000000 -0500
 @@ -18,7 +18,7 @@
  #include <linux/netfilter/x_tables.h>
  
@@ -74152,9 +73959,9 @@ diff -urNp linux-3.0.9/net/netfilter/xt_statistic.c linux-3.0.9/net/netfilter/xt
  
  	return 0;
  }
-diff -urNp linux-3.0.9/net/netlink/af_netlink.c linux-3.0.9/net/netlink/af_netlink.c
---- linux-3.0.9/net/netlink/af_netlink.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netlink/af_netlink.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/netlink/af_netlink.c linux-3.1.1/net/netlink/af_netlink.c
+--- linux-3.1.1/net/netlink/af_netlink.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netlink/af_netlink.c	2011-11-16 18:39:08.000000000 -0500
 @@ -742,7 +742,7 @@ static void netlink_overrun(struct sock 
  			sk->sk_error_report(sk);
  		}
@@ -74164,7 +73971,7 @@ diff -urNp linux-3.0.9/net/netlink/af_netlink.c linux-3.0.9/net/netlink/af_netli
  }
  
  static struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid)
-@@ -1994,7 +1994,7 @@ static int netlink_seq_show(struct seq_f
+@@ -2000,7 +2000,7 @@ static int netlink_seq_show(struct seq_f
  			   sk_wmem_alloc_get(s),
  			   nlk->cb,
  			   atomic_read(&s->sk_refcnt),
@@ -74173,9 +73980,9 @@ diff -urNp linux-3.0.9/net/netlink/af_netlink.c linux-3.0.9/net/netlink/af_netli
  			   sock_i_ino(s)
  			);
  
-diff -urNp linux-3.0.9/net/netrom/af_netrom.c linux-3.0.9/net/netrom/af_netrom.c
---- linux-3.0.9/net/netrom/af_netrom.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netrom/af_netrom.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/netrom/af_netrom.c linux-3.1.1/net/netrom/af_netrom.c
+--- linux-3.1.1/net/netrom/af_netrom.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netrom/af_netrom.c	2011-11-16 18:40:44.000000000 -0500
 @@ -839,6 +839,7 @@ static int nr_getname(struct socket *soc
  	struct sock *sk = sock->sk;
  	struct nr_sock *nr = nr_sk(sk);
@@ -74192,10 +73999,10 @@ diff -urNp linux-3.0.9/net/netrom/af_netrom.c linux-3.0.9/net/netrom/af_netrom.c
  		sax->fsa_ax25.sax25_call   = nr->source_addr;
  		*uaddr_len = sizeof(struct sockaddr_ax25);
  	}
-diff -urNp linux-3.0.9/net/packet/af_packet.c linux-3.0.9/net/packet/af_packet.c
---- linux-3.0.9/net/packet/af_packet.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/packet/af_packet.c	2011-11-15 20:03:00.000000000 -0500
-@@ -647,7 +647,7 @@ static int packet_rcv(struct sk_buff *sk
+diff -urNp linux-3.1.1/net/packet/af_packet.c linux-3.1.1/net/packet/af_packet.c
+--- linux-3.1.1/net/packet/af_packet.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/packet/af_packet.c	2011-11-16 18:39:08.000000000 -0500
+@@ -954,7 +954,7 @@ static int packet_rcv(struct sk_buff *sk
  
  	spin_lock(&sk->sk_receive_queue.lock);
  	po->stats.tp_packets++;
@@ -74204,7 +74011,7 @@ diff -urNp linux-3.0.9/net/packet/af_packet.c linux-3.0.9/net/packet/af_packet.c
  	__skb_queue_tail(&sk->sk_receive_queue, skb);
  	spin_unlock(&sk->sk_receive_queue.lock);
  	sk->sk_data_ready(sk, skb->len);
-@@ -656,7 +656,7 @@ static int packet_rcv(struct sk_buff *sk
+@@ -963,7 +963,7 @@ static int packet_rcv(struct sk_buff *sk
  drop_n_acct:
  	spin_lock(&sk->sk_receive_queue.lock);
  	po->stats.tp_drops++;
@@ -74213,7 +74020,7 @@ diff -urNp linux-3.0.9/net/packet/af_packet.c linux-3.0.9/net/packet/af_packet.c
  	spin_unlock(&sk->sk_receive_queue.lock);
  
  drop_n_restore:
-@@ -2171,7 +2171,7 @@ static int packet_getsockopt(struct sock
+@@ -2479,7 +2479,7 @@ static int packet_getsockopt(struct sock
  	case PACKET_HDRLEN:
  		if (len > sizeof(int))
  			len = sizeof(int);
@@ -74222,7 +74029,7 @@ diff -urNp linux-3.0.9/net/packet/af_packet.c linux-3.0.9/net/packet/af_packet.c
  			return -EFAULT;
  		switch (val) {
  		case TPACKET_V1:
-@@ -2209,7 +2209,7 @@ static int packet_getsockopt(struct sock
+@@ -2526,7 +2526,7 @@ static int packet_getsockopt(struct sock
  
  	if (put_user(len, optlen))
  		return -EFAULT;
@@ -74231,9 +74038,9 @@ diff -urNp linux-3.0.9/net/packet/af_packet.c linux-3.0.9/net/packet/af_packet.c
  		return -EFAULT;
  	return 0;
  }
-diff -urNp linux-3.0.9/net/phonet/af_phonet.c linux-3.0.9/net/phonet/af_phonet.c
---- linux-3.0.9/net/phonet/af_phonet.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/phonet/af_phonet.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/phonet/af_phonet.c linux-3.1.1/net/phonet/af_phonet.c
+--- linux-3.1.1/net/phonet/af_phonet.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/phonet/af_phonet.c	2011-11-16 18:40:44.000000000 -0500
 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
  {
  	struct phonet_protocol *pp;
@@ -74252,9 +74059,9 @@ diff -urNp linux-3.0.9/net/phonet/af_phonet.c linux-3.0.9/net/phonet/af_phonet.c
  		return -EINVAL;
  
  	err = proto_register(pp->prot, 1);
-diff -urNp linux-3.0.9/net/phonet/pep.c linux-3.0.9/net/phonet/pep.c
---- linux-3.0.9/net/phonet/pep.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/phonet/pep.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/phonet/pep.c linux-3.1.1/net/phonet/pep.c
+--- linux-3.1.1/net/phonet/pep.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/phonet/pep.c	2011-11-16 18:39:08.000000000 -0500
 @@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk, 
  
  	case PNS_PEP_CTRL_REQ:
@@ -74282,9 +74089,9 @@ diff -urNp linux-3.0.9/net/phonet/pep.c linux-3.0.9/net/phonet/pep.c
  			err = NET_RX_DROP;
  			break;
  		}
-diff -urNp linux-3.0.9/net/phonet/socket.c linux-3.0.9/net/phonet/socket.c
---- linux-3.0.9/net/phonet/socket.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/phonet/socket.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/phonet/socket.c linux-3.1.1/net/phonet/socket.c
+--- linux-3.1.1/net/phonet/socket.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/phonet/socket.c	2011-11-16 18:40:44.000000000 -0500
 @@ -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),
@@ -74301,9 +74108,9 @@ diff -urNp linux-3.0.9/net/phonet/socket.c linux-3.0.9/net/phonet/socket.c
  	}
  	seq_printf(seq, "%*s\n", 127 - len, "");
  	return 0;
-diff -urNp linux-3.0.9/net/rds/cong.c linux-3.0.9/net/rds/cong.c
---- linux-3.0.9/net/rds/cong.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/cong.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rds/cong.c linux-3.1.1/net/rds/cong.c
+--- linux-3.1.1/net/rds/cong.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/cong.c	2011-11-16 18:39:08.000000000 -0500
 @@ -77,7 +77,7 @@
   * finds that the saved generation number is smaller than the global generation
   * number, it wakes up the process.
@@ -74331,9 +74138,9 @@ diff -urNp linux-3.0.9/net/rds/cong.c linux-3.0.9/net/rds/cong.c
  
  	if (likely(*recent == gen))
  		return 0;
-diff -urNp linux-3.0.9/net/rds/ib_cm.c linux-3.0.9/net/rds/ib_cm.c
---- linux-3.0.9/net/rds/ib_cm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/ib_cm.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rds/ib_cm.c linux-3.1.1/net/rds/ib_cm.c
+--- linux-3.1.1/net/rds/ib_cm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/ib_cm.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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);
@@ -74343,10 +74150,10 @@ diff -urNp linux-3.0.9/net/rds/ib_cm.c linux-3.0.9/net/rds/ib_cm.c
  #else
  	ic->i_ack_next = 0;
  #endif
-diff -urNp linux-3.0.9/net/rds/ib.h linux-3.0.9/net/rds/ib.h
---- linux-3.0.9/net/rds/ib.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/ib.h	2011-11-15 20:03:00.000000000 -0500
-@@ -127,7 +127,7 @@ struct rds_ib_connection {
+diff -urNp linux-3.1.1/net/rds/ib.h linux-3.1.1/net/rds/ib.h
+--- linux-3.1.1/net/rds/ib.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/ib.h	2011-11-16 18:39:08.000000000 -0500
+@@ -128,7 +128,7 @@ struct rds_ib_connection {
  	/* sending acks */
  	unsigned long		i_ack_flags;
  #ifdef KERNEL_HAS_ATOMIC64
@@ -74355,9 +74162,9 @@ diff -urNp linux-3.0.9/net/rds/ib.h linux-3.0.9/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.9/net/rds/ib_recv.c linux-3.0.9/net/rds/ib_recv.c
---- linux-3.0.9/net/rds/ib_recv.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/ib_recv.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rds/ib_recv.c linux-3.1.1/net/rds/ib_recv.c
+--- linux-3.1.1/net/rds/ib_recv.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/ib_recv.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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)
@@ -74376,10 +74183,10 @@ diff -urNp linux-3.0.9/net/rds/ib_recv.c linux-3.0.9/net/rds/ib_recv.c
  }
  #endif
  
-diff -urNp linux-3.0.9/net/rds/iw_cm.c linux-3.0.9/net/rds/iw_cm.c
---- linux-3.0.9/net/rds/iw_cm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/iw_cm.c	2011-11-15 20:03:00.000000000 -0500
-@@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_con
+diff -urNp linux-3.1.1/net/rds/iw_cm.c linux-3.1.1/net/rds/iw_cm.c
+--- linux-3.1.1/net/rds/iw_cm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/iw_cm.c	2011-11-16 18:39:08.000000000 -0500
+@@ -663,7 +663,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
@@ -74388,10 +74195,10 @@ diff -urNp linux-3.0.9/net/rds/iw_cm.c linux-3.0.9/net/rds/iw_cm.c
  #else
  	ic->i_ack_next = 0;
  #endif
-diff -urNp linux-3.0.9/net/rds/iw.h linux-3.0.9/net/rds/iw.h
---- linux-3.0.9/net/rds/iw.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/iw.h	2011-11-15 20:03:00.000000000 -0500
-@@ -133,7 +133,7 @@ struct rds_iw_connection {
+diff -urNp linux-3.1.1/net/rds/iw.h linux-3.1.1/net/rds/iw.h
+--- linux-3.1.1/net/rds/iw.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/iw.h	2011-11-16 18:39:08.000000000 -0500
+@@ -134,7 +134,7 @@ struct rds_iw_connection {
  	/* sending acks */
  	unsigned long		i_ack_flags;
  #ifdef KERNEL_HAS_ATOMIC64
@@ -74400,10 +74207,10 @@ diff -urNp linux-3.0.9/net/rds/iw.h linux-3.0.9/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.9/net/rds/iw_rdma.c linux-3.0.9/net/rds/iw_rdma.c
---- linux-3.0.9/net/rds/iw_rdma.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/iw_rdma.c	2011-11-15 20:03:00.000000000 -0500
-@@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
+diff -urNp linux-3.1.1/net/rds/iw_rdma.c linux-3.1.1/net/rds/iw_rdma.c
+--- linux-3.1.1/net/rds/iw_rdma.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/iw_rdma.c	2011-11-16 18:40:44.000000000 -0500
+@@ -184,6 +184,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
  	struct rdma_cm_id *pcm_id;
  	int rc;
  
@@ -74412,9 +74219,9 @@ diff -urNp linux-3.0.9/net/rds/iw_rdma.c linux-3.0.9/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.9/net/rds/iw_recv.c linux-3.0.9/net/rds/iw_recv.c
---- linux-3.0.9/net/rds/iw_recv.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/iw_recv.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rds/iw_recv.c linux-3.1.1/net/rds/iw_recv.c
+--- linux-3.1.1/net/rds/iw_recv.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/iw_recv.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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)
@@ -74433,9 +74240,9 @@ diff -urNp linux-3.0.9/net/rds/iw_recv.c linux-3.0.9/net/rds/iw_recv.c
  }
  #endif
  
-diff -urNp linux-3.0.9/net/rds/tcp.c linux-3.0.9/net/rds/tcp.c
---- linux-3.0.9/net/rds/tcp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/tcp.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rds/tcp.c linux-3.1.1/net/rds/tcp.c
+--- linux-3.1.1/net/rds/tcp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/tcp.c	2011-11-16 18:39:08.000000000 -0500
 @@ -58,7 +58,7 @@ void rds_tcp_nonagle(struct socket *sock
  	int val = 1;
  
@@ -74445,9 +74252,9 @@ diff -urNp linux-3.0.9/net/rds/tcp.c linux-3.0.9/net/rds/tcp.c
  			      sizeof(val));
  	set_fs(oldfs);
  }
-diff -urNp linux-3.0.9/net/rds/tcp_send.c linux-3.0.9/net/rds/tcp_send.c
---- linux-3.0.9/net/rds/tcp_send.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/tcp_send.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rds/tcp_send.c linux-3.1.1/net/rds/tcp_send.c
+--- linux-3.1.1/net/rds/tcp_send.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/tcp_send.c	2011-11-16 18:39:08.000000000 -0500
 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *
  
  	oldfs = get_fs();
@@ -74457,9 +74264,9 @@ diff -urNp linux-3.0.9/net/rds/tcp_send.c linux-3.0.9/net/rds/tcp_send.c
  			      sizeof(val));
  	set_fs(oldfs);
  }
-diff -urNp linux-3.0.9/net/rxrpc/af_rxrpc.c linux-3.0.9/net/rxrpc/af_rxrpc.c
---- linux-3.0.9/net/rxrpc/af_rxrpc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/af_rxrpc.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/af_rxrpc.c linux-3.1.1/net/rxrpc/af_rxrpc.c
+--- linux-3.1.1/net/rxrpc/af_rxrpc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/af_rxrpc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_
  __be32 rxrpc_epoch;
  
@@ -74469,9 +74276,9 @@ diff -urNp linux-3.0.9/net/rxrpc/af_rxrpc.c linux-3.0.9/net/rxrpc/af_rxrpc.c
  
  /* count of skbs currently in use */
  atomic_t rxrpc_n_skbs;
-diff -urNp linux-3.0.9/net/rxrpc/ar-ack.c linux-3.0.9/net/rxrpc/ar-ack.c
---- linux-3.0.9/net/rxrpc/ar-ack.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-ack.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/ar-ack.c linux-3.1.1/net/rxrpc/ar-ack.c
+--- linux-3.1.1/net/rxrpc/ar-ack.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-ack.c	2011-11-16 18:40:44.000000000 -0500
 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca
  
  	_enter("{%d,%d,%d,%d},",
@@ -74544,9 +74351,9 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-ack.c linux-3.0.9/net/rxrpc/ar-ack.c
  	_proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
  send_message_2:
  
-diff -urNp linux-3.0.9/net/rxrpc/ar-call.c linux-3.0.9/net/rxrpc/ar-call.c
---- linux-3.0.9/net/rxrpc/ar-call.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-call.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/ar-call.c linux-3.1.1/net/rxrpc/ar-call.c
+--- linux-3.1.1/net/rxrpc/ar-call.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-call.c	2011-11-16 18:39:08.000000000 -0500
 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
  	spin_lock_init(&call->lock);
  	rwlock_init(&call->state_lock);
@@ -74556,9 +74363,9 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-call.c linux-3.0.9/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.9/net/rxrpc/ar-connection.c linux-3.0.9/net/rxrpc/ar-connection.c
---- linux-3.0.9/net/rxrpc/ar-connection.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-connection.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/ar-connection.c linux-3.1.1/net/rxrpc/ar-connection.c
+--- linux-3.1.1/net/rxrpc/ar-connection.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-connection.c	2011-11-16 18:39:08.000000000 -0500
 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al
  		rwlock_init(&conn->lock);
  		spin_lock_init(&conn->state_lock);
@@ -74568,9 +74375,9 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-connection.c linux-3.0.9/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.9/net/rxrpc/ar-connevent.c linux-3.0.9/net/rxrpc/ar-connevent.c
---- linux-3.0.9/net/rxrpc/ar-connevent.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-connevent.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/ar-connevent.c linux-3.1.1/net/rxrpc/ar-connevent.c
+--- linux-3.1.1/net/rxrpc/ar-connevent.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-connevent.c	2011-11-16 18:39:08.000000000 -0500
 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
  
  	len = iov[0].iov_len + iov[1].iov_len;
@@ -74580,9 +74387,9 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-connevent.c linux-3.0.9/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.9/net/rxrpc/ar-input.c linux-3.0.9/net/rxrpc/ar-input.c
---- linux-3.0.9/net/rxrpc/ar-input.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-input.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/ar-input.c linux-3.1.1/net/rxrpc/ar-input.c
+--- linux-3.1.1/net/rxrpc/ar-input.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-input.c	2011-11-16 18:39:08.000000000 -0500
 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx
  	/* track the latest serial number on this connection for ACK packet
  	 * information */
@@ -74595,9 +74402,9 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-input.c linux-3.0.9/net/rxrpc/ar-input.c
  					   serial);
  
  	/* request ACK generation for any ACK or DATA packet that requests
-diff -urNp linux-3.0.9/net/rxrpc/ar-internal.h linux-3.0.9/net/rxrpc/ar-internal.h
---- linux-3.0.9/net/rxrpc/ar-internal.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-internal.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/ar-internal.h linux-3.1.1/net/rxrpc/ar-internal.h
+--- linux-3.1.1/net/rxrpc/ar-internal.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-internal.h	2011-11-16 18:39:08.000000000 -0500
 @@ -272,8 +272,8 @@ struct rxrpc_connection {
  	int			error;		/* error code for local abort */
  	int			debug_id;	/* debug ID for printks */
@@ -74627,9 +74434,9 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-internal.h linux-3.0.9/net/rxrpc/ar-internal
  extern struct workqueue_struct *rxrpc_workqueue;
  
  /*
-diff -urNp linux-3.0.9/net/rxrpc/ar-local.c linux-3.0.9/net/rxrpc/ar-local.c
---- linux-3.0.9/net/rxrpc/ar-local.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-local.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/ar-local.c linux-3.1.1/net/rxrpc/ar-local.c
+--- linux-3.1.1/net/rxrpc/ar-local.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-local.c	2011-11-16 18:39:08.000000000 -0500
 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
  		spin_lock_init(&local->lock);
  		rwlock_init(&local->services_lock);
@@ -74639,9 +74446,9 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-local.c linux-3.0.9/net/rxrpc/ar-local.c
  		memcpy(&local->srx, srx, sizeof(*srx));
  	}
  
-diff -urNp linux-3.0.9/net/rxrpc/ar-output.c linux-3.0.9/net/rxrpc/ar-output.c
---- linux-3.0.9/net/rxrpc/ar-output.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-output.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/ar-output.c linux-3.1.1/net/rxrpc/ar-output.c
+--- linux-3.1.1/net/rxrpc/ar-output.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-output.c	2011-11-16 18:39:08.000000000 -0500
 @@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb 
  			sp->hdr.cid = call->cid;
  			sp->hdr.callNumber = call->call_id;
@@ -74654,9 +74461,9 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-output.c linux-3.0.9/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.9/net/rxrpc/ar-peer.c linux-3.0.9/net/rxrpc/ar-peer.c
---- linux-3.0.9/net/rxrpc/ar-peer.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-peer.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/ar-peer.c linux-3.1.1/net/rxrpc/ar-peer.c
+--- linux-3.1.1/net/rxrpc/ar-peer.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-peer.c	2011-11-16 18:39:08.000000000 -0500
 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
  		INIT_LIST_HEAD(&peer->error_targets);
  		spin_lock_init(&peer->lock);
@@ -74666,9 +74473,9 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-peer.c linux-3.0.9/net/rxrpc/ar-peer.c
  		memcpy(&peer->srx, srx, sizeof(*srx));
  
  		rxrpc_assess_MTU_size(peer);
-diff -urNp linux-3.0.9/net/rxrpc/ar-proc.c linux-3.0.9/net/rxrpc/ar-proc.c
---- linux-3.0.9/net/rxrpc/ar-proc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-proc.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/ar-proc.c linux-3.1.1/net/rxrpc/ar-proc.c
+--- linux-3.1.1/net/rxrpc/ar-proc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-proc.c	2011-11-16 18:39:08.000000000 -0500
 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
  		   atomic_read(&conn->usage),
  		   rxrpc_conn_states[conn->state],
@@ -74680,9 +74487,9 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-proc.c linux-3.0.9/net/rxrpc/ar-proc.c
  
  	return 0;
  }
-diff -urNp linux-3.0.9/net/rxrpc/ar-transport.c linux-3.0.9/net/rxrpc/ar-transport.c
---- linux-3.0.9/net/rxrpc/ar-transport.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-transport.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/ar-transport.c linux-3.1.1/net/rxrpc/ar-transport.c
+--- linux-3.1.1/net/rxrpc/ar-transport.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-transport.c	2011-11-16 18:39:08.000000000 -0500
 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all
  		spin_lock_init(&trans->client_lock);
  		rwlock_init(&trans->conn_lock);
@@ -74692,9 +74499,9 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-transport.c linux-3.0.9/net/rxrpc/ar-transpo
  
  		if (peer->srx.transport.family == AF_INET) {
  			switch (peer->srx.transport_type) {
-diff -urNp linux-3.0.9/net/rxrpc/rxkad.c linux-3.0.9/net/rxrpc/rxkad.c
---- linux-3.0.9/net/rxrpc/rxkad.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/rxkad.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/rxrpc/rxkad.c linux-3.1.1/net/rxrpc/rxkad.c
+--- linux-3.1.1/net/rxrpc/rxkad.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/rxkad.c	2011-11-16 18:40:44.000000000 -0500
 @@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c
  	u16 check;
  	int nsg;
@@ -74731,9 +74538,9 @@ diff -urNp linux-3.0.9/net/rxrpc/rxkad.c linux-3.0.9/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.9/net/sctp/proc.c linux-3.0.9/net/sctp/proc.c
---- linux-3.0.9/net/sctp/proc.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sctp/proc.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/sctp/proc.c linux-3.1.1/net/sctp/proc.c
+--- linux-3.1.1/net/sctp/proc.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sctp/proc.c	2011-11-16 18:40:44.000000000 -0500
 @@ -318,7 +318,8 @@ static int sctp_assocs_seq_show(struct s
  		seq_printf(seq,
  			   "%8pK %8pK %-3d %-3d %-2d %-4d "
@@ -74744,10 +74551,10 @@ diff -urNp linux-3.0.9/net/sctp/proc.c linux-3.0.9/net/sctp/proc.c
  			   assoc->state, hash,
  			   assoc->assoc_id,
  			   assoc->sndbuf_used,
-diff -urNp linux-3.0.9/net/sctp/socket.c linux-3.0.9/net/sctp/socket.c
---- linux-3.0.9/net/sctp/socket.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sctp/socket.c	2011-11-15 20:03:00.000000000 -0500
-@@ -4452,7 +4452,7 @@ static int sctp_getsockopt_peer_addrs(st
+diff -urNp linux-3.1.1/net/sctp/socket.c linux-3.1.1/net/sctp/socket.c
+--- linux-3.1.1/net/sctp/socket.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sctp/socket.c	2011-11-16 18:39:08.000000000 -0500
+@@ -4575,7 +4575,7 @@ static int sctp_getsockopt_peer_addrs(st
  		addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
  		if (space_left < addrlen)
  			return -ENOMEM;
@@ -74756,9 +74563,9 @@ diff -urNp linux-3.0.9/net/sctp/socket.c linux-3.0.9/net/sctp/socket.c
  			return -EFAULT;
  		to += addrlen;
  		cnt++;
-diff -urNp linux-3.0.9/net/socket.c linux-3.0.9/net/socket.c
---- linux-3.0.9/net/socket.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/socket.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/socket.c linux-3.1.1/net/socket.c
+--- linux-3.1.1/net/socket.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/socket.c	2011-11-16 18:40:44.000000000 -0500
 @@ -88,6 +88,7 @@
  #include <linux/nsproxy.h>
  #include <linux/magic.h>
@@ -75026,10 +74833,10 @@ diff -urNp linux-3.0.9/net/socket.c linux-3.0.9/net/socket.c
  
  	set_fs(KERNEL_DS);
  	if (level == SOL_SOCKET)
-diff -urNp linux-3.0.9/net/sunrpc/sched.c linux-3.0.9/net/sunrpc/sched.c
---- linux-3.0.9/net/sunrpc/sched.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sunrpc/sched.c	2011-11-15 20:03:00.000000000 -0500
-@@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w
+diff -urNp linux-3.1.1/net/sunrpc/sched.c linux-3.1.1/net/sunrpc/sched.c
+--- linux-3.1.1/net/sunrpc/sched.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sunrpc/sched.c	2011-11-16 18:39:08.000000000 -0500
+@@ -238,9 +238,9 @@ static int rpc_wait_bit_killable(void *w
  #ifdef RPC_DEBUG
  static void rpc_task_set_debuginfo(struct rpc_task *task)
  {
@@ -75041,10 +74848,10 @@ diff -urNp linux-3.0.9/net/sunrpc/sched.c linux-3.0.9/net/sunrpc/sched.c
  }
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-3.0.9/net/sunrpc/svcsock.c linux-3.0.9/net/sunrpc/svcsock.c
---- linux-3.0.9/net/sunrpc/svcsock.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sunrpc/svcsock.c	2011-11-15 20:03:00.000000000 -0500
-@@ -392,7 +392,7 @@ static int svc_partial_recvfrom(struct s
+diff -urNp linux-3.1.1/net/sunrpc/svcsock.c linux-3.1.1/net/sunrpc/svcsock.c
+--- linux-3.1.1/net/sunrpc/svcsock.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sunrpc/svcsock.c	2011-11-16 18:39:08.000000000 -0500
+@@ -394,7 +394,7 @@ static int svc_partial_recvfrom(struct s
  				int buflen, unsigned int base)
  {
  	size_t save_iovlen;
@@ -75053,9 +74860,9 @@ diff -urNp linux-3.0.9/net/sunrpc/svcsock.c linux-3.0.9/net/sunrpc/svcsock.c
  	unsigned int i;
  	int ret;
  
-diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma.c linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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;
@@ -75163,9 +74970,9 @@ diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.9/net/sunrpc/xpr
  		.mode		= 0644,
  		.proc_handler	= read_reset_stat,
  	},
-diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
---- linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+--- linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-11-16 18:39:08.000000000 -0500
 @@ -499,7 +499,7 @@ next_sge:
  			svc_rdma_put_context(ctxt, 0);
  			goto out;
@@ -75193,9 +75000,9 @@ diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.9/net/s
  
  	/* Build up the XDR from the receive buffers. */
  	rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
-diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c
---- linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+--- linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-11-16 18:39:08.000000000 -0500
 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm
  	write_wr.wr.rdma.remote_addr = to;
  
@@ -75205,10 +75012,10 @@ diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.9/net/sun
  	if (svc_rdma_send(xprt, &write_wr))
  		goto err;
  	return 0;
-diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c
---- linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-11-15 20:03:00.000000000 -0500
-@@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd
+diff -urNp linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_transport.c
+--- linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-11-16 18:39:08.000000000 -0500
+@@ -299,7 +299,7 @@ static void rq_cq_reap(struct svcxprt_rd
  		return;
  
  	ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
@@ -75217,7 +75024,7 @@ diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.9/net/
  
  	while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
  		ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
-@@ -320,7 +320,7 @@ static void rq_cq_reap(struct svcxprt_rd
+@@ -321,7 +321,7 @@ static void rq_cq_reap(struct svcxprt_rd
  	}
  
  	if (ctxt)
@@ -75226,7 +75033,7 @@ diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.9/net/
  
  	set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
  	/*
-@@ -392,7 +392,7 @@ static void sq_cq_reap(struct svcxprt_rd
+@@ -393,7 +393,7 @@ static void sq_cq_reap(struct svcxprt_rd
  		return;
  
  	ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
@@ -75235,7 +75042,7 @@ diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.9/net/
  	while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
  		if (wc.status != IB_WC_SUCCESS)
  			/* Close the transport */
-@@ -410,7 +410,7 @@ static void sq_cq_reap(struct svcxprt_rd
+@@ -411,7 +411,7 @@ static void sq_cq_reap(struct svcxprt_rd
  	}
  
  	if (ctxt)
@@ -75244,7 +75051,7 @@ diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.9/net/
  }
  
  static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
-@@ -1272,7 +1272,7 @@ int svc_rdma_send(struct svcxprt_rdma *x
+@@ -1273,7 +1273,7 @@ int svc_rdma_send(struct svcxprt_rdma *x
  		spin_lock_bh(&xprt->sc_lock);
  		if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
  			spin_unlock_bh(&xprt->sc_lock);
@@ -75253,9 +75060,9 @@ diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.9/net/
  
  			/* See if we can opportunistically reap SQ WR to make room */
  			sq_cq_reap(xprt);
-diff -urNp linux-3.0.9/net/sysctl_net.c linux-3.0.9/net/sysctl_net.c
---- linux-3.0.9/net/sysctl_net.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sysctl_net.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/sysctl_net.c linux-3.1.1/net/sysctl_net.c
+--- linux-3.1.1/net/sysctl_net.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sysctl_net.c	2011-11-16 18:40:44.000000000 -0500
 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
  			       struct ctl_table *table)
  {
@@ -75265,9 +75072,9 @@ diff -urNp linux-3.0.9/net/sysctl_net.c linux-3.0.9/net/sysctl_net.c
  		int mode = (table->mode >> 6) & 7;
  		return (mode << 6) | (mode << 3) | mode;
  	}
-diff -urNp linux-3.0.9/net/tipc/link.c linux-3.0.9/net/tipc/link.c
---- linux-3.0.9/net/tipc/link.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/tipc/link.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/tipc/link.c linux-3.1.1/net/tipc/link.c
+--- linux-3.1.1/net/tipc/link.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/tipc/link.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1170,7 +1170,7 @@ static int link_send_sections_long(struc
  	struct tipc_msg fragm_hdr;
  	struct sk_buff *buf, *buf_chain, *prev;
@@ -75295,10 +75102,10 @@ diff -urNp linux-3.0.9/net/tipc/link.c linux-3.0.9/net/tipc/link.c
  		sect_crs += sz;
  		sect_rest -= sz;
  		fragm_crs += sz;
-diff -urNp linux-3.0.9/net/tipc/msg.c linux-3.0.9/net/tipc/msg.c
---- linux-3.0.9/net/tipc/msg.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/tipc/msg.c	2011-11-15 20:03:00.000000000 -0500
-@@ -101,7 +101,7 @@ int tipc_msg_build(struct tipc_msg *hdr,
+diff -urNp linux-3.1.1/net/tipc/msg.c linux-3.1.1/net/tipc/msg.c
+--- linux-3.1.1/net/tipc/msg.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/tipc/msg.c	2011-11-16 18:39:08.000000000 -0500
+@@ -99,7 +99,7 @@ int tipc_msg_build(struct tipc_msg *hdr,
  					      msg_sect[cnt].iov_len);
  		else
  			skb_copy_to_linear_data_offset(*buf, pos,
@@ -75307,9 +75114,9 @@ diff -urNp linux-3.0.9/net/tipc/msg.c linux-3.0.9/net/tipc/msg.c
  						       msg_sect[cnt].iov_len);
  		pos += msg_sect[cnt].iov_len;
  	}
-diff -urNp linux-3.0.9/net/tipc/subscr.c linux-3.0.9/net/tipc/subscr.c
---- linux-3.0.9/net/tipc/subscr.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/tipc/subscr.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/tipc/subscr.c linux-3.1.1/net/tipc/subscr.c
+--- linux-3.1.1/net/tipc/subscr.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/tipc/subscr.c	2011-11-16 18:39:08.000000000 -0500
 @@ -101,7 +101,7 @@ static void subscr_send_event(struct sub
  {
  	struct iovec msg_sect;
@@ -75319,9 +75126,9 @@ diff -urNp linux-3.0.9/net/tipc/subscr.c linux-3.0.9/net/tipc/subscr.c
  	msg_sect.iov_len = sizeof(struct tipc_event);
  
  	sub->evt.event = htohl(event, sub->swap);
-diff -urNp linux-3.0.9/net/unix/af_unix.c linux-3.0.9/net/unix/af_unix.c
---- linux-3.0.9/net/unix/af_unix.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/unix/af_unix.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/unix/af_unix.c linux-3.1.1/net/unix/af_unix.c
+--- linux-3.1.1/net/unix/af_unix.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/unix/af_unix.c	2011-11-16 19:17:17.000000000 -0500
 @@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru
  		err = -ECONNREFUSED;
  		if (!S_ISSOCK(inode->i_mode))
@@ -75349,28 +75156,28 @@ diff -urNp linux-3.0.9/net/unix/af_unix.c linux-3.0.9/net/unix/af_unix.c
  			if (dentry)
  				touch_atime(unix_sk(u)->mnt, dentry);
  		} else
-@@ -872,11 +885,18 @@ static int unix_bind(struct socket *sock
- 		err = security_path_mknod(&nd.path, dentry, mode, 0);
+@@ -869,11 +882,18 @@ static int unix_bind(struct socket *sock
+ 		err = security_path_mknod(&path, dentry, mode, 0);
  		if (err)
  			goto out_mknod_drop_write;
-+		if (!gr_acl_handle_mknod(dentry, nd.path.dentry, nd.path.mnt, mode)) {
++		if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
 +			err = -EACCES;
 +			goto out_mknod_drop_write;
 +		}
- 		err = vfs_mknod(nd.path.dentry->d_inode, dentry, mode, 0);
+ 		err = vfs_mknod(path.dentry->d_inode, dentry, mode, 0);
  out_mknod_drop_write:
- 		mnt_drop_write(nd.path.mnt);
+ 		mnt_drop_write(path.mnt);
  		if (err)
  			goto out_mknod_dput;
 +
-+		gr_handle_create(dentry, nd.path.mnt);
++		gr_handle_create(dentry, path.mnt);
 +
- 		mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
- 		dput(nd.path.dentry);
- 		nd.path.dentry = dentry;
-diff -urNp linux-3.0.9/net/wireless/core.h linux-3.0.9/net/wireless/core.h
---- linux-3.0.9/net/wireless/core.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/wireless/core.h	2011-11-15 20:03:00.000000000 -0500
+ 		mutex_unlock(&path.dentry->d_inode->i_mutex);
+ 		dput(path.dentry);
+ 		path.dentry = dentry;
+diff -urNp linux-3.1.1/net/wireless/core.h linux-3.1.1/net/wireless/core.h
+--- linux-3.1.1/net/wireless/core.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/wireless/core.h	2011-11-16 18:39:08.000000000 -0500
 @@ -27,7 +27,7 @@ struct cfg80211_registered_device {
  	struct mutex mtx;
  
@@ -75380,9 +75187,9 @@ diff -urNp linux-3.0.9/net/wireless/core.h linux-3.0.9/net/wireless/core.h
  	struct rfkill *rfkill;
  	struct work_struct rfkill_sync;
  
-diff -urNp linux-3.0.9/net/wireless/wext-core.c linux-3.0.9/net/wireless/wext-core.c
---- linux-3.0.9/net/wireless/wext-core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/wireless/wext-core.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/wireless/wext-core.c linux-3.1.1/net/wireless/wext-core.c
+--- linux-3.1.1/net/wireless/wext-core.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/wireless/wext-core.c	2011-11-16 18:39:08.000000000 -0500
 @@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
  		 */
  
@@ -75416,9 +75223,9 @@ diff -urNp linux-3.0.9/net/wireless/wext-core.c linux-3.0.9/net/wireless/wext-co
  	err = handler(dev, info, (union iwreq_data *) iwp, extra);
  
  	iwp->length += essid_compat;
-diff -urNp linux-3.0.9/net/xfrm/xfrm_policy.c linux-3.0.9/net/xfrm/xfrm_policy.c
---- linux-3.0.9/net/xfrm/xfrm_policy.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/xfrm/xfrm_policy.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/xfrm/xfrm_policy.c linux-3.1.1/net/xfrm/xfrm_policy.c
+--- linux-3.1.1/net/xfrm/xfrm_policy.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/xfrm/xfrm_policy.c	2011-11-16 18:39:08.000000000 -0500
 @@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm
  {
  	policy->walk.dead = 1;
@@ -75437,7 +75244,7 @@ diff -urNp linux-3.0.9/net/xfrm/xfrm_policy.c linux-3.0.9/net/xfrm/xfrm_policy.c
  	if (delpol)
  		__xfrm_policy_unlink(delpol, dir);
  	policy->index = delpol ? delpol->index : xfrm_gen_index(net, dir);
-@@ -1528,7 +1528,7 @@ free_dst:
+@@ -1530,7 +1530,7 @@ free_dst:
  	goto out;
  }
  
@@ -75446,7 +75253,7 @@ diff -urNp linux-3.0.9/net/xfrm/xfrm_policy.c linux-3.0.9/net/xfrm/xfrm_policy.c
  xfrm_dst_alloc_copy(void **target, const void *src, int size)
  {
  	if (!*target) {
-@@ -1540,7 +1540,7 @@ xfrm_dst_alloc_copy(void **target, const
+@@ -1542,7 +1542,7 @@ xfrm_dst_alloc_copy(void **target, const
  	return 0;
  }
  
@@ -75455,7 +75262,7 @@ diff -urNp linux-3.0.9/net/xfrm/xfrm_policy.c linux-3.0.9/net/xfrm/xfrm_policy.c
  xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1552,7 +1552,7 @@ xfrm_dst_update_parent(struct dst_entry 
+@@ -1554,7 +1554,7 @@ xfrm_dst_update_parent(struct dst_entry 
  #endif
  }
  
@@ -75464,7 +75271,7 @@ diff -urNp linux-3.0.9/net/xfrm/xfrm_policy.c linux-3.0.9/net/xfrm/xfrm_policy.c
  xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1646,7 +1646,7 @@ xfrm_resolve_and_create_bundle(struct xf
+@@ -1648,7 +1648,7 @@ xfrm_resolve_and_create_bundle(struct xf
  
  	xdst->num_pols = num_pols;
  	memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
@@ -75473,7 +75280,7 @@ diff -urNp linux-3.0.9/net/xfrm/xfrm_policy.c linux-3.0.9/net/xfrm/xfrm_policy.c
  
  	return xdst;
  }
-@@ -2333,7 +2333,7 @@ static int xfrm_bundle_ok(struct xfrm_ds
+@@ -2335,7 +2335,7 @@ static int xfrm_bundle_ok(struct xfrm_ds
  		if (xdst->xfrm_genid != dst->xfrm->genid)
  			return 0;
  		if (xdst->num_pols > 0 &&
@@ -75482,7 +75289,7 @@ diff -urNp linux-3.0.9/net/xfrm/xfrm_policy.c linux-3.0.9/net/xfrm/xfrm_policy.c
  			return 0;
  
  		mtu = dst_mtu(dst->child);
-@@ -2861,7 +2861,7 @@ static int xfrm_policy_migrate(struct xf
+@@ -2870,7 +2870,7 @@ static int xfrm_policy_migrate(struct xf
  			       sizeof(pol->xfrm_vec[i].saddr));
  			pol->xfrm_vec[i].encap_family = mp->new_family;
  			/* flush bundles */
@@ -75491,9 +75298,9 @@ diff -urNp linux-3.0.9/net/xfrm/xfrm_policy.c linux-3.0.9/net/xfrm/xfrm_policy.c
  		}
  	}
  
-diff -urNp linux-3.0.9/net/xfrm/xfrm_user.c linux-3.0.9/net/xfrm/xfrm_user.c
---- linux-3.0.9/net/xfrm/xfrm_user.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/xfrm/xfrm_user.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/net/xfrm/xfrm_user.c linux-3.1.1/net/xfrm/xfrm_user.c
+--- linux-3.1.1/net/xfrm/xfrm_user.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/xfrm/xfrm_user.c	2011-11-16 18:40:44.000000000 -0500
 @@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm
  	struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
  	int i;
@@ -75512,9 +75319,9 @@ diff -urNp linux-3.0.9/net/xfrm/xfrm_user.c linux-3.0.9/net/xfrm/xfrm_user.c
  	if (attrs[XFRMA_MIGRATE] == NULL)
  		return -EINVAL;
  
-diff -urNp linux-3.0.9/scripts/basic/fixdep.c linux-3.0.9/scripts/basic/fixdep.c
---- linux-3.0.9/scripts/basic/fixdep.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/basic/fixdep.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/scripts/basic/fixdep.c linux-3.1.1/scripts/basic/fixdep.c
+--- linux-3.1.1/scripts/basic/fixdep.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/basic/fixdep.c	2011-11-16 18:39:08.000000000 -0500
 @@ -161,7 +161,7 @@ static unsigned int strhash(const char *
  /*
   * Lookup a value in the configuration string.
@@ -75558,15 +75365,15 @@ diff -urNp linux-3.0.9/scripts/basic/fixdep.c linux-3.0.9/scripts/basic/fixdep.c
  
  	if (*p != INT_CONF) {
  		fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-3.0.9/scripts/gcc-plugin.sh linux-3.0.9/scripts/gcc-plugin.sh
---- linux-3.0.9/scripts/gcc-plugin.sh	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/scripts/gcc-plugin.sh	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/scripts/gcc-plugin.sh linux-3.1.1/scripts/gcc-plugin.sh
+--- linux-3.1.1/scripts/gcc-plugin.sh	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/scripts/gcc-plugin.sh	2011-11-16 18:39:08.000000000 -0500
 @@ -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.9/scripts/Makefile.build linux-3.0.9/scripts/Makefile.build
---- linux-3.0.9/scripts/Makefile.build	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/Makefile.build	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/scripts/Makefile.build linux-3.1.1/scripts/Makefile.build
+--- linux-3.1.1/scripts/Makefile.build	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/Makefile.build	2011-11-16 18:40:44.000000000 -0500
 @@ -109,7 +109,7 @@ endif
  endif
  
@@ -75576,9 +75383,9 @@ diff -urNp linux-3.0.9/scripts/Makefile.build linux-3.0.9/scripts/Makefile.build
  include scripts/Makefile.host
  endif
  
-diff -urNp linux-3.0.9/scripts/Makefile.clean linux-3.0.9/scripts/Makefile.clean
---- linux-3.0.9/scripts/Makefile.clean	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/Makefile.clean	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/scripts/Makefile.clean linux-3.1.1/scripts/Makefile.clean
+--- linux-3.1.1/scripts/Makefile.clean	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/Makefile.clean	2011-11-16 18:39:08.000000000 -0500
 @@ -43,7 +43,8 @@ subdir-ymn	:= $(addprefix $(obj)/,$(subd
  __clean-files	:= $(extra-y) $(always)                  \
  		   $(targets) $(clean-files)             \
@@ -75589,9 +75396,9 @@ diff -urNp linux-3.0.9/scripts/Makefile.clean linux-3.0.9/scripts/Makefile.clean
  
  __clean-files   := $(filter-out $(no-clean-files), $(__clean-files))
  
-diff -urNp linux-3.0.9/scripts/Makefile.host linux-3.0.9/scripts/Makefile.host
---- linux-3.0.9/scripts/Makefile.host	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/Makefile.host	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/scripts/Makefile.host linux-3.1.1/scripts/Makefile.host
+--- linux-3.1.1/scripts/Makefile.host	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/Makefile.host	2011-11-16 18:39:08.000000000 -0500
 @@ -31,6 +31,7 @@
  # Note: Shared libraries consisting of C++ files are not supported
  
@@ -75608,9 +75415,9 @@ diff -urNp linux-3.0.9/scripts/Makefile.host linux-3.0.9/scripts/Makefile.host
  # Remove .so files from "xxx-objs"
  host-cobjs	:= $(filter-out %.so,$(host-cobjs))
  
-diff -urNp linux-3.0.9/scripts/mod/file2alias.c linux-3.0.9/scripts/mod/file2alias.c
---- linux-3.0.9/scripts/mod/file2alias.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/mod/file2alias.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/scripts/mod/file2alias.c linux-3.1.1/scripts/mod/file2alias.c
+--- linux-3.1.1/scripts/mod/file2alias.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/mod/file2alias.c	2011-11-16 18:39:08.000000000 -0500
 @@ -72,7 +72,7 @@ static void device_id_check(const char *
  			    unsigned long size, unsigned long id_size,
  			    void *symval)
@@ -75674,10 +75481,10 @@ diff -urNp linux-3.0.9/scripts/mod/file2alias.c linux-3.0.9/scripts/mod/file2ali
  
  	sprintf(alias, "dmi*");
  
-diff -urNp linux-3.0.9/scripts/mod/modpost.c linux-3.0.9/scripts/mod/modpost.c
---- linux-3.0.9/scripts/mod/modpost.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/mod/modpost.c	2011-11-15 20:03:00.000000000 -0500
-@@ -892,6 +892,7 @@ enum mismatch {
+diff -urNp linux-3.1.1/scripts/mod/modpost.c linux-3.1.1/scripts/mod/modpost.c
+--- linux-3.1.1/scripts/mod/modpost.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/mod/modpost.c	2011-11-16 18:39:08.000000000 -0500
+@@ -919,6 +919,7 @@ enum mismatch {
  	ANY_INIT_TO_ANY_EXIT,
  	ANY_EXIT_TO_ANY_INIT,
  	EXPORT_TO_INIT_EXIT,
@@ -75685,7 +75492,7 @@ diff -urNp linux-3.0.9/scripts/mod/modpost.c linux-3.0.9/scripts/mod/modpost.c
  };
  
  struct sectioncheck {
-@@ -1000,6 +1001,12 @@ const struct sectioncheck sectioncheck[]
+@@ -1027,6 +1028,12 @@ const struct sectioncheck sectioncheck[]
  	.tosec   = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
  	.mismatch = EXPORT_TO_INIT_EXIT,
  	.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
@@ -75698,7 +75505,7 @@ diff -urNp linux-3.0.9/scripts/mod/modpost.c linux-3.0.9/scripts/mod/modpost.c
  }
  };
  
-@@ -1122,10 +1129,10 @@ static Elf_Sym *find_elf_symbol(struct e
+@@ -1149,10 +1156,10 @@ static Elf_Sym *find_elf_symbol(struct e
  			continue;
  		if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
  			continue;
@@ -75711,7 +75518,7 @@ diff -urNp linux-3.0.9/scripts/mod/modpost.c linux-3.0.9/scripts/mod/modpost.c
  		if (d < 0)
  			d = addr - sym->st_value;
  		if (d < distance) {
-@@ -1404,6 +1411,14 @@ static void report_sec_mismatch(const ch
+@@ -1431,6 +1438,14 @@ static void report_sec_mismatch(const ch
  		tosym, prl_to, prl_to, tosym);
  		free(prl_to);
  		break;
@@ -75726,7 +75533,7 @@ diff -urNp linux-3.0.9/scripts/mod/modpost.c linux-3.0.9/scripts/mod/modpost.c
  	}
  	fprintf(stderr, "\n");
  }
-@@ -1629,7 +1644,7 @@ static void section_rel(const char *modn
+@@ -1656,7 +1671,7 @@ static void section_rel(const char *modn
  static void check_sec_ref(struct module *mod, const char *modname,
                            struct elf_info *elf)
  {
@@ -75735,7 +75542,7 @@ diff -urNp linux-3.0.9/scripts/mod/modpost.c linux-3.0.9/scripts/mod/modpost.c
  	Elf_Shdr *sechdrs = elf->sechdrs;
  
  	/* Walk through all sections */
-@@ -1727,7 +1742,7 @@ void __attribute__((format(printf, 2, 3)
+@@ -1754,7 +1769,7 @@ void __attribute__((format(printf, 2, 3)
  	va_end(ap);
  }
  
@@ -75744,7 +75551,7 @@ diff -urNp linux-3.0.9/scripts/mod/modpost.c linux-3.0.9/scripts/mod/modpost.c
  {
  	if (buf->size - buf->pos < len) {
  		buf->size += len + SZ;
-@@ -1939,7 +1954,7 @@ static void write_if_changed(struct buff
+@@ -1966,7 +1981,7 @@ static void write_if_changed(struct buff
  	if (fstat(fileno(file), &st) < 0)
  		goto close_write;
  
@@ -75753,9 +75560,9 @@ diff -urNp linux-3.0.9/scripts/mod/modpost.c linux-3.0.9/scripts/mod/modpost.c
  		goto close_write;
  
  	tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-3.0.9/scripts/mod/modpost.h linux-3.0.9/scripts/mod/modpost.h
---- linux-3.0.9/scripts/mod/modpost.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/mod/modpost.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/scripts/mod/modpost.h linux-3.1.1/scripts/mod/modpost.h
+--- linux-3.1.1/scripts/mod/modpost.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/mod/modpost.h	2011-11-16 18:39:08.000000000 -0500
 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
  
  struct buffer {
@@ -75775,9 +75582,9 @@ diff -urNp linux-3.0.9/scripts/mod/modpost.h linux-3.0.9/scripts/mod/modpost.h
  
  struct module {
  	struct module *next;
-diff -urNp linux-3.0.9/scripts/mod/sumversion.c linux-3.0.9/scripts/mod/sumversion.c
---- linux-3.0.9/scripts/mod/sumversion.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/mod/sumversion.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/scripts/mod/sumversion.c linux-3.1.1/scripts/mod/sumversion.c
+--- linux-3.1.1/scripts/mod/sumversion.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/mod/sumversion.c	2011-11-16 18:39:08.000000000 -0500
 @@ -470,7 +470,7 @@ static void write_version(const char *fi
  		goto out;
  	}
@@ -75787,9 +75594,9 @@ diff -urNp linux-3.0.9/scripts/mod/sumversion.c linux-3.0.9/scripts/mod/sumversi
  		warn("writing sum in %s failed: %s\n",
  			filename, strerror(errno));
  		goto out;
-diff -urNp linux-3.0.9/scripts/pnmtologo.c linux-3.0.9/scripts/pnmtologo.c
---- linux-3.0.9/scripts/pnmtologo.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/pnmtologo.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/scripts/pnmtologo.c linux-3.1.1/scripts/pnmtologo.c
+--- linux-3.1.1/scripts/pnmtologo.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/pnmtologo.c	2011-11-16 18:39:08.000000000 -0500
 @@ -237,14 +237,14 @@ static void write_header(void)
      fprintf(out, " *  Linux logo %s\n", logoname);
      fputs(" */\n\n", out);
@@ -75816,9 +75623,9 @@ diff -urNp linux-3.0.9/scripts/pnmtologo.c linux-3.0.9/scripts/pnmtologo.c
  	    logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-3.0.9/security/apparmor/lsm.c linux-3.0.9/security/apparmor/lsm.c
---- linux-3.0.9/security/apparmor/lsm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/apparmor/lsm.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/apparmor/lsm.c linux-3.1.1/security/apparmor/lsm.c
+--- linux-3.1.1/security/apparmor/lsm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/apparmor/lsm.c	2011-11-16 18:40:44.000000000 -0500
 @@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc
  	return error;
  }
@@ -75828,9 +75635,9 @@ diff -urNp linux-3.0.9/security/apparmor/lsm.c linux-3.0.9/security/apparmor/lsm
  	.name =				"apparmor",
  
  	.ptrace_access_check =		apparmor_ptrace_access_check,
-diff -urNp linux-3.0.9/security/commoncap.c linux-3.0.9/security/commoncap.c
---- linux-3.0.9/security/commoncap.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/commoncap.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/commoncap.c linux-3.1.1/security/commoncap.c
+--- linux-3.1.1/security/commoncap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/commoncap.c	2011-11-16 18:40:44.000000000 -0500
 @@ -28,6 +28,7 @@
  #include <linux/prctl.h>
  #include <linux/securebits.h>
@@ -75858,9 +75665,9 @@ diff -urNp linux-3.0.9/security/commoncap.c linux-3.0.9/security/commoncap.c
  	if (cred->uid != 0) {
  		if (bprm->cap_effective)
  			return 1;
-diff -urNp linux-3.0.9/security/integrity/ima/ima_api.c linux-3.0.9/security/integrity/ima/ima_api.c
---- linux-3.0.9/security/integrity/ima/ima_api.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/integrity/ima/ima_api.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/integrity/ima/ima_api.c linux-3.1.1/security/integrity/ima/ima_api.c
+--- linux-3.1.1/security/integrity/ima/ima_api.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/integrity/ima/ima_api.c	2011-11-16 18:39:08.000000000 -0500
 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
  	int result;
  
@@ -75870,9 +75677,9 @@ diff -urNp linux-3.0.9/security/integrity/ima/ima_api.c linux-3.0.9/security/int
  
  	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
  	if (!entry) {
-diff -urNp linux-3.0.9/security/integrity/ima/ima_fs.c linux-3.0.9/security/integrity/ima/ima_fs.c
---- linux-3.0.9/security/integrity/ima/ima_fs.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/integrity/ima/ima_fs.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/integrity/ima/ima_fs.c linux-3.1.1/security/integrity/ima/ima_fs.c
+--- linux-3.1.1/security/integrity/ima/ima_fs.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/integrity/ima/ima_fs.c	2011-11-16 18:39:08.000000000 -0500
 @@ -28,12 +28,12 @@
  static int valid_policy = 1;
  #define TMPBUFLEN 12
@@ -75888,9 +75695,9 @@ diff -urNp linux-3.0.9/security/integrity/ima/ima_fs.c linux-3.0.9/security/inte
  	return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
  }
  
-diff -urNp linux-3.0.9/security/integrity/ima/ima.h linux-3.0.9/security/integrity/ima/ima.h
---- linux-3.0.9/security/integrity/ima/ima.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/integrity/ima/ima.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/integrity/ima/ima.h linux-3.1.1/security/integrity/ima/ima.h
+--- linux-3.1.1/security/integrity/ima/ima.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/integrity/ima/ima.h	2011-11-16 18:39:08.000000000 -0500
 @@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
  extern spinlock_t ima_queue_lock;
  
@@ -75902,9 +75709,9 @@ diff -urNp linux-3.0.9/security/integrity/ima/ima.h linux-3.0.9/security/integri
  	struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
  };
  extern struct ima_h_table ima_htable;
-diff -urNp linux-3.0.9/security/integrity/ima/ima_queue.c linux-3.0.9/security/integrity/ima/ima_queue.c
---- linux-3.0.9/security/integrity/ima/ima_queue.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/integrity/ima/ima_queue.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/integrity/ima/ima_queue.c linux-3.1.1/security/integrity/ima/ima_queue.c
+--- linux-3.1.1/security/integrity/ima/ima_queue.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/integrity/ima/ima_queue.c	2011-11-16 18:39:08.000000000 -0500
 @@ -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);
@@ -75914,9 +75721,9 @@ diff -urNp linux-3.0.9/security/integrity/ima/ima_queue.c linux-3.0.9/security/i
  	key = ima_hash_key(entry->digest);
  	hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
  	return 0;
-diff -urNp linux-3.0.9/security/Kconfig linux-3.0.9/security/Kconfig
---- linux-3.0.9/security/Kconfig	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/Kconfig	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/Kconfig linux-3.1.1/security/Kconfig
+--- linux-3.1.1/security/Kconfig	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/Kconfig	2011-11-16 18:40:44.000000000 -0500
 @@ -4,6 +4,558 @@
  
  menu "Security options"
@@ -76485,9 +76292,9 @@ diff -urNp linux-3.0.9/security/Kconfig linux-3.0.9/security/Kconfig
  	default 65536
  	help
  	  This is the portion of low virtual memory which should be protected
-diff -urNp linux-3.0.9/security/keys/compat.c linux-3.0.9/security/keys/compat.c
---- linux-3.0.9/security/keys/compat.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/keys/compat.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/keys/compat.c linux-3.1.1/security/keys/compat.c
+--- linux-3.1.1/security/keys/compat.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/keys/compat.c	2011-11-16 18:39:08.000000000 -0500
 @@ -44,7 +44,7 @@ long compat_keyctl_instantiate_key_iov(
  	if (ret == 0)
  		goto no_payload_free;
@@ -76497,9 +76304,9 @@ diff -urNp linux-3.0.9/security/keys/compat.c linux-3.0.9/security/keys/compat.c
  
  	if (iov != iovstack)
  		kfree(iov);
-diff -urNp linux-3.0.9/security/keys/keyctl.c linux-3.0.9/security/keys/keyctl.c
---- linux-3.0.9/security/keys/keyctl.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/keys/keyctl.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/keys/keyctl.c linux-3.1.1/security/keys/keyctl.c
+--- linux-3.1.1/security/keys/keyctl.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/keys/keyctl.c	2011-11-16 18:39:08.000000000 -0500
 @@ -921,7 +921,7 @@ static int keyctl_change_reqkey_auth(str
  /*
   * Copy the iovec data from userspace
@@ -76536,10 +76343,10 @@ diff -urNp linux-3.0.9/security/keys/keyctl.c linux-3.0.9/security/keys/keyctl.c
  
  	if (iov != iovstack)
  		kfree(iov);
-diff -urNp linux-3.0.9/security/keys/keyring.c linux-3.0.9/security/keys/keyring.c
---- linux-3.0.9/security/keys/keyring.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/keys/keyring.c	2011-11-15 20:03:00.000000000 -0500
-@@ -215,15 +215,15 @@ static long keyring_read(const struct ke
+diff -urNp linux-3.1.1/security/keys/keyring.c linux-3.1.1/security/keys/keyring.c
+--- linux-3.1.1/security/keys/keyring.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/keys/keyring.c	2011-11-16 18:39:08.000000000 -0500
+@@ -214,15 +214,15 @@ static long keyring_read(const struct ke
  			ret = -EFAULT;
  
  			for (loop = 0; loop < klist->nkeys; loop++) {
@@ -76558,9 +76365,9 @@ diff -urNp linux-3.0.9/security/keys/keyring.c linux-3.0.9/security/keys/keyring
  					goto error;
  
  				buflen -= tmp;
-diff -urNp linux-3.0.9/security/min_addr.c linux-3.0.9/security/min_addr.c
---- linux-3.0.9/security/min_addr.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/min_addr.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/min_addr.c linux-3.1.1/security/min_addr.c
+--- linux-3.1.1/security/min_addr.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/min_addr.c	2011-11-16 18:40:44.000000000 -0500
 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
   */
  static void update_mmap_min_addr(void)
@@ -76577,9 +76384,9 @@ diff -urNp linux-3.0.9/security/min_addr.c linux-3.0.9/security/min_addr.c
  }
  
  /*
-diff -urNp linux-3.0.9/security/security.c linux-3.0.9/security/security.c
---- linux-3.0.9/security/security.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/security.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/security.c linux-3.1.1/security/security.c
+--- linux-3.1.1/security/security.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/security.c	2011-11-16 18:40:44.000000000 -0500
 @@ -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);
@@ -76601,9 +76408,9 @@ diff -urNp linux-3.0.9/security/security.c linux-3.0.9/security/security.c
  }
  
  /* Save user chosen LSM */
-diff -urNp linux-3.0.9/security/selinux/hooks.c linux-3.0.9/security/selinux/hooks.c
---- linux-3.0.9/security/selinux/hooks.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/selinux/hooks.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/selinux/hooks.c linux-3.1.1/security/selinux/hooks.c
+--- linux-3.1.1/security/selinux/hooks.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/selinux/hooks.c	2011-11-16 18:40:44.000000000 -0500
 @@ -93,7 +93,6 @@
  #define NUM_SEL_MNT_OPTS 5
  
@@ -76612,7 +76419,7 @@ diff -urNp linux-3.0.9/security/selinux/hooks.c linux-3.0.9/security/selinux/hoo
  
  /* SECMARK reference count */
  atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
-@@ -5454,7 +5453,7 @@ static int selinux_key_getsecurity(struc
+@@ -5455,7 +5454,7 @@ static int selinux_key_getsecurity(struc
  
  #endif
  
@@ -76621,9 +76428,9 @@ diff -urNp linux-3.0.9/security/selinux/hooks.c linux-3.0.9/security/selinux/hoo
  	.name =				"selinux",
  
  	.ptrace_access_check =		selinux_ptrace_access_check,
-diff -urNp linux-3.0.9/security/selinux/include/xfrm.h linux-3.0.9/security/selinux/include/xfrm.h
---- linux-3.0.9/security/selinux/include/xfrm.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/selinux/include/xfrm.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/selinux/include/xfrm.h linux-3.1.1/security/selinux/include/xfrm.h
+--- linux-3.1.1/security/selinux/include/xfrm.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/selinux/include/xfrm.h	2011-11-16 18:39:08.000000000 -0500
 @@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s
  
  static inline void selinux_xfrm_notify_policyload(void)
@@ -76633,9 +76440,9 @@ diff -urNp linux-3.0.9/security/selinux/include/xfrm.h linux-3.0.9/security/seli
  }
  #else
  static inline int selinux_xfrm_enabled(void)
-diff -urNp linux-3.0.9/security/selinux/ss/services.c linux-3.0.9/security/selinux/ss/services.c
---- linux-3.0.9/security/selinux/ss/services.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/selinux/ss/services.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/security/selinux/ss/services.c linux-3.1.1/security/selinux/ss/services.c
+--- linux-3.1.1/security/selinux/ss/services.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/selinux/ss/services.c	2011-11-16 18:40:44.000000000 -0500
 @@ -1814,6 +1814,8 @@ int security_load_policy(void *data, siz
  	int rc = 0;
  	struct policy_file file = { data, len }, *fp = &file;
@@ -76645,10 +76452,10 @@ diff -urNp linux-3.0.9/security/selinux/ss/services.c linux-3.0.9/security/selin
  	if (!ss_initialized) {
  		avtab_cache_init();
  		rc = policydb_read(&policydb, fp);
-diff -urNp linux-3.0.9/security/smack/smack_lsm.c linux-3.0.9/security/smack/smack_lsm.c
---- linux-3.0.9/security/smack/smack_lsm.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/smack/smack_lsm.c	2011-11-15 20:03:00.000000000 -0500
-@@ -3392,7 +3392,7 @@ static int smack_inode_getsecctx(struct 
+diff -urNp linux-3.1.1/security/smack/smack_lsm.c linux-3.1.1/security/smack/smack_lsm.c
+--- linux-3.1.1/security/smack/smack_lsm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/smack/smack_lsm.c	2011-11-16 18:39:08.000000000 -0500
+@@ -3393,7 +3393,7 @@ static int smack_inode_getsecctx(struct 
  	return 0;
  }
  
@@ -76657,10 +76464,10 @@ diff -urNp linux-3.0.9/security/smack/smack_lsm.c linux-3.0.9/security/smack/sma
  	.name =				"smack",
  
  	.ptrace_access_check =		smack_ptrace_access_check,
-diff -urNp linux-3.0.9/security/tomoyo/tomoyo.c linux-3.0.9/security/tomoyo/tomoyo.c
---- linux-3.0.9/security/tomoyo/tomoyo.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/tomoyo/tomoyo.c	2011-11-15 20:03:00.000000000 -0500
-@@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa
+diff -urNp linux-3.1.1/security/tomoyo/tomoyo.c linux-3.1.1/security/tomoyo/tomoyo.c
+--- linux-3.1.1/security/tomoyo/tomoyo.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/tomoyo/tomoyo.c	2011-11-16 18:39:08.000000000 -0500
+@@ -446,7 +446,7 @@ static int tomoyo_sb_pivotroot(struct pa
   * tomoyo_security_ops is a "struct security_operations" which is used for
   * registering TOMOYO.
   */
@@ -76669,9 +76476,9 @@ diff -urNp linux-3.0.9/security/tomoyo/tomoyo.c linux-3.0.9/security/tomoyo/tomo
  	.name                = "tomoyo",
  	.cred_alloc_blank    = tomoyo_cred_alloc_blank,
  	.cred_prepare        = tomoyo_cred_prepare,
-diff -urNp linux-3.0.9/sound/aoa/codecs/onyx.c linux-3.0.9/sound/aoa/codecs/onyx.c
---- linux-3.0.9/sound/aoa/codecs/onyx.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/aoa/codecs/onyx.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/aoa/codecs/onyx.c linux-3.1.1/sound/aoa/codecs/onyx.c
+--- linux-3.1.1/sound/aoa/codecs/onyx.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/aoa/codecs/onyx.c	2011-11-16 18:39:08.000000000 -0500
 @@ -54,7 +54,7 @@ struct onyx {
  				spdif_locked:1,
  				analog_locked:1,
@@ -76700,9 +76507,9 @@ diff -urNp linux-3.0.9/sound/aoa/codecs/onyx.c linux-3.0.9/sound/aoa/codecs/onyx
  		onyx->spdif_locked = onyx->analog_locked = 0;
  	mutex_unlock(&onyx->mutex);
  
-diff -urNp linux-3.0.9/sound/aoa/codecs/onyx.h linux-3.0.9/sound/aoa/codecs/onyx.h
---- linux-3.0.9/sound/aoa/codecs/onyx.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/aoa/codecs/onyx.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/aoa/codecs/onyx.h linux-3.1.1/sound/aoa/codecs/onyx.h
+--- linux-3.1.1/sound/aoa/codecs/onyx.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/aoa/codecs/onyx.h	2011-11-16 18:39:08.000000000 -0500
 @@ -11,6 +11,7 @@
  #include <linux/i2c.h>
  #include <asm/pmac_low_i2c.h>
@@ -76711,9 +76518,9 @@ diff -urNp linux-3.0.9/sound/aoa/codecs/onyx.h linux-3.0.9/sound/aoa/codecs/onyx
  
  /* PCM3052 register definitions */
  
-diff -urNp linux-3.0.9/sound/core/oss/pcm_oss.c linux-3.0.9/sound/core/oss/pcm_oss.c
---- linux-3.0.9/sound/core/oss/pcm_oss.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/core/oss/pcm_oss.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/core/oss/pcm_oss.c linux-3.1.1/sound/core/oss/pcm_oss.c
+--- linux-3.1.1/sound/core/oss/pcm_oss.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/core/oss/pcm_oss.c	2011-11-16 18:39:08.000000000 -0500
 @@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(str
  		if (in_kernel) {
  			mm_segment_t fs;
@@ -76785,9 +76592,9 @@ diff -urNp linux-3.0.9/sound/core/oss/pcm_oss.c linux-3.0.9/sound/core/oss/pcm_o
  					snd_leave_user(fs);
  				}
  			} else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
-diff -urNp linux-3.0.9/sound/core/pcm_compat.c linux-3.0.9/sound/core/pcm_compat.c
---- linux-3.0.9/sound/core/pcm_compat.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/core/pcm_compat.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/core/pcm_compat.c linux-3.1.1/sound/core/pcm_compat.c
+--- linux-3.1.1/sound/core/pcm_compat.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/core/pcm_compat.c	2011-11-16 18:39:08.000000000 -0500
 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(st
  	int err;
  
@@ -76797,9 +76604,9 @@ diff -urNp linux-3.0.9/sound/core/pcm_compat.c linux-3.0.9/sound/core/pcm_compat
  	snd_leave_user(fs);
  	if (err < 0)
  		return err;
-diff -urNp linux-3.0.9/sound/core/pcm_native.c linux-3.0.9/sound/core/pcm_native.c
---- linux-3.0.9/sound/core/pcm_native.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/core/pcm_native.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/core/pcm_native.c linux-3.1.1/sound/core/pcm_native.c
+--- linux-3.1.1/sound/core/pcm_native.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/core/pcm_native.c	2011-11-16 18:39:08.000000000 -0500
 @@ -2770,11 +2770,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_
  	switch (substream->stream) {
  	case SNDRV_PCM_STREAM_PLAYBACK:
@@ -76814,9 +76621,9 @@ diff -urNp linux-3.0.9/sound/core/pcm_native.c linux-3.0.9/sound/core/pcm_native
  		break;
  	default:
  		result = -EINVAL;
-diff -urNp linux-3.0.9/sound/core/seq/seq_device.c linux-3.0.9/sound/core/seq/seq_device.c
---- linux-3.0.9/sound/core/seq/seq_device.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/core/seq/seq_device.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/core/seq/seq_device.c linux-3.1.1/sound/core/seq/seq_device.c
+--- linux-3.1.1/sound/core/seq/seq_device.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/core/seq/seq_device.c	2011-11-16 18:39:08.000000000 -0500
 @@ -63,7 +63,7 @@ struct ops_list {
  	int argsize;		/* argument size */
  
@@ -76853,9 +76660,9 @@ diff -urNp linux-3.0.9/sound/core/seq/seq_device.c linux-3.0.9/sound/core/seq/se
  		dev->status = SNDRV_SEQ_DEVICE_FREE;
  		dev->driver_data = NULL;
  		ops->num_init_devices--;
-diff -urNp linux-3.0.9/sound/drivers/mts64.c linux-3.0.9/sound/drivers/mts64.c
---- linux-3.0.9/sound/drivers/mts64.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/drivers/mts64.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/drivers/mts64.c linux-3.1.1/sound/drivers/mts64.c
+--- linux-3.1.1/sound/drivers/mts64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/drivers/mts64.c	2011-11-16 18:39:08.000000000 -0500
 @@ -28,6 +28,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -76912,9 +76719,9 @@ diff -urNp linux-3.0.9/sound/drivers/mts64.c linux-3.0.9/sound/drivers/mts64.c
  
  	return 0;
  }
-diff -urNp linux-3.0.9/sound/drivers/opl4/opl4_lib.c linux-3.0.9/sound/drivers/opl4/opl4_lib.c
---- linux-3.0.9/sound/drivers/opl4/opl4_lib.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/drivers/opl4/opl4_lib.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/drivers/opl4/opl4_lib.c linux-3.1.1/sound/drivers/opl4/opl4_lib.c
+--- linux-3.1.1/sound/drivers/opl4/opl4_lib.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/drivers/opl4/opl4_lib.c	2011-11-16 18:39:08.000000000 -0500
 @@ -28,7 +28,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
  MODULE_DESCRIPTION("OPL4 driver");
  MODULE_LICENSE("GPL");
@@ -76924,9 +76731,9 @@ diff -urNp linux-3.0.9/sound/drivers/opl4/opl4_lib.c linux-3.0.9/sound/drivers/o
  {
  	int timeout = 10;
  	while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
-diff -urNp linux-3.0.9/sound/drivers/portman2x4.c linux-3.0.9/sound/drivers/portman2x4.c
---- linux-3.0.9/sound/drivers/portman2x4.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/drivers/portman2x4.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/drivers/portman2x4.c linux-3.1.1/sound/drivers/portman2x4.c
+--- linux-3.1.1/sound/drivers/portman2x4.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/drivers/portman2x4.c	2011-11-16 18:39:08.000000000 -0500
 @@ -47,6 +47,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -76944,9 +76751,9 @@ diff -urNp linux-3.0.9/sound/drivers/portman2x4.c linux-3.0.9/sound/drivers/port
  	int mode[PORTMAN_NUM_INPUT_PORTS];
  	struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-diff -urNp linux-3.0.9/sound/firewire/amdtp.c linux-3.0.9/sound/firewire/amdtp.c
---- linux-3.0.9/sound/firewire/amdtp.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/firewire/amdtp.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/firewire/amdtp.c linux-3.1.1/sound/firewire/amdtp.c
+--- linux-3.1.1/sound/firewire/amdtp.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/firewire/amdtp.c	2011-11-16 18:39:08.000000000 -0500
 @@ -371,7 +371,7 @@ static void queue_out_packet(struct amdt
  		ptr = s->pcm_buffer_pointer + data_blocks;
  		if (ptr >= pcm->runtime->buffer_size)
@@ -76965,9 +76772,9 @@ diff -urNp linux-3.0.9/sound/firewire/amdtp.c linux-3.0.9/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.9/sound/firewire/amdtp.h linux-3.0.9/sound/firewire/amdtp.h
---- linux-3.0.9/sound/firewire/amdtp.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/firewire/amdtp.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/firewire/amdtp.h linux-3.1.1/sound/firewire/amdtp.h
+--- linux-3.1.1/sound/firewire/amdtp.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/firewire/amdtp.h	2011-11-16 18:39:08.000000000 -0500
 @@ -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)
@@ -76977,9 +76784,9 @@ diff -urNp linux-3.0.9/sound/firewire/amdtp.h linux-3.0.9/sound/firewire/amdtp.h
  }
  
  /**
-diff -urNp linux-3.0.9/sound/firewire/isight.c linux-3.0.9/sound/firewire/isight.c
---- linux-3.0.9/sound/firewire/isight.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/firewire/isight.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/firewire/isight.c linux-3.1.1/sound/firewire/isight.c
+--- linux-3.1.1/sound/firewire/isight.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/firewire/isight.c	2011-11-16 18:39:08.000000000 -0500
 @@ -97,7 +97,7 @@ static void isight_update_pointers(struc
  	ptr += count;
  	if (ptr >= runtime->buffer_size)
@@ -77020,9 +76827,9 @@ diff -urNp linux-3.0.9/sound/firewire/isight.c linux-3.0.9/sound/firewire/isight
  		break;
  	default:
  		return -EINVAL;
-diff -urNp linux-3.0.9/sound/isa/cmi8330.c linux-3.0.9/sound/isa/cmi8330.c
---- linux-3.0.9/sound/isa/cmi8330.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/isa/cmi8330.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/isa/cmi8330.c linux-3.1.1/sound/isa/cmi8330.c
+--- linux-3.1.1/sound/isa/cmi8330.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/isa/cmi8330.c	2011-11-16 18:39:08.000000000 -0500
 @@ -172,7 +172,7 @@ struct snd_cmi8330 {
  
  	struct snd_pcm *pcm;
@@ -77032,9 +76839,9 @@ diff -urNp linux-3.0.9/sound/isa/cmi8330.c linux-3.0.9/sound/isa/cmi8330.c
  		snd_pcm_open_callback_t open;
  		void *private_data; /* sb or wss */
  	} streams[2];
-diff -urNp linux-3.0.9/sound/oss/sb_audio.c linux-3.0.9/sound/oss/sb_audio.c
---- linux-3.0.9/sound/oss/sb_audio.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/oss/sb_audio.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/oss/sb_audio.c linux-3.1.1/sound/oss/sb_audio.c
+--- linux-3.1.1/sound/oss/sb_audio.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/oss/sb_audio.c	2011-11-16 18:39:08.000000000 -0500
 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
  		buf16 = (signed short *)(localbuf + localoffs);
  		while (c)
@@ -77044,9 +76851,9 @@ diff -urNp linux-3.0.9/sound/oss/sb_audio.c linux-3.0.9/sound/oss/sb_audio.c
  			if (copy_from_user(lbuf8,
  					   userbuf+useroffs + p,
  					   locallen))
-diff -urNp linux-3.0.9/sound/oss/swarm_cs4297a.c linux-3.0.9/sound/oss/swarm_cs4297a.c
---- linux-3.0.9/sound/oss/swarm_cs4297a.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/oss/swarm_cs4297a.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/oss/swarm_cs4297a.c linux-3.1.1/sound/oss/swarm_cs4297a.c
+--- linux-3.1.1/sound/oss/swarm_cs4297a.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/oss/swarm_cs4297a.c	2011-11-16 18:39:08.000000000 -0500
 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
  {
  	struct cs4297a_state *s;
@@ -77081,10 +76888,10 @@ diff -urNp linux-3.0.9/sound/oss/swarm_cs4297a.c linux-3.0.9/sound/oss/swarm_cs4
  
                  list_add(&s->list, &cs4297a_devs);
  
-diff -urNp linux-3.0.9/sound/pci/hda/hda_codec.h linux-3.0.9/sound/pci/hda/hda_codec.h
---- linux-3.0.9/sound/pci/hda/hda_codec.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/pci/hda/hda_codec.h	2011-11-15 20:03:00.000000000 -0500
-@@ -615,7 +615,7 @@ struct hda_bus_ops {
+diff -urNp linux-3.1.1/sound/pci/hda/hda_codec.h linux-3.1.1/sound/pci/hda/hda_codec.h
+--- linux-3.1.1/sound/pci/hda/hda_codec.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/pci/hda/hda_codec.h	2011-11-16 18:39:08.000000000 -0500
+@@ -611,7 +611,7 @@ struct hda_bus_ops {
  	/* notify power-up/down from codec to controller */
  	void (*pm_notify)(struct hda_bus *bus);
  #endif
@@ -77119,9 +76926,9 @@ diff -urNp linux-3.0.9/sound/pci/hda/hda_codec.h linux-3.0.9/sound/pci/hda/hda_c
  
  	/* PCM to create, set by patch_ops.build_pcms callback */
  	unsigned int num_pcms;
-diff -urNp linux-3.0.9/sound/pci/ice1712/ice1712.h linux-3.0.9/sound/pci/ice1712/ice1712.h
---- linux-3.0.9/sound/pci/ice1712/ice1712.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/pci/ice1712/ice1712.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/pci/ice1712/ice1712.h linux-3.1.1/sound/pci/ice1712/ice1712.h
+--- linux-3.1.1/sound/pci/ice1712/ice1712.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/pci/ice1712/ice1712.h	2011-11-16 18:39:08.000000000 -0500
 @@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
  	unsigned int mask_flags;	/* total mask bits */
  	struct snd_akm4xxx_ops {
@@ -77140,9 +76947,9 @@ diff -urNp linux-3.0.9/sound/pci/ice1712/ice1712.h linux-3.0.9/sound/pci/ice1712
  };
  
  
-diff -urNp linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c
---- linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/pci/ymfpci/ymfpci_main.c linux-3.1.1/sound/pci/ymfpci/ymfpci_main.c
+--- linux-3.1.1/sound/pci/ymfpci/ymfpci_main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/pci/ymfpci/ymfpci_main.c	2011-11-16 18:39:08.000000000 -0500
 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
  		if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
  			break;
@@ -77183,29 +76990,21 @@ diff -urNp linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c linux-3.0.9/sound/pci/ymfp
  	chip->card = card;
  	chip->pci = pci;
  	chip->irq = -1;
-diff -urNp linux-3.0.9/sound/soc/soc-core.c linux-3.0.9/sound/soc/soc-core.c
---- linux-3.0.9/sound/soc/soc-core.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/soc/soc-core.c	2011-11-15 20:03:00.000000000 -0500
-@@ -1021,7 +1021,7 @@ static snd_pcm_uframes_t soc_pcm_pointer
+diff -urNp linux-3.1.1/sound/soc/soc-pcm.c linux-3.1.1/sound/soc/soc-pcm.c
+--- linux-3.1.1/sound/soc/soc-pcm.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/soc/soc-pcm.c	2011-11-16 18:39:08.000000000 -0500
+@@ -568,7 +568,7 @@ static snd_pcm_uframes_t soc_pcm_pointer
  }
  
  /* ASoC PCM operations */
 -static struct snd_pcm_ops soc_pcm_ops = {
 +static snd_pcm_ops_no_const soc_pcm_ops = {
  	.open		= soc_pcm_open,
- 	.close		= soc_codec_close,
+ 	.close		= soc_pcm_close,
  	.hw_params	= soc_pcm_hw_params,
-@@ -2128,6 +2128,7 @@ static int soc_new_pcm(struct snd_soc_pc
- 	rtd->pcm = pcm;
- 	pcm->private_data = rtd;
- 	if (platform->driver->ops) {
-+		/* this whole logic is broken... */
- 		soc_pcm_ops.mmap = platform->driver->ops->mmap;
- 		soc_pcm_ops.pointer = platform->driver->ops->pointer;
- 		soc_pcm_ops.ioctl = platform->driver->ops->ioctl;
-diff -urNp linux-3.0.9/sound/usb/card.h linux-3.0.9/sound/usb/card.h
---- linux-3.0.9/sound/usb/card.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/usb/card.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/sound/usb/card.h linux-3.1.1/sound/usb/card.h
+--- linux-3.1.1/sound/usb/card.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/usb/card.h	2011-11-16 18:39:08.000000000 -0500
 @@ -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);
@@ -77223,10 +77022,10 @@ diff -urNp linux-3.0.9/sound/usb/card.h linux-3.0.9/sound/usb/card.h
  };
  
  struct snd_usb_stream {
-diff -urNp linux-3.0.9/tools/gcc/checker_plugin.c linux-3.0.9/tools/gcc/checker_plugin.c
---- linux-3.0.9/tools/gcc/checker_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/tools/gcc/checker_plugin.c	2011-11-15 20:03:00.000000000 -0500
-@@ -0,0 +1,169 @@
+diff -urNp linux-3.1.1/tools/gcc/checker_plugin.c linux-3.1.1/tools/gcc/checker_plugin.c
+--- linux-3.1.1/tools/gcc/checker_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/tools/gcc/checker_plugin.c	2011-11-16 18:39:08.000000000 -0500
+@@ -0,0 +1,171 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
 + * Licensed under the GPL v2
@@ -77250,17 +77049,19 @@ diff -urNp linux-3.0.9/tools/gcc/checker_plugin.c linux-3.0.9/tools/gcc/checker_
 +#include "coretypes.h"
 +#include "tree.h"
 +#include "tree-pass.h"
++#include "flags.h"
 +#include "intl.h"
++#include "toplev.h"
++#include "plugin.h"
++//#include "expr.h" where are you...
++#include "diagnostic.h"
 +#include "plugin-version.h"
 +#include "tm.h"
-+#include "toplev.h"
++#include "function.h"
 +#include "basic-block.h"
 +#include "gimple.h"
-+//#include "expr.h" where are you...
-+#include "diagnostic.h"
 +#include "rtl.h"
 +#include "emit-rtl.h"
-+#include "function.h"
 +#include "tree-flow.h"
 +#include "target.h"
 +
@@ -77277,7 +77078,7 @@ diff -urNp linux-3.0.9/tools/gcc/checker_plugin.c linux-3.0.9/tools/gcc/checker_
 +int plugin_is_GPL_compatible;
 +
 +static struct plugin_info checker_plugin_info = {
-+	.version	= "201110031940",
++	.version	= "201111150100",
 +};
 +
 +#define ADDR_SPACE_KERNEL		0
@@ -77396,10 +77197,10 @@ diff -urNp linux-3.0.9/tools/gcc/checker_plugin.c linux-3.0.9/tools/gcc/checker_
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.9/tools/gcc/constify_plugin.c linux-3.0.9/tools/gcc/constify_plugin.c
---- linux-3.0.9/tools/gcc/constify_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/tools/gcc/constify_plugin.c	2011-11-15 20:03:00.000000000 -0500
-@@ -0,0 +1,293 @@
+diff -urNp linux-3.1.1/tools/gcc/constify_plugin.c linux-3.1.1/tools/gcc/constify_plugin.c
+--- linux-3.1.1/tools/gcc/constify_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/tools/gcc/constify_plugin.c	2011-11-16 18:39:08.000000000 -0500
+@@ -0,0 +1,303 @@
 +/*
 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
 + * Copyright 2011 by PaX Team <pageexec@freemail.hu>
@@ -77421,22 +77222,26 @@ diff -urNp linux-3.0.9/tools/gcc/constify_plugin.c linux-3.0.9/tools/gcc/constif
 +#include "coretypes.h"
 +#include "tree.h"
 +#include "tree-pass.h"
++#include "flags.h"
 +#include "intl.h"
++#include "toplev.h"
++#include "plugin.h"
++#include "diagnostic.h"
 +#include "plugin-version.h"
 +#include "tm.h"
-+#include "toplev.h"
 +#include "function.h"
++#include "basic-block.h"
++#include "gimple.h"
++#include "rtl.h"
++#include "emit-rtl.h"
 +#include "tree-flow.h"
-+#include "plugin.h"
-+#include "diagnostic.h"
-+//#include "c-tree.h"
 +
 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
 +
 +int plugin_is_GPL_compatible;
 +
 +static struct plugin_info const_plugin_info = {
-+	.version	= "20110826",
++	.version	= "201111150100",
 +	.help		= "no-constify\tturn off constification\n",
 +};
 +
@@ -77530,7 +77335,10 @@ diff -urNp linux-3.0.9/tools/gcc/constify_plugin.c linux-3.0.9/tools/gcc/constif
 +	.decl_required		= false,
 +	.type_required		= false,
 +	.function_type_required	= false,
-+	.handler		= handle_no_const_attribute
++	.handler		= handle_no_const_attribute,
++#if __GNUC__ > 4 || __GNUC_MINOR__ >= 7
++	.affects_type_identity	= true
++#endif
 +};
 +
 +static struct attribute_spec do_const_attr = {
@@ -77540,7 +77348,10 @@ diff -urNp linux-3.0.9/tools/gcc/constify_plugin.c linux-3.0.9/tools/gcc/constif
 +	.decl_required		= false,
 +	.type_required		= false,
 +	.function_type_required	= false,
-+	.handler		= handle_do_const_attribute
++	.handler		= handle_do_const_attribute,
++#if __GNUC__ > 4 || __GNUC_MINOR__ >= 7
++	.affects_type_identity	= true
++#endif
 +};
 +
 +static void register_attributes(void *event_data, void *data)
@@ -77693,10 +77504,10 @@ diff -urNp linux-3.0.9/tools/gcc/constify_plugin.c linux-3.0.9/tools/gcc/constif
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.9/tools/gcc/kallocstat_plugin.c linux-3.0.9/tools/gcc/kallocstat_plugin.c
---- linux-3.0.9/tools/gcc/kallocstat_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/tools/gcc/kallocstat_plugin.c	2011-11-15 20:03:00.000000000 -0500
-@@ -0,0 +1,165 @@
+diff -urNp linux-3.1.1/tools/gcc/kallocstat_plugin.c linux-3.1.1/tools/gcc/kallocstat_plugin.c
+--- linux-3.1.1/tools/gcc/kallocstat_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/tools/gcc/kallocstat_plugin.c	2011-11-16 18:39:08.000000000 -0500
+@@ -0,0 +1,167 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
 + * Licensed under the GPL v2
@@ -77719,17 +77530,19 @@ diff -urNp linux-3.0.9/tools/gcc/kallocstat_plugin.c linux-3.0.9/tools/gcc/kallo
 +#include "coretypes.h"
 +#include "tree.h"
 +#include "tree-pass.h"
++#include "flags.h"
 +#include "intl.h"
++#include "toplev.h"
++#include "plugin.h"
++//#include "expr.h" where are you...
++#include "diagnostic.h"
 +#include "plugin-version.h"
 +#include "tm.h"
-+#include "toplev.h"
++#include "function.h"
 +#include "basic-block.h"
 +#include "gimple.h"
-+//#include "expr.h" where are you...
-+#include "diagnostic.h"
 +#include "rtl.h"
 +#include "emit-rtl.h"
-+#include "function.h"
 +
 +extern void print_gimple_stmt(FILE *, gimple, int, int);
 +
@@ -77748,7 +77561,7 @@ diff -urNp linux-3.0.9/tools/gcc/kallocstat_plugin.c linux-3.0.9/tools/gcc/kallo
 +};
 +
 +static struct plugin_info kallocstat_plugin_info = {
-+	.version	= "201109121100",
++	.version	= "201111150100",
 +};
 +
 +static unsigned int execute_kallocstat(void);
@@ -77862,10 +77675,10 @@ diff -urNp linux-3.0.9/tools/gcc/kallocstat_plugin.c linux-3.0.9/tools/gcc/kallo
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.9/tools/gcc/kernexec_plugin.c linux-3.0.9/tools/gcc/kernexec_plugin.c
---- linux-3.0.9/tools/gcc/kernexec_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/tools/gcc/kernexec_plugin.c	2011-11-15 20:03:00.000000000 -0500
-@@ -0,0 +1,273 @@
+diff -urNp linux-3.1.1/tools/gcc/kernexec_plugin.c linux-3.1.1/tools/gcc/kernexec_plugin.c
+--- linux-3.1.1/tools/gcc/kernexec_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/tools/gcc/kernexec_plugin.c	2011-11-16 18:39:08.000000000 -0500
+@@ -0,0 +1,275 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
 + * Licensed under the GPL v2
@@ -77888,17 +77701,19 @@ diff -urNp linux-3.0.9/tools/gcc/kernexec_plugin.c linux-3.0.9/tools/gcc/kernexe
 +#include "coretypes.h"
 +#include "tree.h"
 +#include "tree-pass.h"
++#include "flags.h"
 +#include "intl.h"
++#include "toplev.h"
++#include "plugin.h"
++//#include "expr.h" where are you...
++#include "diagnostic.h"
 +#include "plugin-version.h"
 +#include "tm.h"
-+#include "toplev.h"
++#include "function.h"
 +#include "basic-block.h"
 +#include "gimple.h"
-+//#include "expr.h" where are you...
-+#include "diagnostic.h"
 +#include "rtl.h"
 +#include "emit-rtl.h"
-+#include "function.h"
 +#include "tree-flow.h"
 +
 +extern void print_gimple_stmt(FILE *, gimple, int, int);
@@ -77907,7 +77722,7 @@ diff -urNp linux-3.0.9/tools/gcc/kernexec_plugin.c linux-3.0.9/tools/gcc/kernexe
 +int plugin_is_GPL_compatible;
 +
 +static struct plugin_info kernexec_plugin_info = {
-+	.version	= "201110032145",
++	.version	= "201111150100",
 +};
 +
 +static unsigned int execute_kernexec_fptr(void);
@@ -77957,7 +77772,7 @@ diff -urNp linux-3.0.9/tools/gcc/kernexec_plugin.c linux-3.0.9/tools/gcc/kernexe
 +	if (ix86_cmodel != CM_KERNEL)
 +		return false;
 +
-+	section = lookup_attribute("__section__", DECL_ATTRIBUTES(current_function_decl));
++	section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
 +	if (!section || !TREE_VALUE(section))
 +		return true;
 +
@@ -78139,14 +77954,14 @@ diff -urNp linux-3.0.9/tools/gcc/kernexec_plugin.c linux-3.0.9/tools/gcc/kernexe
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.9/tools/gcc/Makefile linux-3.0.9/tools/gcc/Makefile
---- linux-3.0.9/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/tools/gcc/Makefile	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/tools/gcc/Makefile linux-3.1.1/tools/gcc/Makefile
+--- linux-3.1.1/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/tools/gcc/Makefile	2011-11-16 20:37:08.000000000 -0500
 @@ -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)
++GCCPLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
 +#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W
 +
 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include
@@ -78159,15 +77974,15 @@ diff -urNp linux-3.0.9/tools/gcc/Makefile linux-3.0.9/tools/gcc/Makefile
 +
 +always := $(hostlibs-y)
 +
-+stackleak_plugin-objs := stackleak_plugin.o
 +constify_plugin-objs := constify_plugin.o
++stackleak_plugin-objs := stackleak_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.9/tools/gcc/stackleak_plugin.c linux-3.0.9/tools/gcc/stackleak_plugin.c
---- linux-3.0.9/tools/gcc/stackleak_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/tools/gcc/stackleak_plugin.c	2011-11-15 20:03:00.000000000 -0500
-@@ -0,0 +1,251 @@
+diff -urNp linux-3.1.1/tools/gcc/stackleak_plugin.c linux-3.1.1/tools/gcc/stackleak_plugin.c
+--- linux-3.1.1/tools/gcc/stackleak_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/tools/gcc/stackleak_plugin.c	2011-11-16 18:39:08.000000000 -0500
+@@ -0,0 +1,291 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
 + * Licensed under the GPL v2
@@ -78193,26 +78008,31 @@ diff -urNp linux-3.0.9/tools/gcc/stackleak_plugin.c linux-3.0.9/tools/gcc/stackl
 +#include "coretypes.h"
 +#include "tree.h"
 +#include "tree-pass.h"
++#include "flags.h"
 +#include "intl.h"
++#include "toplev.h"
++#include "plugin.h"
++//#include "expr.h" where are you...
++#include "diagnostic.h"
 +#include "plugin-version.h"
 +#include "tm.h"
-+#include "toplev.h"
++#include "function.h"
 +#include "basic-block.h"
 +#include "gimple.h"
-+//#include "expr.h" where are you...
-+#include "diagnostic.h"
 +#include "rtl.h"
 +#include "emit-rtl.h"
-+#include "function.h"
++
++extern void print_gimple_stmt(FILE *, gimple, int, int);
 +
 +int plugin_is_GPL_compatible;
 +
 +static int track_frame_size = -1;
 +static const char track_function[] = "pax_track_stack";
++static const char check_function[] = "pax_check_alloca";
 +static bool init_locals;
 +
 +static struct plugin_info stackleak_plugin_info = {
-+	.version	= "201109112100",
++	.version	= "201111150100",
 +	.help		= "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
 +//			  "initialize-locals\t\tforcibly initialize all stack frames\n"
 +};
@@ -78235,7 +78055,7 @@ diff -urNp linux-3.0.9/tools/gcc/stackleak_plugin.c linux-3.0.9/tools/gcc/stackl
 +		.properties_provided	= 0,
 +		.properties_destroyed	= 0,
 +		.todo_flags_start	= 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
-+		.todo_flags_finish	= TODO_verify_stmts | TODO_dump_func
++		.todo_flags_finish	= TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
 +	}
 +};
 +
@@ -78262,63 +78082,94 @@ diff -urNp linux-3.0.9/tools/gcc/stackleak_plugin.c linux-3.0.9/tools/gcc/stackl
 +	return track_frame_size >= 0;
 +}
 +
-+static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi, bool before)
++static void stackleak_check_alloca(gimple_stmt_iterator gsi)
++{
++	gimple check_alloca;
++	tree fndecl, fntype, alloca_size;
++
++	// insert call to void pax_check_alloca(unsigned long size)
++	fntype = build_function_type_list(void_type_node, long_unsigned_type_node, NULL_TREE);
++	fndecl = build_fn_decl(check_function, fntype);
++	DECL_ASSEMBLER_NAME(fndecl); // for LTO
++	alloca_size = gimple_call_arg(gsi_stmt(gsi), 0);
++	check_alloca = gimple_build_call(fndecl, 1, alloca_size);
++	gsi_insert_before(&gsi, check_alloca, GSI_CONTINUE_LINKING);
++}
++
++static void stackleak_add_instrumentation(gimple_stmt_iterator gsi)
 +{
-+	gimple call;
-+	tree fndecl, type;
++	gimple track_stack;
++	tree fndecl, fntype;
 +
 +	// insert call to void pax_track_stack(void)
-+	type = build_function_type_list(void_type_node, NULL_TREE);
-+	fndecl = build_fn_decl(track_function, type);
++	fntype = build_function_type_list(void_type_node, NULL_TREE);
++	fndecl = build_fn_decl(track_function, fntype);
 +	DECL_ASSEMBLER_NAME(fndecl); // for LTO
-+	call = gimple_build_call(fndecl, 0);
-+	if (before)
-+		gsi_insert_before(gsi, call, GSI_CONTINUE_LINKING);
-+	else
-+		gsi_insert_after(gsi, call, GSI_CONTINUE_LINKING);
++	track_stack = gimple_build_call(fndecl, 0);
++	gsi_insert_after(&gsi, track_stack, GSI_CONTINUE_LINKING);
++}
++
++#if __GNUC__ == 4 && __GNUC_MINOR__ == 5
++static bool gimple_call_builtin_p(gimple stmt, enum built_in_function code)
++{
++	tree fndecl;
++
++	if (!is_gimple_call(stmt))
++		return false;
++	fndecl = gimple_call_fndecl(stmt);
++	if (!fndecl)
++		return false;
++	if (DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
++		return false;
++//	print_node(stderr, "pax", fndecl, 4);
++	return DECL_FUNCTION_CODE(fndecl) == code;
++}
++#endif
++
++static bool is_alloca(gimple stmt)
++{
++	if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
++		return true;
++
++#if __GNUC__ > 4 || __GNUC_MINOR__ >= 7
++	if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
++		return true;
++#endif
++
++	return false;
 +}
 +
 +static unsigned int execute_stackleak_tree_instrument(void)
 +{
 +	basic_block bb, entry_bb;
-+	gimple_stmt_iterator gsi;
 +	bool prologue_instrumented = false;
 +
 +	entry_bb = ENTRY_BLOCK_PTR_FOR_FUNCTION(cfun)->next_bb;
 +
 +	// 1. loop through BBs and GIMPLE statements
 +	FOR_EACH_BB(bb) {
++		gimple_stmt_iterator gsi;
 +		for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
 +			// gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA attributes <tree_list 0xb7576450>
-+			tree fndecl;
-+			gimple stmt = gsi_stmt(gsi);
-+
-+			if (!is_gimple_call(stmt))
-+				continue;
-+			fndecl = gimple_call_fndecl(stmt);
-+			if (!fndecl)
-+				continue;
-+			if (TREE_CODE(fndecl) != FUNCTION_DECL)
-+				continue;
-+			if (!DECL_BUILT_IN(fndecl))
-+				continue;
-+			if (DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
-+				continue;
-+			if (DECL_FUNCTION_CODE(fndecl) != BUILT_IN_ALLOCA)
++			if (!is_alloca(gsi_stmt(gsi)))
 +				continue;
 +
-+			// 2. insert track call after each __builtin_alloca call
-+			stackleak_add_instrumentation(&gsi, false);
++			// 2. insert stack overflow check before each __builtin_alloca call
++			stackleak_check_alloca(gsi);
++
++			// 3. insert track call after each __builtin_alloca call
++			stackleak_add_instrumentation(gsi);
 +			if (bb == entry_bb)
 +				prologue_instrumented = true;
-+//			print_node(stderr, "pax", fndecl, 4);
 +		}
 +	}
 +
-+	// 3. insert track call at the beginning
++	// 4. insert track call at the beginning
 +	if (!prologue_instrumented) {
-+		gsi = gsi_start_bb(entry_bb);
-+		stackleak_add_instrumentation(&gsi, true);
++		bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
++		if (dom_info_available_p(CDI_DOMINATORS))
++			set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR);
++		stackleak_add_instrumentation(gsi_start_bb(bb));
 +	}
 +
 +	return 0;
@@ -78355,7 +78206,11 @@ diff -urNp linux-3.0.9/tools/gcc/stackleak_plugin.c linux-3.0.9/tools/gcc/stackl
 +			continue;
 +//		warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
 +		// 2. delete call
-+		delete_insn_and_edges(insn);
++		insn = delete_insn_and_edges(insn);
++#if __GNUC__ > 4 || __GNUC_MINOR__ >= 7
++		if (GET_CODE(insn) == NOTE && NOTE_KIND(insn) == NOTE_INSN_CALL_ARG_LOCATION)
++			insn = delete_insn_and_edges(insn);
++#endif
 +	}
 +
 +//	print_simple_rtl(stderr, get_insns());
@@ -78419,9 +78274,9 @@ diff -urNp linux-3.0.9/tools/gcc/stackleak_plugin.c linux-3.0.9/tools/gcc/stackl
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h
---- linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/tools/perf/util/include/asm/alternative-asm.h linux-3.1.1/tools/perf/util/include/asm/alternative-asm.h
+--- linux-3.1.1/tools/perf/util/include/asm/alternative-asm.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/tools/perf/util/include/asm/alternative-asm.h	2011-11-16 18:39:08.000000000 -0500
 @@ -5,4 +5,7 @@
  
  #define altinstruction_entry #
@@ -78430,9 +78285,9 @@ diff -urNp linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h linux-3.0.9
 +	.endm
 +
  #endif
-diff -urNp linux-3.0.9/usr/gen_init_cpio.c linux-3.0.9/usr/gen_init_cpio.c
---- linux-3.0.9/usr/gen_init_cpio.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/usr/gen_init_cpio.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/usr/gen_init_cpio.c linux-3.1.1/usr/gen_init_cpio.c
+--- linux-3.1.1/usr/gen_init_cpio.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/usr/gen_init_cpio.c	2011-11-16 18:39:08.000000000 -0500
 @@ -303,7 +303,7 @@ static int cpio_mkfile(const char *name,
  	int retval;
  	int rc = -1;
@@ -78455,9 +78310,9 @@ diff -urNp linux-3.0.9/usr/gen_init_cpio.c linux-3.0.9/usr/gen_init_cpio.c
                 } else
                         break;
         }
-diff -urNp linux-3.0.9/virt/kvm/kvm_main.c linux-3.0.9/virt/kvm/kvm_main.c
---- linux-3.0.9/virt/kvm/kvm_main.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/virt/kvm/kvm_main.c	2011-11-15 20:03:00.000000000 -0500
+diff -urNp linux-3.1.1/virt/kvm/kvm_main.c linux-3.1.1/virt/kvm/kvm_main.c
+--- linux-3.1.1/virt/kvm/kvm_main.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/virt/kvm/kvm_main.c	2011-11-16 18:39:08.000000000 -0500
 @@ -73,7 +73,7 @@ LIST_HEAD(vm_list);
  
  static cpumask_var_t cpus_hardware_enabled;
@@ -78467,7 +78322,7 @@ diff -urNp linux-3.0.9/virt/kvm/kvm_main.c linux-3.0.9/virt/kvm/kvm_main.c
  
  struct kmem_cache *kvm_vcpu_cache;
  EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
-@@ -2176,7 +2176,7 @@ static void hardware_enable_nolock(void 
+@@ -2266,7 +2266,7 @@ static void hardware_enable_nolock(void 
  
  	if (r) {
  		cpumask_clear_cpu(cpu, cpus_hardware_enabled);
@@ -78476,7 +78331,7 @@ diff -urNp linux-3.0.9/virt/kvm/kvm_main.c linux-3.0.9/virt/kvm/kvm_main.c
  		printk(KERN_INFO "kvm: enabling virtualization on "
  				 "CPU%d failed\n", cpu);
  	}
-@@ -2230,10 +2230,10 @@ static int hardware_enable_all(void)
+@@ -2320,10 +2320,10 @@ static int hardware_enable_all(void)
  
  	kvm_usage_count++;
  	if (kvm_usage_count == 1) {
@@ -78489,7 +78344,7 @@ diff -urNp linux-3.0.9/virt/kvm/kvm_main.c linux-3.0.9/virt/kvm/kvm_main.c
  			hardware_disable_all_nolock();
  			r = -EBUSY;
  		}
-@@ -2498,7 +2498,7 @@ static void kvm_sched_out(struct preempt
+@@ -2588,7 +2588,7 @@ static void kvm_sched_out(struct preempt
  	kvm_arch_vcpu_put(vcpu);
  }
  
@@ -78498,7 +78353,7 @@ diff -urNp linux-3.0.9/virt/kvm/kvm_main.c linux-3.0.9/virt/kvm/kvm_main.c
  		  struct module *module)
  {
  	int r;
-@@ -2561,7 +2561,7 @@ int kvm_init(void *opaque, unsigned vcpu
+@@ -2651,7 +2651,7 @@ int kvm_init(void *opaque, unsigned vcpu
  	if (!vcpu_align)
  		vcpu_align = __alignof__(struct kvm_vcpu);
  	kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
@@ -78507,7 +78362,7 @@ diff -urNp linux-3.0.9/virt/kvm/kvm_main.c linux-3.0.9/virt/kvm/kvm_main.c
  	if (!kvm_vcpu_cache) {
  		r = -ENOMEM;
  		goto out_free_3;
-@@ -2571,9 +2571,11 @@ int kvm_init(void *opaque, unsigned vcpu
+@@ -2661,9 +2661,11 @@ int kvm_init(void *opaque, unsigned vcpu
  	if (r)
  		goto out_free;
  
diff --git a/3.0.9/4421_grsec-remove-localversion-grsec.patch b/3.1.1/4421_grsec-remove-localversion-grsec.patch
index 31cf878..31cf878 100644
--- a/3.0.9/4421_grsec-remove-localversion-grsec.patch
+++ b/3.1.1/4421_grsec-remove-localversion-grsec.patch
diff --git a/3.0.9/4422_grsec-mute-warnings.patch b/3.1.1/4422_grsec-mute-warnings.patch
index fbca0bb..fbca0bb 100644
--- a/3.0.9/4422_grsec-mute-warnings.patch
+++ b/3.1.1/4422_grsec-mute-warnings.patch
diff --git a/3.0.9/4423_grsec-remove-protected-paths.patch b/3.1.1/4423_grsec-remove-protected-paths.patch
index 4afb3e2..4afb3e2 100644
--- a/3.0.9/4423_grsec-remove-protected-paths.patch
+++ b/3.1.1/4423_grsec-remove-protected-paths.patch
diff --git a/3.0.9/4425_grsec-pax-without-grsec.patch b/3.1.1/4425_grsec-pax-without-grsec.patch
index 41be0d0..8304192 100644
--- a/3.0.9/4425_grsec-pax-without-grsec.patch
+++ b/3.1.1/4425_grsec-pax-without-grsec.patch
@@ -20,7 +20,7 @@ The original version of this patch contained no credits/description.
 diff -Naur a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
 --- a/arch/x86/mm/fault.c	2011-04-17 19:05:03.000000000 -0400
 +++ a/arch/x86/mm/fault.c	2011-04-17 19:20:30.000000000 -0400
-@@ -647,10 +647,12 @@
+@@ -651,10 +651,12 @@
  
  #ifdef CONFIG_PAX_KERNEXEC
  	if (init_mm.start_code <= address && address < init_mm.end_code) {
@@ -36,7 +36,7 @@ diff -Naur a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
 diff -Naur a/fs/exec.c b/fs/exec.c
 --- a/fs/exec.c	2011-04-17 19:05:03.000000000 -0400
 +++ b/fs/exec.c	2011-04-17 19:20:30.000000000 -0400
-@@ -1958,9 +1958,11 @@
+@@ -1999,9 +1999,11 @@
  		}
  		up_read(&mm->mmap_sem);
  	}
@@ -48,7 +48,7 @@ diff -Naur a/fs/exec.c b/fs/exec.c
  		printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
  	printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
  			"PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
-@@ -1975,10 +1977,12 @@
+@@ -2016,10 +2018,12 @@
  #ifdef CONFIG_PAX_REFCOUNT
  void pax_report_refcount_overflow(struct pt_regs *regs)
  {
@@ -61,7 +61,7 @@ diff -Naur a/fs/exec.c b/fs/exec.c
  		printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
  				 current->comm, task_pid_nr(current), current_uid(), current_euid());
  	print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
-@@ -2038,10 +2042,12 @@
+@@ -2079,10 +2083,12 @@
  
  NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
  {
diff --git a/3.0.9/4430_grsec-kconfig-default-gids.patch b/3.1.1/4430_grsec-kconfig-default-gids.patch
index 6a448bf..6a448bf 100644
--- a/3.0.9/4430_grsec-kconfig-default-gids.patch
+++ b/3.1.1/4430_grsec-kconfig-default-gids.patch
diff --git a/3.0.9/4435_grsec-kconfig-gentoo.patch b/3.1.1/4435_grsec-kconfig-gentoo.patch
index 1bc9742..1bc9742 100644
--- a/3.0.9/4435_grsec-kconfig-gentoo.patch
+++ b/3.1.1/4435_grsec-kconfig-gentoo.patch
diff --git a/3.0.9/4437-grsec-kconfig-proc-user.patch b/3.1.1/4437-grsec-kconfig-proc-user.patch
index c588683..c588683 100644
--- a/3.0.9/4437-grsec-kconfig-proc-user.patch
+++ b/3.1.1/4437-grsec-kconfig-proc-user.patch
diff --git a/3.0.9/4440_selinux-avc_audit-log-curr_ip.patch b/3.1.1/4440_selinux-avc_audit-log-curr_ip.patch
index 0fd5d2d..0fd5d2d 100644
--- a/3.0.9/4440_selinux-avc_audit-log-curr_ip.patch
+++ b/3.1.1/4440_selinux-avc_audit-log-curr_ip.patch
diff --git a/3.0.9/4445_disable-compat_vdso.patch b/3.1.1/4445_disable-compat_vdso.patch
index 3b76b6c..3b76b6c 100644
--- a/3.0.9/4445_disable-compat_vdso.patch
+++ b/3.1.1/4445_disable-compat_vdso.patch