Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports-amanison

Conflicts:
	main/iaxmodem/APKBUILD

27 files changed, 21294 insertions, 15795 deletions

diff --git a/main/linux-grsec/0001-Staging-hv-fix-sleeping-while-atomic-issue.patch b/main/linux-grsec/0001-Staging-hv-fix-sleeping-while-atomic-issue.patch
new file mode 100644
index 0000000000..1133c7591b
--- /dev/null
+++ b/main/linux-grsec/0001-Staging-hv-fix-sleeping-while-atomic-issue.patch
@@ -0,0 +1,38 @@
+From 6ee51b8d69833b3cd00901999c36c59fbfde24aa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Fri, 10 Dec 2010 16:23:26 +0200
+Subject: [PATCH] Staging: hv: fix sleeping while atomic issue
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+osd_schedule_callback() is called from VmbusOnMsgDPC() which runs
+in a tasklet. Avoid possible sleeping by using GFP_ATOMIC for the
+memory allocation.
+
+Seems to fix #16701.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16701
+Cc: Haiyang Zhang <haiyangz@microsoft.com>
+Cc: Hank Janssen <hjanssen@microsoft.com>
+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+---
+ drivers/staging/hv/osd.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c
+index 8c3eb27..eb9b20d 100644
+--- a/drivers/staging/hv/osd.c
++++ b/drivers/staging/hv/osd.c
+@@ -214,7 +214,7 @@ int osd_schedule_callback(struct workqueue_struct *wq,
+ {
+ 	struct osd_callback_struct *cb;
+ 
+-	cb = kmalloc(sizeof(*cb), GFP_KERNEL);
++	cb = kmalloc(sizeof(*cb), GFP_ATOMIC);
+ 	if (!cb) {
+ 		printk(KERN_ERR "unable to allocate memory in osd_schedule_callback\n");
+ 		return -1;
+-- 
+1.7.1
+
diff --git a/main/linux-grsec/0001-grsec-revert-conflicting-flow-cache-changes.patch b/main/linux-grsec/0001-grsec-revert-conflicting-flow-cache-changes.patch
deleted file mode 100644
index 99571657b1..0000000000
--- a/main/linux-grsec/0001-grsec-revert-conflicting-flow-cache-changes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 5ea3677e1f26dd343ed139d2bdad23ae2f1393db Mon Sep 17 00:00:00 2001
-From: Timo Teras <timo.teras@iki.fi>
-Date: Mon, 12 Apr 2010 13:43:01 +0000
-Subject: [PATCH 01/18] grsec: revert conflicting flow cache changes
-
----
- net/core/flow.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/net/core/flow.c b/net/core/flow.c
-index 5b27992..9601587 100644
---- a/net/core/flow.c
-+++ b/net/core/flow.c
-@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(0);
- 
- static u32 flow_hash_shift;
- #define flow_hash_size	(1 << flow_hash_shift)
--static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables);
-+static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables) = { NULL };
- 
- #define flow_table(cpu) (per_cpu(flow_tables, cpu))
- 
-@@ -52,7 +52,7 @@ struct flow_percpu_info {
- 	u32 hash_rnd;
- 	int count;
- };
--static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info);
-+static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info) = { 0 };
- 
- #define flow_hash_rnd_recalc(cpu) \
- 	(per_cpu(flow_hash_info, cpu).hash_rnd_recalc)
-@@ -69,7 +69,7 @@ struct flow_flush_info {
- 	atomic_t cpuleft;
- 	struct completion completion;
- };
--static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets);
-+static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets) = { NULL };
- 
- #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
- 
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0001-xfrm-use-gre-key-as-flow-upper-protocol-info.patch b/main/linux-grsec/0001-xfrm-use-gre-key-as-flow-upper-protocol-info.patch
new file mode 100644
index 0000000000..4b260daccf
--- /dev/null
+++ b/main/linux-grsec/0001-xfrm-use-gre-key-as-flow-upper-protocol-info.patch
@@ -0,0 +1,139 @@
+From e4e3789c1d6d9cd30267c4395763577ceedd7015 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Thu, 18 Nov 2010 11:42:16 +0200
+Subject: [PATCH] xfrm: use gre key as flow upper protocol info
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The GRE Key field is intended to be used for identifying an individual
+traffic flow within a tunnel. It is useful to be able to have XFRM
+policy selector matches to have different policies for different
+GRE tunnels.
+
+Backported to linux-2.6.35 from the original version at:
+http://git.kernel.org/?p=linux/kernel/git/davem/net-next-2.6.git;
+a=commitdiff_plain;h=cc9ff19da9bf76a2f70bcb80225a1c587c162e52
+
+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+---
+ include/net/flow.h      |    2 ++
+ include/net/xfrm.h      |    6 ++++++
+ net/ipv4/ip_gre.c       |    9 ++++++---
+ net/ipv4/xfrm4_policy.c |   15 +++++++++++++++
+ 4 files changed, 29 insertions(+), 3 deletions(-)
+
+diff --git a/include/net/flow.h b/include/net/flow.h
+index bb08692..240b7f3 100644
+--- a/include/net/flow.h
++++ b/include/net/flow.h
+@@ -66,6 +66,7 @@ struct flowi {
+ 		} dnports;
+ 
+ 		__be32		spi;
++		__be32		gre_key;
+ 
+ 		struct {
+ 			__u8	type;
+@@ -77,6 +78,7 @@ struct flowi {
+ #define fl_icmp_code	uli_u.icmpt.code
+ #define fl_ipsec_spi	uli_u.spi
+ #define fl_mh_type	uli_u.mht.type
++#define fl_gre_key	uli_u.gre_key
+ 	__u32           secid;	/* used by xfrm; see secid.txt */
+ } __attribute__((__aligned__(BITS_PER_LONG/8)));
+ 
+diff --git a/include/net/xfrm.h b/include/net/xfrm.h
+index fc8f36d..1a57ff9 100644
+--- a/include/net/xfrm.h
++++ b/include/net/xfrm.h
+@@ -805,6 +805,9 @@ __be16 xfrm_flowi_sport(struct flowi *fl)
+ 	case IPPROTO_MH:
+ 		port = htons(fl->fl_mh_type);
+ 		break;
++	case IPPROTO_GRE:
++		port = htonl(fl->fl_gre_key) >> 16;
++		break;
+ 	default:
+ 		port = 0;	/*XXX*/
+ 	}
+@@ -826,6 +829,9 @@ __be16 xfrm_flowi_dport(struct flowi *fl)
+ 	case IPPROTO_ICMPV6:
+ 		port = htons(fl->fl_icmp_code);
+ 		break;
++	case IPPROTO_GRE:
++		port = htonl(fl->fl_gre_key) & 0xffff;
++		break;
+ 	default:
+ 		port = 0;	/*XXX*/
+ 	}
+diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
+index 32618e1..d490d67 100644
+--- a/net/ipv4/ip_gre.c
++++ b/net/ipv4/ip_gre.c
+@@ -739,7 +739,8 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
+ 					      { .daddr = dst,
+ 						.saddr = tiph->saddr,
+ 						.tos = RT_TOS(tos) } },
+-				    .proto = IPPROTO_GRE };
++				    .proto = IPPROTO_GRE,
++				    .fl_gre_key = tunnel->parms.o_key };
+ 		if (ip_route_output_key(dev_net(dev), &rt, &fl)) {
+ 			stats->tx_carrier_errors++;
+ 			goto tx_error;
+@@ -912,7 +913,8 @@ static int ipgre_tunnel_bind_dev(struct net_device *dev)
+ 					      { .daddr = iph->daddr,
+ 						.saddr = iph->saddr,
+ 						.tos = RT_TOS(iph->tos) } },
+-				    .proto = IPPROTO_GRE };
++				    .proto = IPPROTO_GRE,
++				    .fl_gre_key = tunnel->parms.o_key };
+ 		struct rtable *rt;
+ 		if (!ip_route_output_key(dev_net(dev), &rt, &fl)) {
+ 			tdev = rt->u.dst.dev;
+@@ -1170,7 +1172,8 @@ static int ipgre_open(struct net_device *dev)
+ 					      { .daddr = t->parms.iph.daddr,
+ 						.saddr = t->parms.iph.saddr,
+ 						.tos = RT_TOS(t->parms.iph.tos) } },
+-				    .proto = IPPROTO_GRE };
++				    .proto = IPPROTO_GRE,
++				    .fl_gre_key = t->parms.o_key };
+ 		struct rtable *rt;
+ 		if (ip_route_output_key(dev_net(dev), &rt, &fl))
+ 			return -EADDRNOTAVAIL;
+diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
+index 23883a4..ef36364 100644
+--- a/net/ipv4/xfrm4_policy.c
++++ b/net/ipv4/xfrm4_policy.c
+@@ -11,6 +11,7 @@
+ #include <linux/err.h>
+ #include <linux/kernel.h>
+ #include <linux/inetdevice.h>
++#include <linux/if_tunnel.h>
+ #include <net/dst.h>
+ #include <net/xfrm.h>
+ #include <net/ip.h>
+@@ -158,6 +159,20 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
+ 				fl->fl_ipsec_spi = htonl(ntohs(ipcomp_hdr[1]));
+ 			}
+ 			break;
++
++		case IPPROTO_GRE:
++			if (pskb_may_pull(skb, xprth + 12 - skb->data)) {
++				__be16 *greflags = (__be16 *)xprth;
++				__be32 *gre_hdr = (__be32 *)xprth;
++
++				if (greflags[0] & GRE_KEY) {
++					if (greflags[0] & GRE_CSUM)
++						gre_hdr++;
++					fl->fl_gre_key = gre_hdr[1];
++				}
++			}
++			break;
++
+ 		default:
+ 			fl->fl_ipsec_spi = 0;
+ 			break;
+-- 
+1.7.1
+
diff --git a/main/linux-grsec/0002-gre-fix-hard-header-destination-address-checking.patch b/main/linux-grsec/0002-gre-fix-hard-header-destination-address-checking.patch
deleted file mode 100644
index 36a0ae449a..0000000000
--- a/main/linux-grsec/0002-gre-fix-hard-header-destination-address-checking.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9082391046940c410eac3bad065c8701998b5cab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 3 Mar 2010 04:01:13 +0000
-Subject: [PATCH 02/18] gre: fix hard header destination address checking
-
-ipgre_header() can be called with zero daddr when the gre device is
-configured as multipoint tunnel and still has the NOARP flag set (which is
-typically cleared by the userspace arp daemon).  If the NOARP packets are
-not dropped, ipgre_tunnel_xmit() will take rt->rt_gateway (= NBMA IP) and
-use that for route look up (and may lead to bogus xfrm acquires).
-
-The multicast address check is removed as sending to multicast group should
-be ok.  In fact, if gre device has a multicast address as destination
-ipgre_header is always called with multicast address.
-
-Signed-off-by: Timo Teras <timo.teras@iki.fi>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 6d55cb91a0020ac0d78edcad61efd6c8cf5785a3)
----
- net/ipv4/ip_gre.c |    7 ++-----
- 1 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
-index 1433338..ac88ce5 100644
---- a/net/ipv4/ip_gre.c
-+++ b/net/ipv4/ip_gre.c
-@@ -1137,12 +1137,9 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev,
- 
- 	if (saddr)
- 		memcpy(&iph->saddr, saddr, 4);
--
--	if (daddr) {
-+	if (daddr)
- 		memcpy(&iph->daddr, daddr, 4);
--		return t->hlen;
--	}
--	if (iph->daddr && !ipv4_is_multicast(iph->daddr))
-+	if (iph->daddr)
- 		return t->hlen;
- 
- 	return -t->hlen;
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch b/main/linux-grsec/0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
deleted file mode 100644
index 61d7c9a6c1..0000000000
--- a/main/linux-grsec/0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From cd0e9d08480e1e0648e17d099ecf50f6fd8714e5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Sat, 20 Mar 2010 02:27:58 +0000
-Subject: [PATCH 03/18] ip_gre: include route header_len in max_headroom calculation
-
-Taking route's header_len into account, and updating gre device
-needed_headroom will give better hints on upper bound of required
-headroom. This is useful if the gre traffic is xfrm'ed.
-
-Signed-off-by: Timo Teras <timo.teras@iki.fi>
-Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 243aad830e8a4cdda261626fbaeddde16b08d04a)
----
- net/ipv4/ip_gre.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
-index ac88ce5..7f1ff73 100644
---- a/net/ipv4/ip_gre.c
-+++ b/net/ipv4/ip_gre.c
-@@ -803,11 +803,13 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
- 			tunnel->err_count = 0;
- 	}
- 
--	max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen;
-+	max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen + rt->u.dst.header_len;
- 
- 	if (skb_headroom(skb) < max_headroom || skb_shared(skb)||
- 	    (skb_cloned(skb) && !skb_clone_writable(skb, 0))) {
- 		struct sk_buff *new_skb = skb_realloc_headroom(skb, max_headroom);
-+		if (max_headroom > dev->needed_headroom)
-+			dev->needed_headroom = max_headroom;
- 		if (!new_skb) {
- 			ip_rt_put(rt);
- 			stats->tx_dropped++;
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch b/main/linux-grsec/0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch
new file mode 100644
index 0000000000..3ba0a1e314
--- /dev/null
+++ b/main/linux-grsec/0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch
@@ -0,0 +1,42 @@
+Subject: [PATCH] staging: hv: fix netvsc sleeping while atomic
+Date: Fri, 17 Dec 2010 11:40:24 +0200
+Message-Id: <1292578824-14408-1-git-send-email-timo.teras@iki.fi>
+X-Mailer: git-send-email 1.7.1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+X-Virus-Scanned: ClamAV using ClamSMTP
+Status: O
+Content-Length: 845
+Lines: 29
+
+The channel callbacks are called directly from vmbus_event_dpc
+which runs in tasklet context. These callbacks need to use
+GFP_ATOMIC.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16701
+
+Cc: Hank Janssen <hjanssen@microsoft.com>
+Cc: Haiyang Zhang <haiyangz@microsoft.com>
+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+---
+ drivers/staging/hv/netvsc.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
+index 8022781..3784923 100644
+--- a/drivers/staging/hv/netvsc.c
++++ b/drivers/staging/hv/netvsc.c
+@@ -1236,7 +1236,7 @@ static void NetVscOnChannelCallback(void *Context)
+ 	/* ASSERT(device); */
+ 
+ 	packet = kzalloc(NETVSC_PACKET_SIZE * sizeof(unsigned char),
+-			 GFP_KERNEL);
++			 GFP_ATOMIC);
+ 	if (!packet)
+ 		return;
+ 	buffer = packet;
+-- 
+1.7.1
+
+
diff --git a/main/linux-grsec/0005-r8169-fix-broken-register-writes.patch b/main/linux-grsec/0005-r8169-fix-broken-register-writes.patch
deleted file mode 100644
index bfa8df2900..0000000000
--- a/main/linux-grsec/0005-r8169-fix-broken-register-writes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 89f350c4ec426b4c1db6ef269546940365d918e1 Mon Sep 17 00:00:00 2001
-From: Francois Romieu <romieu@fr.zoreil.com>
-Date: Sat, 27 Mar 2010 19:35:46 -0700
-Subject: [PATCH 05/18] r8169: fix broken register writes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is quite similar to b39fe41f481d20c201012e4483e76c203802dda7
-though said registers are not even documented as 64-bit registers
-- as opposed to the initial TxDescStartAddress ones - but as single
-bytes which must be combined into 32 bits at the MMIO read/write
-level before being merged into a 64 bit logical entity.
-
-Credits go to Ben Hutchings <ben@decadent.org.uk> for the MAR
-registers (aka "multicast is broken for ages on ARM) and to
-Timo Teräs <timo.teras@iki.fi> for the MAC registers.
-
-Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 78f1cd02457252e1ffbc6caa44a17424a45286b8)
----
- drivers/net/r8169.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
-index 0fe2fc9..24599b5 100644
---- a/drivers/net/r8169.c
-+++ b/drivers/net/r8169.c
-@@ -2827,8 +2827,8 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)
- 	spin_lock_irq(&tp->lock);
- 
- 	RTL_W8(Cfg9346, Cfg9346_Unlock);
--	RTL_W32(MAC0, low);
- 	RTL_W32(MAC4, high);
-+	RTL_W32(MAC0, low);
- 	RTL_W8(Cfg9346, Cfg9346_Lock);
- 
- 	spin_unlock_irq(&tp->lock);
-@@ -4795,8 +4795,8 @@ static void rtl_set_rx_mode(struct net_device *dev)
- 		mc_filter[1] = swab32(data);
- 	}
- 
--	RTL_W32(MAR0 + 0, mc_filter[0]);
- 	RTL_W32(MAR0 + 4, mc_filter[1]);
-+	RTL_W32(MAR0 + 0, mc_filter[0]);
- 
- 	RTL_W32(RxConfig, tmp);
- 
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0007-r8169-Fix-rtl8169_rx_interrupt.patch b/main/linux-grsec/0007-r8169-Fix-rtl8169_rx_interrupt.patch
deleted file mode 100644
index fad2723284..0000000000
--- a/main/linux-grsec/0007-r8169-Fix-rtl8169_rx_interrupt.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 26654a966adb674afc30d285f7e79535d03c2492 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <eric.dumazet@gmail.com>
-Date: Wed, 31 Mar 2010 02:08:31 +0000
-Subject: [PATCH 07/18] r8169: Fix rtl8169_rx_interrupt()
-
-In case a reset is performed, rtl8169_rx_interrupt() is called from
-process context instead of softirq context. Special care must be taken
-to call appropriate network core services (netif_rx() instead of
-netif_receive_skb()). VLAN handling also corrected.
-
-Reported-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Tested-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Diagnosed-by: Oleg Nesterov <oleg@redhat.com>
-Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 630b943c182d1aed69f244405131902fbcba7ec6)
----
- drivers/net/r8169.c |   22 +++++++++++++++++-----
- 1 files changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
-index 1484528..bed1d47 100644
---- a/drivers/net/r8169.c
-+++ b/drivers/net/r8169.c
-@@ -1047,14 +1047,14 @@ static void rtl8169_vlan_rx_register(struct net_device *dev,
- }
- 
- static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc,
--			       struct sk_buff *skb)
-+			       struct sk_buff *skb, int polling)
- {
- 	u32 opts2 = le32_to_cpu(desc->opts2);
- 	struct vlan_group *vlgrp = tp->vlgrp;
- 	int ret;
- 
- 	if (vlgrp && (opts2 & RxVlanTag)) {
--		vlan_hwaccel_receive_skb(skb, vlgrp, swab16(opts2 & 0xffff));
-+		__vlan_hwaccel_rx(skb, vlgrp, swab16(opts2 & 0xffff), polling);
- 		ret = 0;
- 	} else
- 		ret = -1;
-@@ -1071,7 +1071,7 @@ static inline u32 rtl8169_tx_vlan_tag(struct rtl8169_private *tp,
- }
- 
- static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc,
--			       struct sk_buff *skb)
-+			       struct sk_buff *skb, int polling)
- {
- 	return -1;
- }
-@@ -4480,12 +4480,20 @@ out:
- 	return done;
- }
- 
-+/*
-+ * Warning : rtl8169_rx_interrupt() might be called :
-+ * 1) from NAPI (softirq) context
-+ *	(polling = 1 : we should call netif_receive_skb())
-+ * 2) from process context (rtl8169_reset_task())
-+ *	(polling = 0 : we must call netif_rx() instead)
-+ */
- static int rtl8169_rx_interrupt(struct net_device *dev,
- 				struct rtl8169_private *tp,
- 				void __iomem *ioaddr, u32 budget)
- {
- 	unsigned int cur_rx, rx_left;
- 	unsigned int delta, count;
-+	int polling = (budget != ~(u32)0) ? 1 : 0;
- 
- 	cur_rx = tp->cur_rx;
- 	rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx;
-@@ -4550,8 +4558,12 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
- 			skb_put(skb, pkt_size);
- 			skb->protocol = eth_type_trans(skb, dev);
- 
--			if (rtl8169_rx_vlan_skb(tp, desc, skb) < 0)
--				netif_receive_skb(skb);
-+			if (rtl8169_rx_vlan_skb(tp, desc, skb, polling) < 0) {
-+				if (likely(polling))
-+					netif_receive_skb(skb);
-+				else
-+					netif_rx(skb);
-+			}
- 
- 			dev->stats.rx_bytes += pkt_size;
- 			dev->stats.rx_packets++;
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0009-ipsec-Fix-bogus-bundle-flowi.patch b/main/linux-grsec/0009-ipsec-Fix-bogus-bundle-flowi.patch
deleted file mode 100644
index d4de0e1d58..0000000000
--- a/main/linux-grsec/0009-ipsec-Fix-bogus-bundle-flowi.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 21ee14f92ef1b6d4ca965c9b59135f3462919631 Mon Sep 17 00:00:00 2001
-From: Herbert Xu <herbert@gondor.apana.org.au>
-Date: Tue, 2 Mar 2010 02:51:56 +0000
-Subject: [PATCH 09/18] ipsec: Fix bogus bundle flowi
-
-When I merged the bundle creation code, I introduced a bogus
-flowi value in the bundle.  Instead of getting from the caller,
-it was instead set to the flow in the route object, which is
-totally different.
-
-The end result is that the bundles we created never match, and
-we instead end up with an ever growing bundle list.
-
-Thanks to Jamal for find this problem.
-
-Reported-by: Jamal Hadi Salim <hadi@cyberus.ca>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
-Acked-by: Jamal Hadi Salim <hadi@cyberus.ca>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9)
----
- include/net/xfrm.h      |    3 ++-
- net/ipv4/xfrm4_policy.c |    5 +++--
- net/ipv6/xfrm6_policy.c |    3 ++-
- net/xfrm/xfrm_policy.c  |    7 ++++---
- 4 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/include/net/xfrm.h b/include/net/xfrm.h
-index 223e90a..6960be2 100644
---- a/include/net/xfrm.h
-+++ b/include/net/xfrm.h
-@@ -273,7 +273,8 @@ struct xfrm_policy_afinfo {
- 					     struct dst_entry *dst,
- 					     int nfheader_len);
- 	int			(*fill_dst)(struct xfrm_dst *xdst,
--					    struct net_device *dev);
-+					    struct net_device *dev,
-+					    struct flowi *fl);
- };
- 
- extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
-diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
-index 74fb2eb..7009886 100644
---- a/net/ipv4/xfrm4_policy.c
-+++ b/net/ipv4/xfrm4_policy.c
-@@ -92,11 +92,12 @@ static int xfrm4_init_path(struct xfrm_dst *path, struct dst_entry *dst,
- 	return 0;
- }
- 
--static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev)
-+static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
-+			  struct flowi *fl)
- {
- 	struct rtable *rt = (struct rtable *)xdst->route;
- 
--	xdst->u.rt.fl = rt->fl;
-+	xdst->u.rt.fl = *fl;
- 
- 	xdst->u.dst.dev = dev;
- 	dev_hold(dev);
-diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
-index 8ec3d45..3f89ab7 100644
---- a/net/ipv6/xfrm6_policy.c
-+++ b/net/ipv6/xfrm6_policy.c
-@@ -117,7 +117,8 @@ static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst,
- 	return 0;
- }
- 
--static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev)
-+static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
-+			  struct flowi *fl)
- {
- 	struct rt6_info *rt = (struct rt6_info*)xdst->route;
- 
-diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index cb81ca3..d75047c 100644
---- a/net/xfrm/xfrm_policy.c
-+++ b/net/xfrm/xfrm_policy.c
-@@ -1341,7 +1341,8 @@ static inline int xfrm_init_path(struct xfrm_dst *path, struct dst_entry *dst,
- 	return err;
- }
- 
--static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev)
-+static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
-+				struct flowi *fl)
- {
- 	struct xfrm_policy_afinfo *afinfo =
- 		xfrm_policy_get_afinfo(xdst->u.dst.ops->family);
-@@ -1350,7 +1351,7 @@ static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev)
- 	if (!afinfo)
- 		return -EINVAL;
- 
--	err = afinfo->fill_dst(xdst, dev);
-+	err = afinfo->fill_dst(xdst, dev, fl);
- 
- 	xfrm_policy_put_afinfo(afinfo);
- 
-@@ -1454,7 +1455,7 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy,
- 	for (dst_prev = dst0; dst_prev != dst; dst_prev = dst_prev->child) {
- 		struct xfrm_dst *xdst = (struct xfrm_dst *)dst_prev;
- 
--		err = xfrm_fill_dst(xdst, dev);
-+		err = xfrm_fill_dst(xdst, dev, fl);
- 		if (err)
- 			goto free_dst;
- 
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0010-xfrm-Remove-xfrm_state_genid.patch b/main/linux-grsec/0010-xfrm-Remove-xfrm_state_genid.patch
deleted file mode 100644
index 8cfffd7398..0000000000
--- a/main/linux-grsec/0010-xfrm-Remove-xfrm_state_genid.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From f2c59932757a06851bb740dc757ce2ba1961fc08 Mon Sep 17 00:00:00 2001
-From: Herbert Xu <herbert@gondor.apana.org.au>
-Date: Wed, 31 Mar 2010 01:19:49 +0000
-Subject: [PATCH 10/18] xfrm: Remove xfrm_state_genid
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The xfrm state genid only needs to be matched against the copy
-saved in xfrm_dst.  So we don't need a global genid at all.  In
-fact, we don't even need to initialise it.
-
-Based on observation by Timo Teräs.
-
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 34996cb91dd72f0b0456d8fd3fef4aaee62232f2)
----
- net/xfrm/xfrm_state.c |    5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
-
-diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
-index f2f7c63..8ee733f 100644
---- a/net/xfrm/xfrm_state.c
-+++ b/net/xfrm/xfrm_state.c
-@@ -34,7 +34,6 @@
- static DEFINE_SPINLOCK(xfrm_state_lock);
- 
- static unsigned int xfrm_state_hashmax __read_mostly = 1 * 1024 * 1024;
--static unsigned int xfrm_state_genid;
- 
- static struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned int family);
- static void xfrm_state_put_afinfo(struct xfrm_state_afinfo *afinfo);
-@@ -903,8 +902,6 @@ static void __xfrm_state_insert(struct xfrm_state *x)
- 	struct net *net = xs_net(x);
- 	unsigned int h;
- 
--	x->genid = ++xfrm_state_genid;
--
- 	list_add(&x->km.all, &net->xfrm.state_all);
- 
- 	h = xfrm_dst_hash(net, &x->id.daddr, &x->props.saddr,
-@@ -948,7 +945,7 @@ static void __xfrm_state_bump_genids(struct xfrm_state *xnew)
- 		    x->props.reqid	== reqid &&
- 		    !xfrm_addr_cmp(&x->id.daddr, &xnew->id.daddr, family) &&
- 		    !xfrm_addr_cmp(&x->props.saddr, &xnew->props.saddr, family))
--			x->genid = xfrm_state_genid;
-+			x->genid++;
- 	}
- }
- 
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch b/main/linux-grsec/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
deleted file mode 100644
index ae2a0f9100..0000000000
--- a/main/linux-grsec/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5b3e87bccb0e48f2f8b78695e949c015a3695f8e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 31 Mar 2010 00:17:04 +0000
-Subject: [PATCH 11/18] xfrm_user: verify policy direction at XFRM_MSG_POLEXPIRE handler
-
-Add missing check for policy direction verification. This is
-especially important since without this xfrm_user may end up
-deleting per-socket policy which is not allowed.
-
-Signed-off-by: Timo Teras <timo.teras@iki.fi>
-Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit c8bf4d04f970fafb3430d332533e1cf103f2a018)
----
- net/xfrm/xfrm_user.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
-index b95a2d6..d1e9ee3 100644
---- a/net/xfrm/xfrm_user.c
-+++ b/net/xfrm/xfrm_user.c
-@@ -1589,6 +1589,10 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
- 	if (err)
- 		return err;
- 
-+	err = verify_policy_dir(p->dir);
-+	if (err)
-+		return err;
-+
- 	if (p->index)
- 		xp = xfrm_policy_byid(net, type, p->dir, p->index, 0, &err);
- 	else {
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch b/main/linux-grsec/0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch
deleted file mode 100644
index 222caaddfd..0000000000
--- a/main/linux-grsec/0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 7a400eb025dd53883c3560d0fdb069542f7ad3db Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 31 Mar 2010 00:17:05 +0000
-Subject: [PATCH 12/18] xfrm: remove policy lock when accessing policy->walk.dead
-
-All of the code considers ->dead as a hint that the cached policy
-needs to get refreshed. The read side can just drop the read lock
-without any side effects.
-
-The write side needs to make sure that it's written only exactly
-once. Only possible race is at xfrm_policy_kill(). This is fixed
-by checking result of __xfrm_policy_unlink() when needed. It will
-always succeed if the policy object is looked up from the hash
-list (so some checks are removed), but it needs to be checked if
-we are trying to unlink policy via a reference (appropriate
-checks added).
-
-Since policy->walk.dead is written exactly once, it no longer
-needs to be protected with a write lock.
-
-Signed-off-by: Timo Teras <timo.teras@iki.fi>
-Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(backported from commit ea2dea9dacc256fe927857feb423872051642ae7)
----
- net/xfrm/xfrm_policy.c |   20 +++++---------------
- net/xfrm/xfrm_user.c   |    6 +-----
- 2 files changed, 6 insertions(+), 20 deletions(-)
-
-diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index d75047c..110184f 100644
---- a/net/xfrm/xfrm_policy.c
-+++ b/net/xfrm/xfrm_policy.c
-@@ -156,7 +156,7 @@ static void xfrm_policy_timer(unsigned long data)
- 
- 	read_lock(&xp->lock);
- 
--	if (xp->walk.dead)
-+	if (unlikely(xp->walk.dead))
- 		goto out;
- 
- 	dir = xfrm_policy_id2dir(xp->index);
-@@ -297,17 +297,7 @@ static DECLARE_WORK(xfrm_policy_gc_work, xfrm_policy_gc_task);
- 
- static void xfrm_policy_kill(struct xfrm_policy *policy)
- {
--	int dead;
--
--	write_lock_bh(&policy->lock);
--	dead = policy->walk.dead;
- 	policy->walk.dead = 1;
--	write_unlock_bh(&policy->lock);
--
--	if (unlikely(dead)) {
--		WARN_ON(1);
--		return;
--	}
- 
- 	spin_lock_bh(&xfrm_policy_gc_lock);
- 	hlist_add_head(&policy->bydst, &xfrm_policy_gc_list);
-@@ -1115,6 +1105,9 @@ int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol)
- 		__xfrm_policy_link(pol, XFRM_POLICY_MAX+dir);
- 	}
- 	if (old_pol)
-+		/* Unlinking succeeds always. This is the only function
-+		 * allowed to delete or replace socket policy.
-+		 */
- 		__xfrm_policy_unlink(old_pol, XFRM_POLICY_MAX+dir);
- 	write_unlock_bh(&xfrm_policy_lock);
- 
-@@ -1705,11 +1698,8 @@ restart:
- 			goto error;
- 		}
- 
--		for (pi = 0; pi < npols; pi++) {
--			read_lock_bh(&pols[pi]->lock);
-+		for (pi = 0; pi < npols; pi++)
- 			pol_dead |= pols[pi]->walk.dead;
--			read_unlock_bh(&pols[pi]->lock);
--		}
- 
- 		write_lock_bh(&policy->lock);
- 		if (unlikely(pol_dead || stale_bundle(dst))) {
-diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
-index d1e9ee3..f9c56e9 100644
---- a/net/xfrm/xfrm_user.c
-+++ b/net/xfrm/xfrm_user.c
-@@ -1617,13 +1617,9 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
- 	if (xp == NULL)
- 		return -ENOENT;
- 
--	read_lock(&xp->lock);
--	if (xp->walk.dead) {
--		read_unlock(&xp->lock);
-+	if (unlikely(xp->walk.dead))
- 		goto out;
--	}
- 
--	read_unlock(&xp->lock);
- 	err = 0;
- 	if (up->hard) {
- 		uid_t loginuid = NETLINK_CB(skb).loginuid;
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0013-flow-structurize-flow-cache.patch b/main/linux-grsec/0013-flow-structurize-flow-cache.patch
deleted file mode 100644
index 68fa753a2c..0000000000
--- a/main/linux-grsec/0013-flow-structurize-flow-cache.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-From 884f6e44f0b405c06bd234b14cc228482291bb38 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 31 Mar 2010 00:17:06 +0000
-Subject: [PATCH 13/18] flow: structurize flow cache
-
-Group all per-cpu data to one structure instead of having many
-globals. Also prepare the internals so that we can have multiple
-instances of the flow cache if needed.
-
-Only the kmem_cache is left as a global as all flow caches share
-the same element size, and benefit from using a common cache.
-
-Signed-off-by: Timo Teras <timo.teras@iki.fi>
-Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit d7997fe1f4584da12e9c29fb682c18e9bdc13b73)
----
- net/core/flow.c |  223 +++++++++++++++++++++++++++++--------------------------
- 1 files changed, 119 insertions(+), 104 deletions(-)
-
-diff --git a/net/core/flow.c b/net/core/flow.c
-index 9601587..1d27ca6 100644
---- a/net/core/flow.c
-+++ b/net/core/flow.c
-@@ -35,104 +35,105 @@ struct flow_cache_entry {
- 	atomic_t		*object_ref;
- };
- 
--atomic_t flow_cache_genid = ATOMIC_INIT(0);
--
--static u32 flow_hash_shift;
--#define flow_hash_size	(1 << flow_hash_shift)
--static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables) = { NULL };
--
--#define flow_table(cpu) (per_cpu(flow_tables, cpu))
--
--static struct kmem_cache *flow_cachep __read_mostly;
--
--static int flow_lwm, flow_hwm;
--
--struct flow_percpu_info {
--	int hash_rnd_recalc;
--	u32 hash_rnd;
--	int count;
-+struct flow_cache_percpu {
-+	struct flow_cache_entry **	hash_table;
-+	int				hash_count;
-+	u32				hash_rnd;
-+	int				hash_rnd_recalc;
-+	struct tasklet_struct		flush_tasklet;
- };
--static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info) = { 0 };
--
--#define flow_hash_rnd_recalc(cpu) \
--	(per_cpu(flow_hash_info, cpu).hash_rnd_recalc)
--#define flow_hash_rnd(cpu) \
--	(per_cpu(flow_hash_info, cpu).hash_rnd)
--#define flow_count(cpu) \
--	(per_cpu(flow_hash_info, cpu).count)
--
--static struct timer_list flow_hash_rnd_timer;
--
--#define FLOW_HASH_RND_PERIOD	(10 * 60 * HZ)
- 
- struct flow_flush_info {
--	atomic_t cpuleft;
--	struct completion completion;
-+	struct flow_cache *		cache;
-+	atomic_t			cpuleft;
-+	struct completion		completion;
- };
--static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets) = { NULL };
- 
--#define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
-+struct flow_cache {
-+	u32				hash_shift;
-+	unsigned long			order;
-+	struct flow_cache_percpu *	percpu;
-+	struct notifier_block		hotcpu_notifier;
-+	int				low_watermark;
-+	int				high_watermark;
-+	struct timer_list		rnd_timer;
-+};
-+
-+atomic_t flow_cache_genid = ATOMIC_INIT(0);
-+static struct flow_cache flow_cache_global;
-+static struct kmem_cache *flow_cachep;
-+
-+#define flow_cache_hash_size(cache)	(1 << (cache)->hash_shift)
-+#define FLOW_HASH_RND_PERIOD		(10 * 60 * HZ)
- 
- static void flow_cache_new_hashrnd(unsigned long arg)
- {
-+	struct flow_cache *fc = (void *) arg;
- 	int i;
- 
- 	for_each_possible_cpu(i)
--		flow_hash_rnd_recalc(i) = 1;
-+		per_cpu_ptr(fc->percpu, i)->hash_rnd_recalc = 1;
- 
--	flow_hash_rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD;
--	add_timer(&flow_hash_rnd_timer);
-+	fc->rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD;
-+	add_timer(&fc->rnd_timer);
- }
- 
--static void flow_entry_kill(int cpu, struct flow_cache_entry *fle)
-+static void flow_entry_kill(struct flow_cache *fc,
-+			    struct flow_cache_percpu *fcp,
-+			    struct flow_cache_entry *fle)
- {
- 	if (fle->object)
- 		atomic_dec(fle->object_ref);
- 	kmem_cache_free(flow_cachep, fle);
--	flow_count(cpu)--;
-+	fcp->hash_count--;
- }
- 
--static void __flow_cache_shrink(int cpu, int shrink_to)
-+static void __flow_cache_shrink(struct flow_cache *fc,
-+				struct flow_cache_percpu *fcp,
-+				int shrink_to)
- {
- 	struct flow_cache_entry *fle, **flp;
- 	int i;
- 
--	for (i = 0; i < flow_hash_size; i++) {
-+	for (i = 0; i < flow_cache_hash_size(fc); i++) {
- 		int k = 0;
- 
--		flp = &flow_table(cpu)[i];
-+		flp = &fcp->hash_table[i];
- 		while ((fle = *flp) != NULL && k < shrink_to) {
- 			k++;
- 			flp = &fle->next;
- 		}
- 		while ((fle = *flp) != NULL) {
- 			*flp = fle->next;
--			flow_entry_kill(cpu, fle);
-+			flow_entry_kill(fc, fcp, fle);
- 		}
- 	}
- }
- 
--static void flow_cache_shrink(int cpu)
-+static void flow_cache_shrink(struct flow_cache *fc,
-+			      struct flow_cache_percpu *fcp)
- {
--	int shrink_to = flow_lwm / flow_hash_size;
-+	int shrink_to = fc->low_watermark / flow_cache_hash_size(fc);
- 
--	__flow_cache_shrink(cpu, shrink_to);
-+	__flow_cache_shrink(fc, fcp, shrink_to);
- }
- 
--static void flow_new_hash_rnd(int cpu)
-+static void flow_new_hash_rnd(struct flow_cache *fc,
-+			      struct flow_cache_percpu *fcp)
- {
--	get_random_bytes(&flow_hash_rnd(cpu), sizeof(u32));
--	flow_hash_rnd_recalc(cpu) = 0;
--
--	__flow_cache_shrink(cpu, 0);
-+	get_random_bytes(&fcp->hash_rnd, sizeof(u32));
-+	fcp->hash_rnd_recalc = 0;
-+	__flow_cache_shrink(fc, fcp, 0);
- }
- 
--static u32 flow_hash_code(struct flowi *key, int cpu)
-+static u32 flow_hash_code(struct flow_cache *fc,
-+			  struct flow_cache_percpu *fcp,
-+			  struct flowi *key)
- {
- 	u32 *k = (u32 *) key;
- 
--	return (jhash2(k, (sizeof(*key) / sizeof(u32)), flow_hash_rnd(cpu)) &
--		(flow_hash_size - 1));
-+	return (jhash2(k, (sizeof(*key) / sizeof(u32)), fcp->hash_rnd)
-+		& (flow_cache_hash_size(fc) - 1));
- }
- 
- #if (BITS_PER_LONG == 64)
-@@ -168,24 +169,25 @@ static int flow_key_compare(struct flowi *key1, struct flowi *key2)
- void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
- 			flow_resolve_t resolver)
- {
-+	struct flow_cache *fc = &flow_cache_global;
-+	struct flow_cache_percpu *fcp;
- 	struct flow_cache_entry *fle, **head;
- 	unsigned int hash;
--	int cpu;
- 
- 	local_bh_disable();
--	cpu = smp_processor_id();
-+	fcp = per_cpu_ptr(fc->percpu, smp_processor_id());
- 
- 	fle = NULL;
- 	/* Packet really early in init?  Making flow_cache_init a
- 	 * pre-smp initcall would solve this.  --RR */
--	if (!flow_table(cpu))
-+	if (!fcp->hash_table)
- 		goto nocache;
- 
--	if (flow_hash_rnd_recalc(cpu))
--		flow_new_hash_rnd(cpu);
--	hash = flow_hash_code(key, cpu);
-+	if (fcp->hash_rnd_recalc)
-+		flow_new_hash_rnd(fc, fcp);
-+	hash = flow_hash_code(fc, fcp, key);
- 
--	head = &flow_table(cpu)[hash];
-+	head = &fcp->hash_table[hash];
- 	for (fle = *head; fle; fle = fle->next) {
- 		if (fle->family == family &&
- 		    fle->dir == dir &&
-@@ -204,8 +206,8 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
- 	}
- 
- 	if (!fle) {
--		if (flow_count(cpu) > flow_hwm)
--			flow_cache_shrink(cpu);
-+		if (fcp->hash_count > fc->high_watermark)
-+			flow_cache_shrink(fc, fcp);
- 
- 		fle = kmem_cache_alloc(flow_cachep, GFP_ATOMIC);
- 		if (fle) {
-@@ -215,7 +217,7 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
- 			fle->dir = dir;
- 			memcpy(&fle->key, key, sizeof(*key));
- 			fle->object = NULL;
--			flow_count(cpu)++;
-+			fcp->hash_count++;
- 		}
- 	}
- 
-@@ -249,14 +251,15 @@ nocache:
- static void flow_cache_flush_tasklet(unsigned long data)
- {
- 	struct flow_flush_info *info = (void *)data;
-+	struct flow_cache *fc = info->cache;
-+	struct flow_cache_percpu *fcp;
- 	int i;
--	int cpu;
- 
--	cpu = smp_processor_id();
--	for (i = 0; i < flow_hash_size; i++) {
-+	fcp = per_cpu_ptr(fc->percpu, smp_processor_id());
-+	for (i = 0; i < flow_cache_hash_size(fc); i++) {
- 		struct flow_cache_entry *fle;
- 
--		fle = flow_table(cpu)[i];
-+		fle = fcp->hash_table[i];
- 		for (; fle; fle = fle->next) {
- 			unsigned genid = atomic_read(&flow_cache_genid);
- 
-@@ -272,7 +275,6 @@ static void flow_cache_flush_tasklet(unsigned long data)
- 		complete(&info->completion);
- }
- 
--static void flow_cache_flush_per_cpu(void *) __attribute__((__unused__));
- static void flow_cache_flush_per_cpu(void *data)
- {
- 	struct flow_flush_info *info = data;
-@@ -280,8 +282,7 @@ static void flow_cache_flush_per_cpu(void *data)
- 	struct tasklet_struct *tasklet;
- 
- 	cpu = smp_processor_id();
--
--	tasklet = flow_flush_tasklet(cpu);
-+	tasklet = &per_cpu_ptr(info->cache->percpu, cpu)->flush_tasklet;
- 	tasklet->data = (unsigned long)info;
- 	tasklet_schedule(tasklet);
- }
-@@ -294,6 +295,7 @@ void flow_cache_flush(void)
- 	/* Don't want cpus going down or up during this. */
- 	get_online_cpus();
- 	mutex_lock(&flow_flush_sem);
-+	info.cache = &flow_cache_global;
- 	atomic_set(&info.cpuleft, num_online_cpus());
- 	init_completion(&info.completion);
- 
-@@ -307,62 +309,75 @@ void flow_cache_flush(void)
- 	put_online_cpus();
- }
- 
--static void __init flow_cache_cpu_prepare(int cpu)
-+static void __init flow_cache_cpu_prepare(struct flow_cache *fc,
-+					  struct flow_cache_percpu *fcp)
- {
--	struct tasklet_struct *tasklet;
--	unsigned long order;
--
--	for (order = 0;
--	     (PAGE_SIZE << order) <
--		     (sizeof(struct flow_cache_entry *)*flow_hash_size);
--	     order++)
--		/* NOTHING */;
--
--	flow_table(cpu) = (struct flow_cache_entry **)
--		__get_free_pages(GFP_KERNEL|__GFP_ZERO, order);
--	if (!flow_table(cpu))
--		panic("NET: failed to allocate flow cache order %lu\n", order);
--
--	flow_hash_rnd_recalc(cpu) = 1;
--	flow_count(cpu) = 0;
--
--	tasklet = flow_flush_tasklet(cpu);
--	tasklet_init(tasklet, flow_cache_flush_tasklet, 0);
-+	fcp->hash_table = (struct flow_cache_entry **)
-+		__get_free_pages(GFP_KERNEL|__GFP_ZERO, fc->order);
-+	if (!fcp->hash_table)
-+		panic("NET: failed to allocate flow cache order %lu\n", fc->order);
-+
-+	fcp->hash_rnd_recalc = 1;
-+	fcp->hash_count = 0;
-+	tasklet_init(&fcp->flush_tasklet, flow_cache_flush_tasklet, 0);
- }
- 
- static int flow_cache_cpu(struct notifier_block *nfb,
- 			  unsigned long action,
- 			  void *hcpu)
- {
-+	struct flow_cache *fc = container_of(nfb, struct flow_cache, hotcpu_notifier);
-+	int cpu = (unsigned long) hcpu;
-+	struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, cpu);
-+
- 	if (action == CPU_DEAD || action == CPU_DEAD_FROZEN)
--		__flow_cache_shrink((unsigned long)hcpu, 0);
-+		__flow_cache_shrink(fc, fcp, 0);
- 	return NOTIFY_OK;
- }
- 
--static int __init flow_cache_init(void)
-+static int flow_cache_init(struct flow_cache *fc)
- {
-+	unsigned long order;
- 	int i;
- 
--	flow_cachep = kmem_cache_create("flow_cache",
--					sizeof(struct flow_cache_entry),
--					0, SLAB_PANIC,
--					NULL);
--	flow_hash_shift = 10;
--	flow_lwm = 2 * flow_hash_size;
--	flow_hwm = 4 * flow_hash_size;
-+	fc->hash_shift = 10;
-+	fc->low_watermark = 2 * flow_cache_hash_size(fc);
-+	fc->high_watermark = 4 * flow_cache_hash_size(fc);
-+
-+	for (order = 0;
-+	     (PAGE_SIZE << order) <
-+		     (sizeof(struct flow_cache_entry *)*flow_cache_hash_size(fc));
-+	     order++)
-+		/* NOTHING */;
-+	fc->order = order;
-+	fc->percpu = alloc_percpu(struct flow_cache_percpu);
- 
--	setup_timer(&flow_hash_rnd_timer, flow_cache_new_hashrnd, 0);
--	flow_hash_rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD;
--	add_timer(&flow_hash_rnd_timer);
-+	setup_timer(&fc->rnd_timer, flow_cache_new_hashrnd,
-+		    (unsigned long) fc);
-+	fc->rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD;
-+	add_timer(&fc->rnd_timer);
- 
- 	for_each_possible_cpu(i)
--		flow_cache_cpu_prepare(i);
-+		flow_cache_cpu_prepare(fc, per_cpu_ptr(fc->percpu, i));
-+
-+	fc->hotcpu_notifier = (struct notifier_block){
-+		.notifier_call = flow_cache_cpu,
-+	};
-+	register_hotcpu_notifier(&fc->hotcpu_notifier);
- 
--	hotcpu_notifier(flow_cache_cpu, 0);
- 	return 0;
- }
- 
--module_init(flow_cache_init);
-+static int __init flow_cache_init_global(void)
-+{
-+	flow_cachep = kmem_cache_create("flow_cache",
-+					sizeof(struct flow_cache_entry),
-+					0, SLAB_PANIC, NULL);
-+
-+	return flow_cache_init(&flow_cache_global);
-+}
-+
-+module_init(flow_cache_init_global);
- 
- EXPORT_SYMBOL(flow_cache_genid);
- EXPORT_SYMBOL(flow_cache_lookup);
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0014-flow-virtualize-flow-cache-entry-methods.patch b/main/linux-grsec/0014-flow-virtualize-flow-cache-entry-methods.patch
deleted file mode 100644
index 5c4a9ea594..0000000000
--- a/main/linux-grsec/0014-flow-virtualize-flow-cache-entry-methods.patch
+++ /dev/null
@@ -1,513 +0,0 @@
-From d56cd1c538e5448fe43acc69991aa842f382a622 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 7 Apr 2010 00:30:04 +0000
-Subject: [PATCH 14/18] flow: virtualize flow cache entry methods
-
-This allows to validate the cached object before returning it.
-It also allows to destruct object properly, if the last reference
-was held in flow cache. This is also a prepartion for caching
-bundles in the flow cache.
-
-In return for virtualizing the methods, we save on:
-- not having to regenerate the whole flow cache on policy removal:
-  each flow matching a killed policy gets refreshed as the getter
-  function notices it smartly.
-- we do not have to call flow_cache_flush from policy gc, since the
-  flow cache now properly deletes the object if it had any references
-
-Signed-off-by: Timo Teras <timo.teras@iki.fi>
-Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(backported from commit fe1a5f031e76bd8761a7803d75b95ee96e84a574)
----
- include/net/flow.h     |   23 +++++++--
- include/net/xfrm.h     |    3 +
- net/core/flow.c        |  128 +++++++++++++++++++++++++----------------------
- net/xfrm/xfrm_policy.c |  111 ++++++++++++++++++++++++++++--------------
- 4 files changed, 164 insertions(+), 101 deletions(-)
-
-diff --git a/include/net/flow.h b/include/net/flow.h
-index 809970b..bb08692 100644
---- a/include/net/flow.h
-+++ b/include/net/flow.h
-@@ -86,11 +86,26 @@ struct flowi {
- 
- struct net;
- struct sock;
--typedef int (*flow_resolve_t)(struct net *net, struct flowi *key, u16 family,
--			      u8 dir, void **objp, atomic_t **obj_refp);
-+struct flow_cache_ops;
-+
-+struct flow_cache_object {
-+	const struct flow_cache_ops *ops;
-+};
-+
-+struct flow_cache_ops {
-+	struct flow_cache_object *(*get)(struct flow_cache_object *);
-+	int (*check)(struct flow_cache_object *);
-+	void (*delete)(struct flow_cache_object *);
-+};
-+
-+typedef struct flow_cache_object *(*flow_resolve_t)(
-+		struct net *net, struct flowi *key, u16 family,
-+		u8 dir, struct flow_cache_object *oldobj, void *ctx);
-+
-+extern struct flow_cache_object *flow_cache_lookup(
-+		struct net *net, struct flowi *key, u16 family,
-+		u8 dir, flow_resolve_t resolver, void *ctx);
- 
--extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family,
--			       u8 dir, flow_resolve_t resolver);
- extern void flow_cache_flush(void);
- extern atomic_t flow_cache_genid;
- 
-diff --git a/include/net/xfrm.h b/include/net/xfrm.h
-index 6960be2..6023a48 100644
---- a/include/net/xfrm.h
-+++ b/include/net/xfrm.h
-@@ -19,6 +19,8 @@
- #include <net/route.h>
- #include <net/ipv6.h>
- #include <net/ip6_fib.h>
-+#include <net/flow.h>
-+
- #ifdef CONFIG_XFRM_STATISTICS
- #include <net/snmp.h>
- #endif
-@@ -482,6 +484,7 @@ struct xfrm_policy
- 	atomic_t		refcnt;
- 	struct timer_list	timer;
- 
-+	struct flow_cache_object flo;
- 	u32			priority;
- 	u32			index;
- 	struct xfrm_selector	selector;
-diff --git a/net/core/flow.c b/net/core/flow.c
-index 1d27ca6..521df52 100644
---- a/net/core/flow.c
-+++ b/net/core/flow.c
-@@ -26,17 +26,16 @@
- #include <linux/security.h>
- 
- struct flow_cache_entry {
--	struct flow_cache_entry	*next;
--	u16			family;
--	u8			dir;
--	u32			genid;
--	struct flowi		key;
--	void			*object;
--	atomic_t		*object_ref;
-+	struct flow_cache_entry		*next;
-+	u16				family;
-+	u8				dir;
-+	u32				genid;
-+	struct flowi			key;
-+	struct flow_cache_object	*object;
- };
- 
- struct flow_cache_percpu {
--	struct flow_cache_entry **	hash_table;
-+	struct flow_cache_entry		**hash_table;
- 	int				hash_count;
- 	u32				hash_rnd;
- 	int				hash_rnd_recalc;
-@@ -44,7 +43,7 @@ struct flow_cache_percpu {
- };
- 
- struct flow_flush_info {
--	struct flow_cache *		cache;
-+	struct flow_cache		*cache;
- 	atomic_t			cpuleft;
- 	struct completion		completion;
- };
-@@ -52,7 +51,7 @@ struct flow_flush_info {
- struct flow_cache {
- 	u32				hash_shift;
- 	unsigned long			order;
--	struct flow_cache_percpu *	percpu;
-+	struct flow_cache_percpu	*percpu;
- 	struct notifier_block		hotcpu_notifier;
- 	int				low_watermark;
- 	int				high_watermark;
-@@ -78,12 +77,21 @@ static void flow_cache_new_hashrnd(unsigned long arg)
- 	add_timer(&fc->rnd_timer);
- }
- 
-+static int flow_entry_valid(struct flow_cache_entry *fle)
-+{
-+	if (atomic_read(&flow_cache_genid) != fle->genid)
-+		return 0;
-+	if (fle->object && !fle->object->ops->check(fle->object))
-+		return 0;
-+	return 1;
-+}
-+
- static void flow_entry_kill(struct flow_cache *fc,
- 			    struct flow_cache_percpu *fcp,
- 			    struct flow_cache_entry *fle)
- {
- 	if (fle->object)
--		atomic_dec(fle->object_ref);
-+		fle->object->ops->delete(fle->object);
- 	kmem_cache_free(flow_cachep, fle);
- 	fcp->hash_count--;
- }
-@@ -96,16 +104,18 @@ static void __flow_cache_shrink(struct flow_cache *fc,
- 	int i;
- 
- 	for (i = 0; i < flow_cache_hash_size(fc); i++) {
--		int k = 0;
-+		int saved = 0;
- 
- 		flp = &fcp->hash_table[i];
--		while ((fle = *flp) != NULL && k < shrink_to) {
--			k++;
--			flp = &fle->next;
--		}
- 		while ((fle = *flp) != NULL) {
--			*flp = fle->next;
--			flow_entry_kill(fc, fcp, fle);
-+			if (saved < shrink_to &&
-+			    flow_entry_valid(fle)) {
-+				saved++;
-+				flp = &fle->next;
-+			} else {
-+				*flp = fle->next;
-+				flow_entry_kill(fc, fcp, fle);
-+			}
- 		}
- 	}
- }
-@@ -166,18 +176,21 @@ static int flow_key_compare(struct flowi *key1, struct flowi *key2)
- 	return 0;
- }
- 
--void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
--			flow_resolve_t resolver)
-+struct flow_cache_object *
-+flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
-+		  flow_resolve_t resolver, void *ctx)
- {
- 	struct flow_cache *fc = &flow_cache_global;
- 	struct flow_cache_percpu *fcp;
- 	struct flow_cache_entry *fle, **head;
-+	struct flow_cache_object *flo;
- 	unsigned int hash;
- 
- 	local_bh_disable();
- 	fcp = per_cpu_ptr(fc->percpu, smp_processor_id());
- 
- 	fle = NULL;
-+	flo = NULL;
- 	/* Packet really early in init?  Making flow_cache_init a
- 	 * pre-smp initcall would solve this.  --RR */
- 	if (!fcp->hash_table)
-@@ -185,27 +198,17 @@ void *flow_cache_lookup(struct net *net, 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);
- 	head = &fcp->hash_table[hash];
- 	for (fle = *head; fle; fle = fle->next) {
- 		if (fle->family == family &&
- 		    fle->dir == dir &&
--		    flow_key_compare(key, &fle->key) == 0) {
--			if (fle->genid == atomic_read(&flow_cache_genid)) {
--				void *ret = fle->object;
--
--				if (ret)
--					atomic_inc(fle->object_ref);
--				local_bh_enable();
--
--				return ret;
--			}
-+		    flow_key_compare(key, &fle->key) == 0)
- 			break;
--		}
- 	}
- 
--	if (!fle) {
-+	if (unlikely(!fle)) {
- 		if (fcp->hash_count > fc->high_watermark)
- 			flow_cache_shrink(fc, fcp);
- 
-@@ -219,33 +222,39 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
- 			fle->object = NULL;
- 			fcp->hash_count++;
- 		}
-+	} else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
-+		flo = fle->object;
-+		if (!flo)
-+			goto ret_object;
-+		flo = flo->ops->get(flo);
-+		if (flo)
-+			goto ret_object;
-+	} else if (fle->object) {
-+	        flo = fle->object;
-+	        flo->ops->delete(flo);
-+	        fle->object = NULL;
- 	}
- 
- nocache:
--	{
--		int err;
--		void *obj;
--		atomic_t *obj_ref;
--
--		err = resolver(net, key, family, dir, &obj, &obj_ref);
--
--		if (fle && !err) {
--			fle->genid = atomic_read(&flow_cache_genid);
--
--			if (fle->object)
--				atomic_dec(fle->object_ref);
--
--			fle->object = obj;
--			fle->object_ref = obj_ref;
--			if (obj)
--				atomic_inc(fle->object_ref);
--		}
--		local_bh_enable();
--
--		if (err)
--			obj = ERR_PTR(err);
--		return obj;
-+	flo = NULL;
-+	if (fle) {
-+		flo = fle->object;
-+		fle->object = NULL;
-+	}
-+	flo = resolver(net, key, family, dir, flo, ctx);
-+	if (fle) {
-+		fle->genid = atomic_read(&flow_cache_genid);
-+		if (!IS_ERR(flo))
-+			fle->object = flo;
-+		else
-+			fle->genid--;
-+	} else {
-+		if (flo && !IS_ERR(flo))
-+			flo->ops->delete(flo);
- 	}
-+ret_object:
-+	local_bh_enable();
-+	return flo;
- }
- 
- static void flow_cache_flush_tasklet(unsigned long data)
-@@ -261,13 +270,12 @@ static void flow_cache_flush_tasklet(unsigned long data)
- 
- 		fle = fcp->hash_table[i];
- 		for (; fle; fle = fle->next) {
--			unsigned genid = atomic_read(&flow_cache_genid);
--
--			if (!fle->object || fle->genid == genid)
-+			if (flow_entry_valid(fle))
- 				continue;
- 
-+			if (fle->object)
-+				fle->object->ops->delete(fle->object);
- 			fle->object = NULL;
--			atomic_dec(fle->object_ref);
- 		}
- 	}
- 
-diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index 110184f..d1eb2b5 100644
---- a/net/xfrm/xfrm_policy.c
-+++ b/net/xfrm/xfrm_policy.c
-@@ -216,6 +216,35 @@ expired:
- 	xfrm_pol_put(xp);
- }
- 
-+static struct flow_cache_object *xfrm_policy_flo_get(struct flow_cache_object *flo)
-+{
-+	struct xfrm_policy *pol = container_of(flo, struct xfrm_policy, flo);
-+
-+	if (unlikely(pol->walk.dead))
-+		flo = NULL;
-+	else
-+		xfrm_pol_hold(pol);
-+
-+	return flo;
-+}
-+
-+static int xfrm_policy_flo_check(struct flow_cache_object *flo)
-+{
-+	struct xfrm_policy *pol = container_of(flo, struct xfrm_policy, flo);
-+
-+	return !pol->walk.dead;
-+}
-+
-+static void xfrm_policy_flo_delete(struct flow_cache_object *flo)
-+{
-+	xfrm_pol_put(container_of(flo, struct xfrm_policy, flo));
-+}
-+
-+static const struct flow_cache_ops xfrm_policy_fc_ops = {
-+	.get = xfrm_policy_flo_get,
-+	.check = xfrm_policy_flo_check,
-+	.delete = xfrm_policy_flo_delete,
-+};
- 
- /* Allocate xfrm_policy. Not used here, it is supposed to be used by pfkeyv2
-  * SPD calls.
-@@ -236,6 +265,7 @@ struct xfrm_policy *xfrm_policy_alloc(struct net *net, gfp_t gfp)
- 		atomic_set(&policy->refcnt, 1);
- 		setup_timer(&policy->timer, xfrm_policy_timer,
- 				(unsigned long)policy);
-+		policy->flo.ops = &xfrm_policy_fc_ops;
- 	}
- 	return policy;
- }
-@@ -269,9 +299,6 @@ static void xfrm_policy_gc_kill(struct xfrm_policy *policy)
- 	if (del_timer(&policy->timer))
- 		atomic_dec(&policy->refcnt);
- 
--	if (atomic_read(&policy->refcnt) > 1)
--		flow_cache_flush();
--
- 	xfrm_pol_put(policy);
- }
- 
-@@ -658,10 +685,8 @@ struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u8 type, int dir,
- 	}
- 	write_unlock_bh(&xfrm_policy_lock);
- 
--	if (ret && delete) {
--		atomic_inc(&flow_cache_genid);
-+	if (ret && delete)
- 		xfrm_policy_kill(ret);
--	}
- 	return ret;
- }
- EXPORT_SYMBOL(xfrm_policy_bysel_ctx);
-@@ -699,10 +724,8 @@ struct xfrm_policy *xfrm_policy_byid(struct net *net, u8 type, int dir, u32 id,
- 	}
- 	write_unlock_bh(&xfrm_policy_lock);
- 
--	if (ret && delete) {
--		atomic_inc(&flow_cache_genid);
-+	if (ret && delete)
- 		xfrm_policy_kill(ret);
--	}
- 	return ret;
- }
- EXPORT_SYMBOL(xfrm_policy_byid);
-@@ -967,32 +990,35 @@ fail:
- 	return ret;
- }
- 
--static int xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family,
--			      u8 dir, void **objp, atomic_t **obj_refp)
-+static struct flow_cache_object *
-+xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family,
-+		   u8 dir, struct flow_cache_object *old_obj, void *ctx)
- {
- 	struct xfrm_policy *pol;
--	int err = 0;
-+
-+	if (old_obj)
-+		xfrm_pol_put(container_of(old_obj, struct xfrm_policy, flo));
- 
- #ifdef CONFIG_XFRM_SUB_POLICY
- 	pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_SUB, fl, family, dir);
--	if (IS_ERR(pol)) {
--		err = PTR_ERR(pol);
--		pol = NULL;
--	}
--	if (pol || err)
--		goto end;
-+	if (IS_ERR(pol))
-+		return ERR_CAST(pol);
-+	if (pol)
-+		goto found;
- #endif
- 	pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_MAIN, fl, family, dir);
--	if (IS_ERR(pol)) {
--		err = PTR_ERR(pol);
--		pol = NULL;
--	}
--#ifdef CONFIG_XFRM_SUB_POLICY
--end:
--#endif
--	if ((*objp = (void *) pol) != NULL)
--		*obj_refp = &pol->refcnt;
--	return err;
-+	if (IS_ERR(pol))
-+		return ERR_CAST(pol);
-+	if (pol)
-+		goto found;
-+	return NULL;
-+
-+found:
-+	/* Resolver returns two references:
-+	 * one for cache and one for caller of flow_cache_lookup() */
-+	xfrm_pol_hold(pol);
-+
-+	return &pol->flo;
- }
- 
- static inline int policy_to_flow_dir(int dir)
-@@ -1077,8 +1103,6 @@ int xfrm_policy_delete(struct xfrm_policy *pol, int dir)
- 	pol = __xfrm_policy_unlink(pol, dir);
- 	write_unlock_bh(&xfrm_policy_lock);
- 	if (pol) {
--		if (dir < XFRM_POLICY_MAX)
--			atomic_inc(&flow_cache_genid);
- 		xfrm_policy_kill(pol);
- 		return 0;
- 	}
-@@ -1549,18 +1573,24 @@ restart:
- 	}
- 
- 	if (!policy) {
-+		struct flow_cache_object *flo;
-+
- 		/* To accelerate a bit...  */
- 		if ((dst_orig->flags & DST_NOXFRM) ||
- 		    !net->xfrm.policy_count[XFRM_POLICY_OUT])
- 			goto nopol;
- 
--		policy = flow_cache_lookup(net, fl, dst_orig->ops->family,
--					   dir, xfrm_policy_lookup);
--		err = PTR_ERR(policy);
--		if (IS_ERR(policy)) {
-+		flo = flow_cache_lookup(net, fl, dst_orig->ops->family,
-+					dir, xfrm_policy_lookup, NULL);
-+		err = PTR_ERR(flo);
-+		if (IS_ERR(flo)) {
- 			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR);
- 			goto dropdst;
- 		}
-+		if (flo)
-+			policy = container_of(flo, struct xfrm_policy, flo);
-+		else
-+			policy = NULL;
- 	}
- 
- 	if (!policy)
-@@ -1910,9 +1940,16 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
- 		}
- 	}
- 
--	if (!pol)
--		pol = flow_cache_lookup(net, &fl, family, fl_dir,
--					xfrm_policy_lookup);
-+	if (!pol) {
-+		struct flow_cache_object *flo;
-+
-+		flo = flow_cache_lookup(net, &fl, family, fl_dir,
-+					xfrm_policy_lookup, NULL);
-+		if (flo == NULL || IS_ERR(flo))
-+			pol = ERR_CAST(flo);
-+		else
-+			pol = container_of(flo, struct xfrm_policy, flo);
-+	}
- 
- 	if (IS_ERR(pol)) {
- 		XFRM_INC_STATS(net, LINUX_MIB_XFRMINPOLERROR);
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch b/main/linux-grsec/0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch
deleted file mode 100644
index 0d066c84d9..0000000000
--- a/main/linux-grsec/0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch
+++ /dev/null
@@ -1,1068 +0,0 @@
-From f89d21648e6dc06db2aeabc8926c270894c41446 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 7 Apr 2010 00:30:05 +0000
-Subject: [PATCH 15/18] xfrm: cache bundles instead of policies for outgoing flows
-
-__xfrm_lookup() is called for each packet transmitted out of
-system. The xfrm_find_bundle() does a linear search which can
-kill system performance depending on how many bundles are
-required per policy.
-
-This modifies __xfrm_lookup() to store bundles directly in
-the flow cache. If we did not get a hit, we just create a new
-bundle instead of doing slow search. This means that we can now
-get multiple xfrm_dst's for same flow (on per-cpu basis).
-
-Signed-off-by: Timo Teras <timo.teras@iki.fi>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(backported from commit 80c802f3073e84c956846e921e8a0b02dfa3755f)
----
- include/net/xfrm.h      |   10 +-
- net/ipv4/xfrm4_policy.c |   22 --
- net/ipv6/xfrm6_policy.c |   31 --
- net/xfrm/xfrm_policy.c  |  710 +++++++++++++++++++++++++----------------------
- 4 files changed, 383 insertions(+), 390 deletions(-)
-
-diff --git a/include/net/xfrm.h b/include/net/xfrm.h
-index 6023a48..d51ef61 100644
---- a/include/net/xfrm.h
-+++ b/include/net/xfrm.h
-@@ -266,7 +266,6 @@ struct xfrm_policy_afinfo {
- 					       xfrm_address_t *saddr,
- 					       xfrm_address_t *daddr);
- 	int			(*get_saddr)(struct net *net, xfrm_address_t *saddr, xfrm_address_t *daddr);
--	struct dst_entry	*(*find_bundle)(struct flowi *fl, struct xfrm_policy *policy);
- 	void			(*decode_session)(struct sk_buff *skb,
- 						  struct flowi *fl,
- 						  int reverse);
-@@ -485,12 +484,12 @@ struct xfrm_policy
- 	struct timer_list	timer;
- 
- 	struct flow_cache_object flo;
-+	atomic_t		genid;
- 	u32			priority;
- 	u32			index;
- 	struct xfrm_selector	selector;
- 	struct xfrm_lifetime_cfg lft;
- 	struct xfrm_lifetime_cur curlft;
--	struct dst_entry       *bundles;
- 	struct xfrm_policy_walk_entry walk;
- 	u8			type;
- 	u8			action;
-@@ -883,11 +882,15 @@ struct xfrm_dst
- 		struct rt6_info		rt6;
- 	} u;
- 	struct dst_entry *route;
-+	struct flow_cache_object flo;
-+	struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX];
-+	int num_pols, num_xfrms;
- #ifdef CONFIG_XFRM_SUB_POLICY
- 	struct flowi *origin;
- 	struct xfrm_selector *partner;
- #endif
--	u32 genid;
-+	u32 xfrm_genid;
-+	u32 policy_genid;
- 	u32 route_mtu_cached;
- 	u32 child_mtu_cached;
- 	u32 route_cookie;
-@@ -897,6 +900,7 @@ struct xfrm_dst
- #ifdef CONFIG_XFRM
- static inline void xfrm_dst_destroy(struct xfrm_dst *xdst)
- {
-+	xfrm_pols_put(xdst->pols, xdst->num_pols);
- 	dst_release(xdst->route);
- 	if (likely(xdst->u.dst.xfrm))
- 		xfrm_state_put(xdst->u.dst.xfrm);
-diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
-index 7009886..651a3e7 100644
---- a/net/ipv4/xfrm4_policy.c
-+++ b/net/ipv4/xfrm4_policy.c
-@@ -60,27 +60,6 @@ static int xfrm4_get_saddr(struct net *net,
- 	return 0;
- }
- 
--static struct dst_entry *
--__xfrm4_find_bundle(struct flowi *fl, struct xfrm_policy *policy)
--{
--	struct dst_entry *dst;
--
--	read_lock_bh(&policy->lock);
--	for (dst = policy->bundles; dst; dst = dst->next) {
--		struct xfrm_dst *xdst = (struct xfrm_dst *)dst;
--		if (xdst->u.rt.fl.oif == fl->oif &&	/*XXX*/
--		    xdst->u.rt.fl.fl4_dst == fl->fl4_dst &&
--		    xdst->u.rt.fl.fl4_src == fl->fl4_src &&
--		    xdst->u.rt.fl.fl4_tos == fl->fl4_tos &&
--		    xfrm_bundle_ok(policy, xdst, fl, AF_INET, 0)) {
--			dst_clone(dst);
--			break;
--		}
--	}
--	read_unlock_bh(&policy->lock);
--	return dst;
--}
--
- static int xfrm4_get_tos(struct flowi *fl)
- {
- 	return fl->fl4_tos;
-@@ -258,7 +237,6 @@ static struct xfrm_policy_afinfo xfrm4_policy_afinfo = {
- 	.dst_ops =		&xfrm4_dst_ops,
- 	.dst_lookup =		xfrm4_dst_lookup,
- 	.get_saddr =		xfrm4_get_saddr,
--	.find_bundle = 		__xfrm4_find_bundle,
- 	.decode_session =	_decode_session4,
- 	.get_tos =		xfrm4_get_tos,
- 	.init_path =		xfrm4_init_path,
-diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
-index 3f89ab7..fb2a5b7 100644
---- a/net/ipv6/xfrm6_policy.c
-+++ b/net/ipv6/xfrm6_policy.c
-@@ -68,36 +68,6 @@ static int xfrm6_get_saddr(struct net *net,
- 	return 0;
- }
- 
--static struct dst_entry *
--__xfrm6_find_bundle(struct flowi *fl, struct xfrm_policy *policy)
--{
--	struct dst_entry *dst;
--
--	/* Still not clear if we should set fl->fl6_{src,dst}... */
--	read_lock_bh(&policy->lock);
--	for (dst = policy->bundles; dst; dst = dst->next) {
--		struct xfrm_dst *xdst = (struct xfrm_dst*)dst;
--		struct in6_addr fl_dst_prefix, fl_src_prefix;
--
--		ipv6_addr_prefix(&fl_dst_prefix,
--				 &fl->fl6_dst,
--				 xdst->u.rt6.rt6i_dst.plen);
--		ipv6_addr_prefix(&fl_src_prefix,
--				 &fl->fl6_src,
--				 xdst->u.rt6.rt6i_src.plen);
--		if (ipv6_addr_equal(&xdst->u.rt6.rt6i_dst.addr, &fl_dst_prefix) &&
--		    ipv6_addr_equal(&xdst->u.rt6.rt6i_src.addr, &fl_src_prefix) &&
--		    xfrm_bundle_ok(policy, xdst, fl, AF_INET6,
--				   (xdst->u.rt6.rt6i_dst.plen != 128 ||
--				    xdst->u.rt6.rt6i_src.plen != 128))) {
--			dst_clone(dst);
--			break;
--		}
--	}
--	read_unlock_bh(&policy->lock);
--	return dst;
--}
--
- static int xfrm6_get_tos(struct flowi *fl)
- {
- 	return 0;
-@@ -290,7 +260,6 @@ static struct xfrm_policy_afinfo xfrm6_policy_afinfo = {
- 	.dst_ops =		&xfrm6_dst_ops,
- 	.dst_lookup =		xfrm6_dst_lookup,
- 	.get_saddr = 		xfrm6_get_saddr,
--	.find_bundle =		__xfrm6_find_bundle,
- 	.decode_session =	_decode_session6,
- 	.get_tos =		xfrm6_get_tos,
- 	.init_path =		xfrm6_init_path,
-diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index d1eb2b5..0379d82 100644
---- a/net/xfrm/xfrm_policy.c
-+++ b/net/xfrm/xfrm_policy.c
-@@ -37,6 +37,8 @@
- DEFINE_MUTEX(xfrm_cfg_mutex);
- EXPORT_SYMBOL(xfrm_cfg_mutex);
- 
-+static DEFINE_SPINLOCK(xfrm_policy_sk_bundle_lock);
-+static struct dst_entry *xfrm_policy_sk_bundles;
- static DEFINE_RWLOCK(xfrm_policy_lock);
- 
- static DEFINE_RWLOCK(xfrm_policy_afinfo_lock);
-@@ -50,6 +52,7 @@ static DEFINE_SPINLOCK(xfrm_policy_gc_lock);
- static struct xfrm_policy_afinfo *xfrm_policy_get_afinfo(unsigned short family);
- static void xfrm_policy_put_afinfo(struct xfrm_policy_afinfo *afinfo);
- static void xfrm_init_pmtu(struct dst_entry *dst);
-+static int stale_bundle(struct dst_entry *dst);
- 
- static struct xfrm_policy *__xfrm_policy_unlink(struct xfrm_policy *pol,
- 						int dir);
-@@ -277,8 +280,6 @@ void xfrm_policy_destroy(struct xfrm_policy *policy)
- {
- 	BUG_ON(!policy->walk.dead);
- 
--	BUG_ON(policy->bundles);
--
- 	if (del_timer(&policy->timer))
- 		BUG();
- 
-@@ -289,12 +290,7 @@ EXPORT_SYMBOL(xfrm_policy_destroy);
- 
- static void xfrm_policy_gc_kill(struct xfrm_policy *policy)
- {
--	struct dst_entry *dst;
--
--	while ((dst = policy->bundles) != NULL) {
--		policy->bundles = dst->next;
--		dst_free(dst);
--	}
-+	atomic_inc(&policy->genid);
- 
- 	if (del_timer(&policy->timer))
- 		atomic_dec(&policy->refcnt);
-@@ -572,7 +568,6 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
- 	struct xfrm_policy *delpol;
- 	struct hlist_head *chain;
- 	struct hlist_node *entry, *newpos;
--	struct dst_entry *gc_list;
- 
- 	write_lock_bh(&xfrm_policy_lock);
- 	chain = policy_hash_bysel(net, &policy->selector, policy->family, dir);
-@@ -620,34 +615,6 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
- 	else if (xfrm_bydst_should_resize(net, dir, NULL))
- 		schedule_work(&net->xfrm.policy_hash_work);
- 
--	read_lock_bh(&xfrm_policy_lock);
--	gc_list = NULL;
--	entry = &policy->bydst;
--	hlist_for_each_entry_continue(policy, entry, bydst) {
--		struct dst_entry *dst;
--
--		write_lock(&policy->lock);
--		dst = policy->bundles;
--		if (dst) {
--			struct dst_entry *tail = dst;
--			while (tail->next)
--				tail = tail->next;
--			tail->next = gc_list;
--			gc_list = dst;
--
--			policy->bundles = NULL;
--		}
--		write_unlock(&policy->lock);
--	}
--	read_unlock_bh(&xfrm_policy_lock);
--
--	while (gc_list) {
--		struct dst_entry *dst = gc_list;
--
--		gc_list = dst->next;
--		dst_free(dst);
--	}
--
- 	return 0;
- }
- EXPORT_SYMBOL(xfrm_policy_insert);
-@@ -990,6 +957,19 @@ fail:
- 	return ret;
- }
- 
-+static struct xfrm_policy *
-+__xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family, u8 dir)
-+{
-+#ifdef CONFIG_XFRM_SUB_POLICY
-+	struct xfrm_policy *pol;
-+
-+	pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_SUB, fl, family, dir);
-+	if (pol != NULL)
-+		return pol;
-+#endif
-+	return xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_MAIN, fl, family, dir);
-+}
-+
- static struct flow_cache_object *
- xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family,
- 		   u8 dir, struct flow_cache_object *old_obj, void *ctx)
-@@ -999,21 +979,10 @@ xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family,
- 	if (old_obj)
- 		xfrm_pol_put(container_of(old_obj, struct xfrm_policy, flo));
- 
--#ifdef CONFIG_XFRM_SUB_POLICY
--	pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_SUB, fl, family, dir);
--	if (IS_ERR(pol))
-+	pol = __xfrm_policy_lookup(net, fl, family, dir);
-+	if (pol == NULL || IS_ERR(pol))
- 		return ERR_CAST(pol);
--	if (pol)
--		goto found;
--#endif
--	pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_MAIN, fl, family, dir);
--	if (IS_ERR(pol))
--		return ERR_CAST(pol);
--	if (pol)
--		goto found;
--	return NULL;
- 
--found:
- 	/* Resolver returns two references:
- 	 * one for cache and one for caller of flow_cache_lookup() */
- 	xfrm_pol_hold(pol);
-@@ -1299,18 +1268,6 @@ xfrm_tmpl_resolve(struct xfrm_policy **pols, int npols, struct flowi *fl,
-  * still valid.
-  */
- 
--static struct dst_entry *
--xfrm_find_bundle(struct flowi *fl, struct xfrm_policy *policy, unsigned short family)
--{
--	struct dst_entry *x;
--	struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family);
--	if (unlikely(afinfo == NULL))
--		return ERR_PTR(-EINVAL);
--	x = afinfo->find_bundle(fl, policy);
--	xfrm_policy_put_afinfo(afinfo);
--	return x;
--}
--
- static inline int xfrm_get_tos(struct flowi *fl, int family)
- {
- 	struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family);
-@@ -1326,6 +1283,54 @@ static inline int xfrm_get_tos(struct flowi *fl, int family)
- 	return tos;
- }
- 
-+static struct flow_cache_object *xfrm_bundle_flo_get(struct flow_cache_object *flo)
-+{
-+	struct xfrm_dst *xdst = container_of(flo, struct xfrm_dst, flo);
-+	struct dst_entry *dst = &xdst->u.dst;
-+
-+	if (xdst->route == NULL) {
-+		/* Dummy bundle - if it has xfrms we were not
-+		 * able to build bundle as template resolution failed.
-+		 * It means we need to try again resolving. */
-+		if (xdst->num_xfrms > 0)
-+			return NULL;
-+	} else {
-+		/* Real bundle */
-+		if (stale_bundle(dst))
-+			return NULL;
-+	}
-+
-+	dst_hold(dst);
-+	return flo;
-+}
-+
-+static int xfrm_bundle_flo_check(struct flow_cache_object *flo)
-+{
-+	struct xfrm_dst *xdst = container_of(flo, struct xfrm_dst, flo);
-+	struct dst_entry *dst = &xdst->u.dst;
-+
-+	if (!xdst->route)
-+		return 0;
-+	if (stale_bundle(dst))
-+		return 0;
-+
-+	return 1;
-+}
-+
-+static void xfrm_bundle_flo_delete(struct flow_cache_object *flo)
-+{
-+	struct xfrm_dst *xdst = container_of(flo, struct xfrm_dst, flo);
-+	struct dst_entry *dst = &xdst->u.dst;
-+
-+	dst_free(dst);
-+}
-+
-+static const struct flow_cache_ops xfrm_bundle_fc_ops = {
-+	.get = xfrm_bundle_flo_get,
-+	.check = xfrm_bundle_flo_check,
-+	.delete = xfrm_bundle_flo_delete,
-+};
-+
- static inline struct xfrm_dst *xfrm_alloc_dst(int family)
- {
- 	struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family);
-@@ -1338,6 +1343,8 @@ static inline struct xfrm_dst *xfrm_alloc_dst(int family)
- 
- 	xfrm_policy_put_afinfo(afinfo);
- 
-+	xdst->flo.ops = &xfrm_bundle_fc_ops;
-+
- 	return xdst;
- }
- 
-@@ -1375,6 +1382,7 @@ static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
- 	return err;
- }
- 
-+
- /* Allocate chain of dst_entry's, attach known xfrm's, calculate
-  * all the metrics... Shortly, bundle a bundle.
-  */
-@@ -1437,7 +1445,7 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy,
- 			dst_hold(dst);
- 
- 		dst1->xfrm = xfrm[i];
--		xdst->genid = xfrm[i]->genid;
-+		xdst->xfrm_genid = xfrm[i]->genid;
- 
- 		dst1->obsolete = -1;
- 		dst1->flags |= DST_HOST;
-@@ -1530,7 +1538,186 @@ xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
- #endif
- }
- 
--static int stale_bundle(struct dst_entry *dst);
-+static int xfrm_expand_policies(struct flowi *fl, u16 family,
-+				struct xfrm_policy **pols,
-+				int *num_pols, int *num_xfrms)
-+{
-+	int i;
-+
-+	if (*num_pols == 0 || !pols[0]) {
-+		*num_pols = 0;
-+		*num_xfrms = 0;
-+		return 0;
-+	}
-+	if (IS_ERR(pols[0]))
-+		return PTR_ERR(pols[0]);
-+
-+	*num_xfrms = pols[0]->xfrm_nr;
-+
-+#ifdef CONFIG_XFRM_SUB_POLICY
-+	if (pols[0] && pols[0]->action == XFRM_POLICY_ALLOW &&
-+	    pols[0]->type != XFRM_POLICY_TYPE_MAIN) {
-+		pols[1] = xfrm_policy_lookup_bytype(xp_net(pols[0]),
-+						    XFRM_POLICY_TYPE_MAIN,
-+						    fl, family,
-+						    XFRM_POLICY_OUT);
-+		if (pols[1]) {
-+			if (IS_ERR(pols[1])) {
-+				xfrm_pols_put(pols, *num_pols);
-+				return PTR_ERR(pols[1]);
-+			}
-+			(*num_pols) ++;
-+			(*num_xfrms) += pols[1]->xfrm_nr;
-+		}
-+	}
-+#endif
-+	for (i = 0; i < *num_pols; i++) {
-+		if (pols[i]->action != XFRM_POLICY_ALLOW) {
-+			*num_xfrms = -1;
-+			break;
-+		}
-+	}
-+
-+	return 0;
-+
-+}
-+
-+static struct xfrm_dst *
-+xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
-+			       struct flowi *fl, u16 family,
-+			       struct dst_entry *dst_orig)
-+{
-+	struct net *net = xp_net(pols[0]);
-+	struct xfrm_state *xfrm[XFRM_MAX_DEPTH];
-+	struct dst_entry *dst;
-+	struct xfrm_dst *xdst;
-+	int err;
-+
-+	/* Try to instantiate a bundle */
-+	err = xfrm_tmpl_resolve(pols, num_pols, fl, xfrm, family);
-+	if (err < 0) {
-+		if (err != -EAGAIN)
-+			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR);
-+		return ERR_PTR(err);
-+	}
-+
-+	dst = xfrm_bundle_create(pols[0], xfrm, err, fl, dst_orig);
-+	if (IS_ERR(dst)) {
-+		XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLEGENERROR);
-+		return ERR_CAST(dst);
-+	}
-+
-+	xdst = (struct xfrm_dst *)dst;
-+	xdst->num_xfrms = err;
-+	if (num_pols > 1)
-+		err = xfrm_dst_update_parent(dst, &pols[1]->selector);
-+	else
-+		err = xfrm_dst_update_origin(dst, fl);
-+	if (unlikely(err)) {
-+		dst_free(dst);
-+		XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLECHECKERROR);
-+		return ERR_PTR(err);
-+	}
-+
-+	xdst->num_pols = num_pols;
-+	memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
-+	xdst->policy_genid = atomic_read(&pols[0]->genid);
-+
-+	return xdst;
-+}
-+
-+static struct flow_cache_object *
-+xfrm_bundle_lookup(struct net *net, struct flowi *fl, u16 family, u8 dir,
-+		   struct flow_cache_object *oldflo, void *ctx)
-+{
-+	struct dst_entry *dst_orig = (struct dst_entry *)ctx;
-+	struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX];
-+	struct xfrm_dst *xdst, *new_xdst;
-+	int num_pols = 0, num_xfrms = 0, i, err, pol_dead;
-+
-+	/* Check if the policies from old bundle are usable */
-+	xdst = NULL;
-+	if (oldflo) {
-+		xdst = container_of(oldflo, struct xfrm_dst, flo);
-+		num_pols = xdst->num_pols;
-+		num_xfrms = xdst->num_xfrms;
-+		pol_dead = 0;
-+		for (i = 0; i < num_pols; i++) {
-+			pols[i] = xdst->pols[i];
-+			pol_dead |= pols[i]->walk.dead;
-+		}
-+		if (pol_dead) {
-+			dst_free(&xdst->u.dst);
-+			xdst = NULL;
-+			num_pols = 0;
-+			num_xfrms = 0;
-+			oldflo = NULL;
-+		}
-+	}
-+
-+	/* Resolve policies to use if we couldn't get them from
-+	 * previous cache entry */
-+	if (xdst == NULL) {
-+		num_pols = 1;
-+		pols[0] = __xfrm_policy_lookup(net, fl, family, dir);
-+		err = xfrm_expand_policies(fl, family, pols,
-+					   &num_pols, &num_xfrms);
-+		if (err < 0)
-+			goto inc_error;
-+		if (num_pols == 0)
-+			return NULL;
-+		if (num_xfrms <= 0)
-+			goto make_dummy_bundle;
-+	}
-+
-+	new_xdst = xfrm_resolve_and_create_bundle(pols, num_pols, fl, family, dst_orig);
-+	if (IS_ERR(new_xdst)) {
-+		err = PTR_ERR(new_xdst);
-+		if (err != -EAGAIN)
-+			goto error;
-+		if (oldflo == NULL)
-+			goto make_dummy_bundle;
-+		dst_hold(&xdst->u.dst);
-+		return oldflo;
-+	}
-+
-+	/* Kill the previous bundle */
-+	if (xdst) {
-+		/* The policies were stolen for newly generated bundle */
-+		xdst->num_pols = 0;
-+		dst_free(&xdst->u.dst);
-+	}
-+
-+	/* Flow cache does not have reference, it dst_free()'s,
-+	 * but we do need to return one reference for original caller */
-+	dst_hold(&new_xdst->u.dst);
-+	return &new_xdst->flo;
-+
-+make_dummy_bundle:
-+	/* We found policies, but there's no bundles to instantiate:
-+	 * either because the policy blocks, has no transformations or
-+	 * we could not build template (no xfrm_states).*/
-+	xdst = xfrm_alloc_dst(family);
-+	if (IS_ERR(xdst)) {
-+		xfrm_pols_put(pols, num_pols);
-+		return ERR_CAST(xdst);
-+	}
-+	xdst->num_pols = num_pols;
-+	xdst->num_xfrms = num_xfrms;
-+	memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
-+
-+	dst_hold(&xdst->u.dst);
-+	return &xdst->flo;
-+
-+inc_error:
-+	XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR);
-+error:
-+	if (xdst != NULL)
-+		dst_free(&xdst->u.dst);
-+	else
-+		xfrm_pols_put(pols, num_pols);
-+	return ERR_PTR(err);
-+}
- 
- /* Main function: finds/creates a bundle for given flow.
-  *
-@@ -1540,248 +1727,152 @@ static int stale_bundle(struct dst_entry *dst);
- int __xfrm_lookup(struct net *net, struct dst_entry **dst_p, struct flowi *fl,
- 		  struct sock *sk, int flags)
- {
--	struct xfrm_policy *policy;
- 	struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX];
--	int npols;
--	int pol_dead;
--	int xfrm_nr;
--	int pi;
--	struct xfrm_state *xfrm[XFRM_MAX_DEPTH];
--	struct dst_entry *dst, *dst_orig = *dst_p;
--	int nx = 0;
--	int err;
--	u32 genid;
--	u16 family;
-+	struct flow_cache_object *flo;
-+	struct xfrm_dst *xdst;
-+	struct dst_entry *dst, *dst_orig = *dst_p, *route;
-+	u16 family = dst_orig->ops->family;
- 	u8 dir = policy_to_flow_dir(XFRM_POLICY_OUT);
-+	int i, err, num_pols, num_xfrms, drop_pols = 0;
- 
- restart:
--	genid = atomic_read(&flow_cache_genid);
--	policy = NULL;
--	for (pi = 0; pi < ARRAY_SIZE(pols); pi++)
--		pols[pi] = NULL;
--	npols = 0;
--	pol_dead = 0;
--	xfrm_nr = 0;
-+	dst = NULL;
-+	xdst = NULL;
-+	route = NULL;
- 
- 	if (sk && sk->sk_policy[XFRM_POLICY_OUT]) {
--		policy = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl);
--		err = PTR_ERR(policy);
--		if (IS_ERR(policy)) {
--			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR);
-+		num_pols = 1;
-+		pols[0] = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl);
-+		err = xfrm_expand_policies(fl, family, pols,
-+					   &num_pols, &num_xfrms);
-+		if (err < 0)
- 			goto dropdst;
-+
-+		if (num_pols) {
-+			if (num_xfrms <= 0) {
-+				drop_pols = num_pols;
-+				goto no_transform;
-+			}
-+
-+			xdst = xfrm_resolve_and_create_bundle(
-+					pols, num_pols, fl,
-+					family, dst_orig);
-+			if (IS_ERR(xdst)) {
-+				xfrm_pols_put(pols, num_pols);
-+				err = PTR_ERR(xdst);
-+				goto dropdst;
-+			}
-+
-+			spin_lock_bh(&xfrm_policy_sk_bundle_lock);
-+			xdst->u.dst.next = xfrm_policy_sk_bundles;
-+			xfrm_policy_sk_bundles = &xdst->u.dst;
-+			spin_unlock_bh(&xfrm_policy_sk_bundle_lock);
-+
-+			route = xdst->route;
- 		}
- 	}
- 
--	if (!policy) {
--		struct flow_cache_object *flo;
--
-+	if (xdst == NULL) {
- 		/* To accelerate a bit...  */
- 		if ((dst_orig->flags & DST_NOXFRM) ||
- 		    !net->xfrm.policy_count[XFRM_POLICY_OUT])
- 			goto nopol;
- 
--		flo = flow_cache_lookup(net, fl, dst_orig->ops->family,
--					dir, xfrm_policy_lookup, NULL);
--		err = PTR_ERR(flo);
-+		flo = flow_cache_lookup(net, fl, family, dir,
-+					xfrm_bundle_lookup, dst_orig);
-+		if (flo == NULL)
-+			goto nopol;
- 		if (IS_ERR(flo)) {
--			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR);
-+			err = PTR_ERR(flo);
- 			goto dropdst;
- 		}
--		if (flo)
--			policy = container_of(flo, struct xfrm_policy, flo);
--		else
--			policy = NULL;
-+		xdst = container_of(flo, struct xfrm_dst, flo);
-+
-+		num_pols = xdst->num_pols;
-+		num_xfrms = xdst->num_xfrms;
-+		memcpy(pols, xdst->pols, sizeof(struct xfrm_policy*) * num_pols);
-+		route = xdst->route;
-+	}
-+
-+	dst = &xdst->u.dst;
-+	if (route == NULL && num_xfrms > 0) {
-+		/* The only case when xfrm_bundle_lookup() returns a
-+		 * bundle with null route, is when the template could
-+		 * not be resolved. It means policies are there, but
-+		 * bundle could not be created, since we don't yet
-+		 * have the xfrm_state's. We need to wait for KM to
-+		 * negotiate new SA's or bail out with error.*/
-+		if (net->xfrm.sysctl_larval_drop) {
-+			/* EREMOTE tells the caller to generate
-+			 * a one-shot blackhole route. */
-+			dst_release(dst);
-+			xfrm_pols_put(pols, num_pols);
-+			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES);
-+			return -EREMOTE;
-+		}
-+		if (flags & XFRM_LOOKUP_WAIT) {
-+			DECLARE_WAITQUEUE(wait, current);
-+
-+			add_wait_queue(&net->xfrm.km_waitq, &wait);
-+			set_current_state(TASK_INTERRUPTIBLE);
-+			schedule();
-+			set_current_state(TASK_RUNNING);
-+			remove_wait_queue(&net->xfrm.km_waitq, &wait);
-+
-+			if (!signal_pending(current)) {
-+				dst_release(dst);
-+				goto restart;
-+			}
-+
-+			err = -ERESTART;
-+		} else
-+			err = -EAGAIN;
-+
-+		XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES);
-+		goto error;
- 	}
- 
--	if (!policy)
-+no_transform:
-+	if (num_pols == 0)
- 		goto nopol;
- 
--	family = dst_orig->ops->family;
--	pols[0] = policy;
--	npols ++;
--	xfrm_nr += pols[0]->xfrm_nr;
--
--	err = -ENOENT;
--	if ((flags & XFRM_LOOKUP_ICMP) && !(policy->flags & XFRM_POLICY_ICMP))
-+	if ((flags & XFRM_LOOKUP_ICMP) &&
-+	    !(pols[0]->flags & XFRM_POLICY_ICMP)) {
-+		err = -ENOENT;
- 		goto error;
-+	}
- 
--	policy->curlft.use_time = get_seconds();
-+	for (i = 0; i < num_pols; i++)
-+		pols[i]->curlft.use_time = get_seconds();
- 
--	switch (policy->action) {
--	default:
--	case XFRM_POLICY_BLOCK:
-+	if (num_xfrms < 0) {
- 		/* Prohibit the flow */
- 		XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLBLOCK);
- 		err = -EPERM;
- 		goto error;
--
--	case XFRM_POLICY_ALLOW:
--#ifndef CONFIG_XFRM_SUB_POLICY
--		if (policy->xfrm_nr == 0) {
--			/* Flow passes not transformed. */
--			xfrm_pol_put(policy);
--			return 0;
--		}
--#endif
--
--		/* Try to find matching bundle.
--		 *
--		 * LATER: help from flow cache. It is optional, this
--		 * is required only for output policy.
--		 */
--		dst = xfrm_find_bundle(fl, policy, family);
--		if (IS_ERR(dst)) {
--			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLECHECKERROR);
--			err = PTR_ERR(dst);
--			goto error;
--		}
--
--		if (dst)
--			break;
--
--#ifdef CONFIG_XFRM_SUB_POLICY
--		if (pols[0]->type != XFRM_POLICY_TYPE_MAIN) {
--			pols[1] = xfrm_policy_lookup_bytype(net,
--							    XFRM_POLICY_TYPE_MAIN,
--							    fl, family,
--							    XFRM_POLICY_OUT);
--			if (pols[1]) {
--				if (IS_ERR(pols[1])) {
--					XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR);
--					err = PTR_ERR(pols[1]);
--					goto error;
--				}
--				if (pols[1]->action == XFRM_POLICY_BLOCK) {
--					XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLBLOCK);
--					err = -EPERM;
--					goto error;
--				}
--				npols ++;
--				xfrm_nr += pols[1]->xfrm_nr;
--			}
--		}
--
--		/*
--		 * Because neither flowi nor bundle information knows about
--		 * transformation template size. On more than one policy usage
--		 * we can realize whether all of them is bypass or not after
--		 * they are searched. See above not-transformed bypass
--		 * is surrounded by non-sub policy configuration, too.
--		 */
--		if (xfrm_nr == 0) {
--			/* Flow passes not transformed. */
--			xfrm_pols_put(pols, npols);
--			return 0;
--		}
--
--#endif
--		nx = xfrm_tmpl_resolve(pols, npols, fl, xfrm, family);
--
--		if (unlikely(nx<0)) {
--			err = nx;
--			if (err == -EAGAIN && net->xfrm.sysctl_larval_drop) {
--				/* EREMOTE tells the caller to generate
--				 * a one-shot blackhole route.
--				 */
--				XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES);
--				xfrm_pol_put(policy);
--				return -EREMOTE;
--			}
--			if (err == -EAGAIN && (flags & XFRM_LOOKUP_WAIT)) {
--				DECLARE_WAITQUEUE(wait, current);
--
--				add_wait_queue(&net->xfrm.km_waitq, &wait);
--				set_current_state(TASK_INTERRUPTIBLE);
--				schedule();
--				set_current_state(TASK_RUNNING);
--				remove_wait_queue(&net->xfrm.km_waitq, &wait);
--
--				nx = xfrm_tmpl_resolve(pols, npols, fl, xfrm, family);
--
--				if (nx == -EAGAIN && signal_pending(current)) {
--					XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES);
--					err = -ERESTART;
--					goto error;
--				}
--				if (nx == -EAGAIN ||
--				    genid != atomic_read(&flow_cache_genid)) {
--					xfrm_pols_put(pols, npols);
--					goto restart;
--				}
--				err = nx;
--			}
--			if (err < 0) {
--				XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES);
--				goto error;
--			}
--		}
--		if (nx == 0) {
--			/* Flow passes not transformed. */
--			xfrm_pols_put(pols, npols);
--			return 0;
--		}
--
--		dst = xfrm_bundle_create(policy, xfrm, nx, fl, dst_orig);
--		err = PTR_ERR(dst);
--		if (IS_ERR(dst)) {
--			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLEGENERROR);
--			goto error;
--		}
--
--		for (pi = 0; pi < npols; pi++)
--			pol_dead |= pols[pi]->walk.dead;
--
--		write_lock_bh(&policy->lock);
--		if (unlikely(pol_dead || stale_bundle(dst))) {
--			/* Wow! While we worked on resolving, this
--			 * policy has gone. Retry. It is not paranoia,
--			 * we just cannot enlist new bundle to dead object.
--			 * We can't enlist stable bundles either.
--			 */
--			write_unlock_bh(&policy->lock);
--			dst_free(dst);
--
--			if (pol_dead)
--				XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLDEAD);
--			else
--				XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLECHECKERROR);
--			err = -EHOSTUNREACH;
--			goto error;
--		}
--
--		if (npols > 1)
--			err = xfrm_dst_update_parent(dst, &pols[1]->selector);
--		else
--			err = xfrm_dst_update_origin(dst, fl);
--		if (unlikely(err)) {
--			write_unlock_bh(&policy->lock);
--			dst_free(dst);
--			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLECHECKERROR);
--			goto error;
--		}
--
--		dst->next = policy->bundles;
--		policy->bundles = dst;
--		dst_hold(dst);
--		write_unlock_bh(&policy->lock);
-+	} else if (num_xfrms > 0) {
-+		/* Flow transformed */
-+		*dst_p = dst;
-+		dst_release(dst_orig);
-+	} else {
-+		/* Flow passes untransformed */
-+		dst_release(dst);
- 	}
--	*dst_p = dst;
--	dst_release(dst_orig);
--	xfrm_pols_put(pols, npols);
-+ok:
-+	xfrm_pols_put(pols, drop_pols);
- 	return 0;
- 
-+nopol:
-+	if (!(flags & XFRM_LOOKUP_ICMP))
-+		goto ok;
-+	err = -ENOENT;
- error:
--	xfrm_pols_put(pols, npols);
-+	dst_release(dst);
- dropdst:
- 	dst_release(dst_orig);
- 	*dst_p = NULL;
-+	xfrm_pols_put(pols, drop_pols);
- 	return err;
--
--nopol:
--	err = -ENOENT;
--	if (flags & XFRM_LOOKUP_ICMP)
--		goto dropdst;
--	return 0;
- }
- EXPORT_SYMBOL(__xfrm_lookup);
- 
-@@ -2134,71 +2225,24 @@ static struct dst_entry *xfrm_negative_advice(struct dst_entry *dst)
- 	return dst;
- }
- 
--static void prune_one_bundle(struct xfrm_policy *pol, int (*func)(struct dst_entry *), struct dst_entry **gc_list_p)
--{
--	struct dst_entry *dst, **dstp;
--
--	write_lock(&pol->lock);
--	dstp = &pol->bundles;
--	while ((dst=*dstp) != NULL) {
--		if (func(dst)) {
--			*dstp = dst->next;
--			dst->next = *gc_list_p;
--			*gc_list_p = dst;
--		} else {
--			dstp = &dst->next;
--		}
--	}
--	write_unlock(&pol->lock);
--}
--
--static void xfrm_prune_bundles(struct net *net, int (*func)(struct dst_entry *))
-+static void __xfrm_garbage_collect(struct net *net)
- {
--	struct dst_entry *gc_list = NULL;
--	int dir;
-+	struct dst_entry *head, *next;
- 
--	read_lock_bh(&xfrm_policy_lock);
--	for (dir = 0; dir < XFRM_POLICY_MAX * 2; dir++) {
--		struct xfrm_policy *pol;
--		struct hlist_node *entry;
--		struct hlist_head *table;
--		int i;
-+	flow_cache_flush();
- 
--		hlist_for_each_entry(pol, entry,
--				     &net->xfrm.policy_inexact[dir], bydst)
--			prune_one_bundle(pol, func, &gc_list);
-+	spin_lock_bh(&xfrm_policy_sk_bundle_lock);
-+	head = xfrm_policy_sk_bundles;
-+	xfrm_policy_sk_bundles = NULL;
-+	spin_unlock_bh(&xfrm_policy_sk_bundle_lock);
- 
--		table = net->xfrm.policy_bydst[dir].table;
--		for (i = net->xfrm.policy_bydst[dir].hmask; i >= 0; i--) {
--			hlist_for_each_entry(pol, entry, table + i, bydst)
--				prune_one_bundle(pol, func, &gc_list);
--		}
--	}
--	read_unlock_bh(&xfrm_policy_lock);
--
--	while (gc_list) {
--		struct dst_entry *dst = gc_list;
--		gc_list = dst->next;
--		dst_free(dst);
-+	while (head) {
-+		next = head->next;
-+		dst_free(head);
-+		head = next;
- 	}
- }
- 
--static int unused_bundle(struct dst_entry *dst)
--{
--	return !atomic_read(&dst->__refcnt);
--}
--
--static void __xfrm_garbage_collect(struct net *net)
--{
--	xfrm_prune_bundles(net, unused_bundle);
--}
--
--static int xfrm_flush_bundles(struct net *net)
--{
--	xfrm_prune_bundles(net, stale_bundle);
--	return 0;
--}
--
- static void xfrm_init_pmtu(struct dst_entry *dst)
- {
- 	do {
-@@ -2256,7 +2300,9 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first,
- 			return 0;
- 		if (dst->xfrm->km.state != XFRM_STATE_VALID)
- 			return 0;
--		if (xdst->genid != dst->xfrm->genid)
-+		if (xdst->xfrm_genid != dst->xfrm->genid)
-+			return 0;
-+		if (xdst->policy_genid != atomic_read(&xdst->pols[0]->genid))
- 			return 0;
- 
- 		if (strict && fl &&
-@@ -2383,7 +2429,7 @@ static int xfrm_dev_event(struct notifier_block *this, unsigned long event, void
- 
- 	switch (event) {
- 	case NETDEV_DOWN:
--		xfrm_flush_bundles(dev_net(dev));
-+		__xfrm_garbage_collect(dev_net(dev));
- 	}
- 	return NOTIFY_DONE;
- }
-@@ -2714,7 +2760,6 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
- 			       struct xfrm_migrate *m, int num_migrate)
- {
- 	struct xfrm_migrate *mp;
--	struct dst_entry *dst;
- 	int i, j, n = 0;
- 
- 	write_lock_bh(&pol->lock);
-@@ -2739,10 +2784,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
- 			       sizeof(pol->xfrm_vec[i].saddr));
- 			pol->xfrm_vec[i].encap_family = mp->new_family;
- 			/* flush bundles */
--			while ((dst = pol->bundles) != NULL) {
--				pol->bundles = dst->next;
--				dst_free(dst);
--			}
-+			atomic_inc(&pol->genid);
- 		}
- 	}
- 
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0016-xfrm-remove-policy-garbage-collection.patch b/main/linux-grsec/0016-xfrm-remove-policy-garbage-collection.patch
deleted file mode 100644
index 4a45c7f40d..0000000000
--- a/main/linux-grsec/0016-xfrm-remove-policy-garbage-collection.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 4c53c9239069f48ec9a86f8e596c163b72e8bc4d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 7 Apr 2010 00:30:06 +0000
-Subject: [PATCH 16/18] xfrm: remove policy garbage collection
-
-Policies are now properly reference counted and destroyed from
-all code paths. The delayed gc is just an overhead now and can
-be removed.
-
-Signed-off-by: Timo Teras <timo.teras@iki.fi>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 285ead175c5dd5075cab5b6c94f35a3e6c0a3ae6)
----
- net/xfrm/xfrm_policy.c |   39 +++++----------------------------------
- 1 files changed, 5 insertions(+), 34 deletions(-)
-
-diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index 0379d82..5606841 100644
---- a/net/xfrm/xfrm_policy.c
-+++ b/net/xfrm/xfrm_policy.c
-@@ -46,9 +46,6 @@ static struct xfrm_policy_afinfo *xfrm_policy_afinfo[NPROTO];
- 
- static struct kmem_cache *xfrm_dst_cache __read_mostly;
- 
--static HLIST_HEAD(xfrm_policy_gc_list);
--static DEFINE_SPINLOCK(xfrm_policy_gc_lock);
--
- static struct xfrm_policy_afinfo *xfrm_policy_get_afinfo(unsigned short family);
- static void xfrm_policy_put_afinfo(struct xfrm_policy_afinfo *afinfo);
- static void xfrm_init_pmtu(struct dst_entry *dst);
-@@ -288,32 +285,6 @@ void xfrm_policy_destroy(struct xfrm_policy *policy)
- }
- EXPORT_SYMBOL(xfrm_policy_destroy);
- 
--static void xfrm_policy_gc_kill(struct xfrm_policy *policy)
--{
--	atomic_inc(&policy->genid);
--
--	if (del_timer(&policy->timer))
--		atomic_dec(&policy->refcnt);
--
--	xfrm_pol_put(policy);
--}
--
--static void xfrm_policy_gc_task(struct work_struct *work)
--{
--	struct xfrm_policy *policy;
--	struct hlist_node *entry, *tmp;
--	struct hlist_head gc_list;
--
--	spin_lock_bh(&xfrm_policy_gc_lock);
--	gc_list.first = xfrm_policy_gc_list.first;
--	INIT_HLIST_HEAD(&xfrm_policy_gc_list);
--	spin_unlock_bh(&xfrm_policy_gc_lock);
--
--	hlist_for_each_entry_safe(policy, entry, tmp, &gc_list, bydst)
--		xfrm_policy_gc_kill(policy);
--}
--static DECLARE_WORK(xfrm_policy_gc_work, xfrm_policy_gc_task);
--
- /* Rule must be locked. Release descentant resources, announce
-  * entry dead. The rule must be unlinked from lists to the moment.
-  */
-@@ -322,11 +293,12 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
- {
- 	policy->walk.dead = 1;
- 
--	spin_lock_bh(&xfrm_policy_gc_lock);
--	hlist_add_head(&policy->bydst, &xfrm_policy_gc_list);
--	spin_unlock_bh(&xfrm_policy_gc_lock);
-+	atomic_inc(&policy->genid);
- 
--	schedule_work(&xfrm_policy_gc_work);
-+	if (del_timer(&policy->timer))
-+		xfrm_pol_put(policy);
-+
-+	xfrm_pol_put(policy);
- }
- 
- static unsigned int xfrm_policy_hashmax __read_mostly = 1 * 1024 * 1024;
-@@ -2535,7 +2507,6 @@ static void xfrm_policy_fini(struct net *net)
- 	audit_info.sessionid = -1;
- 	audit_info.secid = 0;
- 	xfrm_policy_flush(net, XFRM_POLICY_TYPE_MAIN, &audit_info);
--	flush_work(&xfrm_policy_gc_work);
- 
- 	WARN_ON(!list_empty(&net->xfrm.policy_all));
- 
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0017-flow-delayed-deletion-of-flow-cache-entries.patch b/main/linux-grsec/0017-flow-delayed-deletion-of-flow-cache-entries.patch
deleted file mode 100644
index 7d17d41aed..0000000000
--- a/main/linux-grsec/0017-flow-delayed-deletion-of-flow-cache-entries.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From fede05e99e2d860e97bc877b8b77fb9e63f55cc8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 7 Apr 2010 00:30:07 +0000
-Subject: [PATCH 17/18] flow: delayed deletion of flow cache entries
-
-Speed up lookups by freeing flow cache entries later. After
-virtualizing flow cache entry operations, the flow cache may now
-end up calling policy or bundle destructor which can be slowish.
-
-As gc_list is more effective with double linked list, the flow cache
-is converted to use common hlist and list macroes where appropriate.
-
-Signed-off-by: Timo Teras <timo.teras@iki.fi>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 8e4795605d1e1b39113818ad7c147b8a867a1f6a)
----
- net/core/flow.c |  100 ++++++++++++++++++++++++++++++++++++++-----------------
- 1 files changed, 69 insertions(+), 31 deletions(-)
-
-diff --git a/net/core/flow.c b/net/core/flow.c
-index 521df52..1619006 100644
---- a/net/core/flow.c
-+++ b/net/core/flow.c
-@@ -26,7 +26,10 @@
- #include <linux/security.h>
- 
- struct flow_cache_entry {
--	struct flow_cache_entry		*next;
-+	union {
-+		struct hlist_node	hlist;
-+		struct list_head	gc_list;
-+	} u;
- 	u16				family;
- 	u8				dir;
- 	u32				genid;
-@@ -35,7 +38,7 @@ struct flow_cache_entry {
- };
- 
- struct flow_cache_percpu {
--	struct flow_cache_entry		**hash_table;
-+	struct hlist_head		*hash_table;
- 	int				hash_count;
- 	u32				hash_rnd;
- 	int				hash_rnd_recalc;
-@@ -62,6 +65,9 @@ atomic_t flow_cache_genid = ATOMIC_INIT(0);
- static struct flow_cache flow_cache_global;
- static struct kmem_cache *flow_cachep;
- 
-+static DEFINE_SPINLOCK(flow_cache_gc_lock);
-+static LIST_HEAD(flow_cache_gc_list);
-+
- #define flow_cache_hash_size(cache)	(1 << (cache)->hash_shift)
- #define FLOW_HASH_RND_PERIOD		(10 * 60 * HZ)
- 
-@@ -86,38 +92,66 @@ static int flow_entry_valid(struct flow_cache_entry *fle)
- 	return 1;
- }
- 
--static void flow_entry_kill(struct flow_cache *fc,
--			    struct flow_cache_percpu *fcp,
--			    struct flow_cache_entry *fle)
-+static void flow_entry_kill(struct flow_cache_entry *fle)
- {
- 	if (fle->object)
- 		fle->object->ops->delete(fle->object);
- 	kmem_cache_free(flow_cachep, fle);
--	fcp->hash_count--;
-+}
-+
-+static void flow_cache_gc_task(struct work_struct *work)
-+{
-+	struct list_head gc_list;
-+	struct flow_cache_entry *fce, *n;
-+
-+	INIT_LIST_HEAD(&gc_list);
-+	spin_lock_bh(&flow_cache_gc_lock);
-+	list_splice_tail_init(&flow_cache_gc_list, &gc_list);
-+	spin_unlock_bh(&flow_cache_gc_lock);
-+
-+	list_for_each_entry_safe(fce, n, &gc_list, u.gc_list)
-+		flow_entry_kill(fce);
-+}
-+static DECLARE_WORK(flow_cache_gc_work, flow_cache_gc_task);
-+
-+static void flow_cache_queue_garbage(struct flow_cache_percpu *fcp,
-+				     int deleted, struct list_head *gc_list)
-+{
-+	if (deleted) {
-+		fcp->hash_count -= deleted;
-+		spin_lock_bh(&flow_cache_gc_lock);
-+		list_splice_tail(gc_list, &flow_cache_gc_list);
-+		spin_unlock_bh(&flow_cache_gc_lock);
-+		schedule_work(&flow_cache_gc_work);
-+	}
- }
- 
- static void __flow_cache_shrink(struct flow_cache *fc,
- 				struct flow_cache_percpu *fcp,
- 				int shrink_to)
- {
--	struct flow_cache_entry *fle, **flp;
--	int i;
-+	struct flow_cache_entry *fle;
-+	struct hlist_node *entry, *tmp;
-+	LIST_HEAD(gc_list);
-+	int i, deleted = 0;
- 
- 	for (i = 0; i < flow_cache_hash_size(fc); i++) {
- 		int saved = 0;
- 
--		flp = &fcp->hash_table[i];
--		while ((fle = *flp) != NULL) {
-+		hlist_for_each_entry_safe(fle, entry, tmp,
-+					  &fcp->hash_table[i], u.hlist) {
- 			if (saved < shrink_to &&
- 			    flow_entry_valid(fle)) {
- 				saved++;
--				flp = &fle->next;
- 			} else {
--				*flp = fle->next;
--				flow_entry_kill(fc, fcp, fle);
-+				deleted++;
-+				hlist_del(&fle->u.hlist);
-+				list_add_tail(&fle->u.gc_list, &gc_list);
- 			}
- 		}
- 	}
-+
-+	flow_cache_queue_garbage(fcp, deleted, &gc_list);
- }
- 
- static void flow_cache_shrink(struct flow_cache *fc,
-@@ -182,7 +216,8 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
- {
- 	struct flow_cache *fc = &flow_cache_global;
- 	struct flow_cache_percpu *fcp;
--	struct flow_cache_entry *fle, **head;
-+	struct flow_cache_entry *fle, *tfle;
-+	struct hlist_node *entry;
- 	struct flow_cache_object *flo;
- 	unsigned int hash;
- 
-@@ -200,12 +235,13 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
- 		flow_new_hash_rnd(fc, fcp);
- 
- 	hash = flow_hash_code(fc, fcp, key);
--	head = &fcp->hash_table[hash];
--	for (fle = *head; fle; fle = fle->next) {
--		if (fle->family == family &&
--		    fle->dir == dir &&
--		    flow_key_compare(key, &fle->key) == 0)
-+	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) {
-+			fle = tfle;
- 			break;
-+		}
- 	}
- 
- 	if (unlikely(!fle)) {
-@@ -214,12 +250,11 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
- 
- 		fle = kmem_cache_alloc(flow_cachep, GFP_ATOMIC);
- 		if (fle) {
--			fle->next = *head;
--			*head = fle;
- 			fle->family = family;
- 			fle->dir = dir;
- 			memcpy(&fle->key, key, sizeof(*key));
- 			fle->object = NULL;
-+			hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
- 			fcp->hash_count++;
- 		}
- 	} else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
-@@ -262,23 +297,26 @@ static void flow_cache_flush_tasklet(unsigned long data)
- 	struct flow_flush_info *info = (void *)data;
- 	struct flow_cache *fc = info->cache;
- 	struct flow_cache_percpu *fcp;
--	int i;
-+	struct flow_cache_entry *fle;
-+	struct hlist_node *entry, *tmp;
-+	LIST_HEAD(gc_list);
-+	int i, deleted = 0;
- 
- 	fcp = per_cpu_ptr(fc->percpu, smp_processor_id());
- 	for (i = 0; i < flow_cache_hash_size(fc); i++) {
--		struct flow_cache_entry *fle;
--
--		fle = fcp->hash_table[i];
--		for (; fle; fle = fle->next) {
-+		hlist_for_each_entry_safe(fle, entry, tmp,
-+					  &fcp->hash_table[i], u.hlist) {
- 			if (flow_entry_valid(fle))
- 				continue;
- 
--			if (fle->object)
--				fle->object->ops->delete(fle->object);
--			fle->object = NULL;
-+			deleted++;
-+			hlist_del(&fle->u.hlist);
-+			list_add_tail(&fle->u.gc_list, &gc_list);
- 		}
- 	}
- 
-+	flow_cache_queue_garbage(fcp, deleted, &gc_list);
-+
- 	if (atomic_dec_and_test(&info->cpuleft))
- 		complete(&info->completion);
- }
-@@ -320,7 +358,7 @@ void flow_cache_flush(void)
- static void __init flow_cache_cpu_prepare(struct flow_cache *fc,
- 					  struct flow_cache_percpu *fcp)
- {
--	fcp->hash_table = (struct flow_cache_entry **)
-+	fcp->hash_table = (struct hlist_head *)
- 		__get_free_pages(GFP_KERNEL|__GFP_ZERO, fc->order);
- 	if (!fcp->hash_table)
- 		panic("NET: failed to allocate flow cache order %lu\n", fc->order);
-@@ -354,7 +392,7 @@ static int flow_cache_init(struct flow_cache *fc)
- 
- 	for (order = 0;
- 	     (PAGE_SIZE << order) <
--		     (sizeof(struct flow_cache_entry *)*flow_cache_hash_size(fc));
-+		     (sizeof(struct hlist_head)*flow_cache_hash_size(fc));
- 	     order++)
- 		/* NOTHING */;
- 	fc->order = order;
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch b/main/linux-grsec/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch
deleted file mode 100644
index 6f0dc91286..0000000000
--- a/main/linux-grsec/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e0c0800740cdf64fe7b121c2ef235c01f1957af0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 8 Apr 2010 11:27:42 -0700
-Subject: [PATCH 18/18] xfrm: Fix crashes in xfrm_lookup()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Timo Teräs <timo.teras@iki.fi>
-
-Happens because CONFIG_XFRM_SUB_POLICY is not enabled, and one of
-the helper functions I used did unexpected things in that case.
-
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit e4077e018b5ead3de9951fc01d8bf12eeeeeefed)
----
- include/net/xfrm.h |    7 -------
- 1 files changed, 0 insertions(+), 7 deletions(-)
-
-diff --git a/include/net/xfrm.h b/include/net/xfrm.h
-index d51ef61..280f46f 100644
---- a/include/net/xfrm.h
-+++ b/include/net/xfrm.h
-@@ -738,19 +738,12 @@ static inline void xfrm_pol_put(struct xfrm_policy *policy)
- 		xfrm_policy_destroy(policy);
- }
- 
--#ifdef CONFIG_XFRM_SUB_POLICY
- static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols)
- {
- 	int i;
- 	for (i = npols - 1; i >= 0; --i)
- 		xfrm_pol_put(pols[i]);
- }
--#else
--static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols)
--{
--	xfrm_pol_put(pols[0]);
--}
--#endif
- 
- extern void __xfrm_state_destroy(struct xfrm_state *);
- 
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 02edf0be3f..a0535732d0 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,58 +2,65 @@
 
 _flavor=grsec
 pkgname=linux-${_flavor}
-pkgver=2.6.32.13
-_kernver=2.6.32
+pkgver=2.6.35.10
+_kernver=2.6.35
 pkgrel=0
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
-makedepends="perl installkernel"
+makedepends="perl installkernel bash"
 options="!strip"
-_config=${config:-kernelconfig.${CARCH:-x86}}
+_config=${config:-kernelconfig.${CARCH}}
 install=
 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
-	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
-	grsecurity-2.1.14-2.6.32.13-201005151340.patch
-	0001-grsec-revert-conflicting-flow-cache-changes.patch
-	0002-gre-fix-hard-header-destination-address-checking.patch
-	0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
+	http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v${pkgver%.*}/patch-$pkgver.bz2
+	grsecurity-2.2.0-$pkgver-unofficial.patch
+	0001-xfrm-use-gre-key-as-flow-upper-protocol-info.patch
+	xfrm-fix-gre-key-endianess.patch
 	0004-arp-flush-arp-cache-on-device-change.patch
-	0007-r8169-Fix-rtl8169_rx_interrupt.patch
-	0009-ipsec-Fix-bogus-bundle-flowi.patch
-	0010-xfrm-Remove-xfrm_state_genid.patch
-	0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
-	0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch
-	0013-flow-structurize-flow-cache.patch
-	0014-flow-virtualize-flow-cache-entry-methods.patch
-	0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch
-	0016-xfrm-remove-policy-garbage-collection.patch
-	0017-flow-delayed-deletion-of-flow-cache-entries.patch
-	0018-xfrm-Fix-crashes-in-xfrm_lookup.patch
-	xfrm-fix-policy-unreferencing-on-larval-drop.patch
+	r8169-add-gro-support.patch
+
+	0001-Staging-hv-fix-sleeping-while-atomic-issue.patch
+	0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch
+
+	setlocalversion.patch
 	kernelconfig.x86
+	kernelconfig.x86_64
 	"
 subpackages="$pkgname-dev linux-firmware:firmware"
+arch="x86 x86_64"
 license="GPL-2"
 
 _abi_release=${pkgver}-${_flavor}
 
 prepare() {
+	local _patch_failed=
 	cd "$srcdir"/linux-$_kernver
 	if [ "$_kernver" != "$pkgver" ]; then
 		bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1
 	fi
 
-	# first apply the grsecurity patch and then the rest
-	for i in "$srcdir"/grsecurity*.patch "$srcdir"/0[0-9]*.patch \
-			"$srcdir"/xfrm*; do
-		[ -f $i ] || continue
-		msg "Applying $i..."
-		patch -s -p1 -N < $i || return 1
+	# first apply patches in specified order
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i..."
+			if ! patch -s -p1 -N -i "$srcdir"/$i; then
+				echo $i >>failed
+				_patch_failed=1
+			fi
+			;;
+		esac
 	done
 
+	if ! [ -z "$_patch_failed" ]; then
+		error "The following patches failed:"
+		cat failed
+		return 1
+	fi
+
 	mkdir -p "$srcdir"/build
-	cp "$srcdir"/$_config "$srcdir"/build/.config
+	cp "$srcdir"/$_config "$srcdir"/build/.config || return 1
 	make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="${CC:-gcc}" \
 		silentoldconfig
 }
@@ -67,15 +74,18 @@ menuconfig() {
 
 build() {
 	cd "$srcdir"/build
-	make CC="${CC:--gcc}" || return 1
+	make CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \
+		|| return 1
 }
 
 package() {
 	cd "$srcdir"/build
 	mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules
-	make modules_install install \
+	make -j1 modules_install firmware_install install \
 		INSTALL_MOD_PATH="$pkgdir" \
-		INSTALL_PATH="$pkgdir"/boot
+		INSTALL_PATH="$pkgdir"/boot \
+		|| return 1
 
 	rm -f "$pkgdir"/lib/modules/${_abi_release}/build \
 		"$pkgdir"/lib/modules/${_abi_release}/source
@@ -88,13 +98,13 @@ dev() {
 	# kernel modules and install those as /usr/src/linux-headers,
 	# simlar to what ubuntu does
 	#
-	# this way you dont need to install the 300-400 kernel sources to 
+	# this way you dont need to install the 300-400 kernel sources to
 	# build a tiny kernel module
 	#
 	pkgdesc="Headers and script for third party modules for grsec kernel"
 	local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release}
 
-	# first we import config, run prepare to set up for building 
+	# first we import config, run prepare to set up for building
 	# external modules, and create the scripts
 	mkdir -p "$dir"
 	cp "$srcdir"/$_config "$dir"/.config
@@ -136,23 +146,15 @@ firmware() {
 	mv "$pkgdir"/lib/firmware "$subpkgdir"/lib/
 }
 
-md5sums="260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
-ba6abb1ffee513a1d4f831599ddae490  patch-2.6.32.13.bz2
-00a61e28da8869669171ab12480513e1  grsecurity-2.1.14-2.6.32.13-201005151340.patch
-1d247140abec49b96250aec9aa59b324  0001-grsec-revert-conflicting-flow-cache-changes.patch
-437317f88ec13ace8d39c31983a41696  0002-gre-fix-hard-header-destination-address-checking.patch
-151b29a161178ed39d62a08f21f3484d  0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
+md5sums="091abeb4684ce03d1d936851618687b6  linux-2.6.35.tar.bz2
+0741b3219a009fdfc41c766416007fcf  patch-2.6.35.10.bz2
+3855791bfc2ee4fff05fc3c783a3a477  grsecurity-2.2.0-2.6.35.10-unofficial.patch
+eed5bd98c0a3b976891c897763eceff5  0001-xfrm-use-gre-key-as-flow-upper-protocol-info.patch
+ea7a7eb2775b71ae5ef24d029a4905bd  xfrm-fix-gre-key-endianess.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
-5f8b9a76d95319c5b1aa26b54a42e6b5  0007-r8169-Fix-rtl8169_rx_interrupt.patch
-cf168620efa63479a6e03da78906e32f  0009-ipsec-Fix-bogus-bundle-flowi.patch
-3af4b5ae1afae3278b0070f585b874e3  0010-xfrm-Remove-xfrm_state_genid.patch
-9f284c3fd5ab38cef4544efc1f50c6ba  0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
-b035114e893883cf67530350678e00f5  0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch
-9dea03ec19aaf9a384e4f56f57009257  0013-flow-structurize-flow-cache.patch
-fc9ab26abbfec0d3f20000b5e695620b  0014-flow-virtualize-flow-cache-entry-methods.patch
-c09b82b89a49ba2a3836a0bc3a3312f4  0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch
-41618efb65ab9ddacfb59a1cde9b4edd  0016-xfrm-remove-policy-garbage-collection.patch
-3b83f0972ab715819d1119b120a987e7  0017-flow-delayed-deletion-of-flow-cache-entries.patch
-45a676c7a1759fec60b724d557b4e295  0018-xfrm-Fix-crashes-in-xfrm_lookup.patch
-c7e606c11c05ff03012b21c3fe0ece47  xfrm-fix-policy-unreferencing-on-larval-drop.patch
-7f442049b29ab749180e54ff8f20f1d0  kernelconfig.x86"
+139b39da44ecb577275be53d7d365949  r8169-add-gro-support.patch
+648d8b477248f233c318a3b7a961febf  0001-Staging-hv-fix-sleeping-while-atomic-issue.patch
+7cae2d1e1947fa57d7aaaf31c649471c  0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch
+8c224ba0cdf0aa572c7eb50379435be4  setlocalversion.patch
+a9494f66196bc6308da0f129221d31b8  kernelconfig.x86
+0270cb828e6b23b4aa844c46c8b2d300  kernelconfig.x86_64"
diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.32.13-201005151340.patch b/main/linux-grsec/grsecurity-2.2.0-2.6.35.10-unofficial.patch
index 84b90626b7..bfdddfb8fd 100644
--- a/main/linux-grsec/grsecurity-2.1.14-2.6.32.13-201005151340.patch
+++ b/main/linux-grsec/grsecurity-2.2.0-2.6.35.10-unofficial.patch
@@ -1,7 +1,215 @@
-diff -urNp linux-2.6.32.13/arch/alpha/include/asm/elf.h linux-2.6.32.13/arch/alpha/include/asm/elf.h
---- linux-2.6.32.13/arch/alpha/include/asm/elf.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/alpha/include/asm/elf.h	2010-05-15 13:21:13.518878295 -0400
-@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
+diff --git a/Documentation/dontdiff b/Documentation/dontdiff
+index d9bcffd..32fb41b 100644
+--- a/Documentation/dontdiff
++++ b/Documentation/dontdiff
+@@ -3,6 +3,7 @@
+ *.bin
+ *.cpio
+ *.csp
++*.dbg
+ *.dsp
+ *.dvi
+ *.elf
+@@ -38,8 +39,10 @@
+ *.tab.h
+ *.tex
+ *.ver
++*.vim
+ *.xml
+ *_MODULES
++*_reg_safe.h
+ *_vga16.c
+ *~
+ *.9
+@@ -49,11 +52,16 @@
+ 53c700_d.h
+ CVS
+ ChangeSet
++GPATH
++GRTAGS
++GSYMS
++GTAGS
+ Image
+ Kerntypes
+ Module.markers
+ Module.symvers
+ PENDING
++PERF*
+ SCCS
+ System.map*
+ TAGS
+@@ -76,7 +84,10 @@ btfixupprep
+ build
+ bvmlinux
+ bzImage*
++capflags.c
+ classlist.h*
++clut_vga16.c
++common-cmds.h
+ comp*.log
+ compile.h*
+ conf
+@@ -100,19 +111,22 @@ fore200e_mkfirm
+ fore200e_pca_fw.c*
+ gconf
+ gen-devlist
++gen-kdb_cmds.c
+ gen_crc32table
+ gen_init_cpio
+ generated
+ genheaders
+ genksyms
+ *_gray256.c
++hash
+ ihex2fw
+ ikconfig.h*
++inat-tables.c
+ initramfs_data.cpio
++initramfs_data.cpio.bz2
+ initramfs_data.cpio.gz
+ initramfs_list
+ kallsyms
+-kconfig
+ keywords.c
+ ksym.c*
+ ksym.h*
+@@ -136,10 +150,13 @@ mkboot
+ mkbugboot
+ mkcpustr
+ mkdep
++mkpiggy
+ mkprep
++mkregtable
+ mktables
+ mktree
+ modpost
++modules.builtin
+ modules.order
+ modversions.h*
+ ncscope.*
+@@ -151,7 +168,9 @@ parse.h
+ patches*
+ pca200e.bin
+ pca200e_ecd.bin2
++perf-archive
+ piggy.gz
++piggy.S
+ piggyback
+ pnmtologo
+ ppc_defs.h*
+@@ -160,12 +179,14 @@ qconf
+ raid6altivec*.c
+ raid6int*.c
+ raid6tables.c
++regdb.c
+ relocs
+ series
+ setup
+ setup.bin
+ setup.elf
+ sImage
++slabinfo
+ sm_tbl*
+ split-include
+ syscalltab.h
+@@ -189,14 +210,20 @@ version.h*
+ vmlinux
+ vmlinux-*
+ vmlinux.aout
++vmlinux.bin.all
++vmlinux.bin.bz2
+ vmlinux.lds
++vmlinux.relocs
++voffset.h
+ vsyscall.lds
+ vsyscall_32.lds
+ wanxlfw.inc
+ uImage
+ unifdef
++utsrelease.h
+ wakeup.bin
+ wakeup.elf
+ wakeup.lds
+ zImage*
+ zconf.hash.c
++zoffset.h
+diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt
+index 931c806..e6f6ff1 100644
+--- a/Documentation/filesystems/sysfs.txt
++++ b/Documentation/filesystems/sysfs.txt
+@@ -123,8 +123,8 @@ set of sysfs operations for forwarding read and write calls to the
+ show and store methods of the attribute owners. 
+ 
+ struct sysfs_ops {
+-        ssize_t (*show)(struct kobject *, struct attribute *, char *);
+-        ssize_t (*store)(struct kobject *, struct attribute *, const char *);
++        ssize_t (* const show)(struct kobject *, struct attribute *, char *);
++        ssize_t (* const store)(struct kobject *, struct attribute *, const char *);
+ };
+ 
+ [ Subsystems should have already defined a struct kobj_type as a
+diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
+index 2b2407d..4ebd036 100644
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -1910,6 +1910,12 @@ and is between 256 and 4096 characters. It is defined in the file
+ 			the specified number of seconds.  This is to be used if
+ 			your oopses keep scrolling off the screen.
+ 
++	pax_nouderef	[X86-32] disables UDEREF.  Most likely needed under certain
++			virtualization environments that don't cope well with the
++			expand down segment used by UDEREF on X86-32.
++
++	pax_softmode=	[X86-32] 0/1 to disable/enable PaX softmode on boot already.
++
+ 	pcbit=		[HW,ISDN]
+ 
+ 	pcd.		[PARIDE]
+diff --git a/Makefile b/Makefile
+index 6538501..6616857 100644
+--- a/Makefile
++++ b/Makefile
+@@ -230,8 +230,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
+ 
+ HOSTCC       = gcc
+ HOSTCXX      = g++
+-HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
+-HOSTCXXFLAGS = -O2
++HOSTCFLAGS   = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
++HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
+ 
+ # Decide whether to build built-in, modular, or both.
+ # Normally, just do built-in.
+@@ -650,7 +650,7 @@ export mod_strip_cmd
+ 
+ 
+ ifeq ($(KBUILD_EXTMOD),)
+-core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
++core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
+ 
+ vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
+ 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
+diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h
+index 1bce816..d5b403b 100644
+--- a/arch/alpha/include/asm/dma-mapping.h
++++ b/arch/alpha/include/asm/dma-mapping.h
+@@ -3,9 +3,9 @@
+ 
+ #include <linux/dma-attrs.h>
+ 
+-extern struct dma_map_ops *dma_ops;
++extern const struct dma_map_ops *dma_ops;
+ 
+-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
++static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
+ {
+ 	return dma_ops;
+ }
+diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
+index 9baae8a..8d8bc6b 100644
+--- a/arch/alpha/include/asm/elf.h
++++ b/arch/alpha/include/asm/elf.h
+@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
  
@@ -15,9 +223,10 @@ diff -urNp linux-2.6.32.13/arch/alpha/include/asm/elf.h linux-2.6.32.13/arch/alp
  /* $0 is set by ld.so to a pointer to a function which might be 
     registered using atexit.  This provides a mean for the dynamic
     linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-2.6.32.13/arch/alpha/include/asm/pgtable.h linux-2.6.32.13/arch/alpha/include/asm/pgtable.h
---- linux-2.6.32.13/arch/alpha/include/asm/pgtable.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/alpha/include/asm/pgtable.h	2010-05-15 13:21:13.518878295 -0400
+diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
+index 71a2432..bb30d23 100644
+--- a/arch/alpha/include/asm/pgtable.h
++++ b/arch/alpha/include/asm/pgtable.h
 @@ -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 +245,11 @@ diff -urNp linux-2.6.32.13/arch/alpha/include/asm/pgtable.h linux-2.6.32.13/arch
  #define PAGE_KERNEL	__pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.32.13/arch/alpha/kernel/module.c linux-2.6.32.13/arch/alpha/kernel/module.c
---- linux-2.6.32.13/arch/alpha/kernel/module.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/alpha/kernel/module.c	2010-05-15 13:21:13.518878295 -0400
-@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
+diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
+index ebc3c89..20cfa63 100644
+--- a/arch/alpha/kernel/module.c
++++ b/arch/alpha/kernel/module.c
+@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
  
  	/* The small sections were sorted to the end of the segment.
  	   The following should definitely cover them.  */
@@ -48,10 +258,20 @@ diff -urNp linux-2.6.32.13/arch/alpha/kernel/module.c linux-2.6.32.13/arch/alpha
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.32.13/arch/alpha/kernel/osf_sys.c linux-2.6.32.13/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.13/arch/alpha/kernel/osf_sys.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/alpha/kernel/osf_sys.c	2010-05-15 13:21:13.518878295 -0400
-@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp
+diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
+index de9d397..22afe8a 100644
+--- a/arch/alpha/kernel/osf_sys.c
++++ b/arch/alpha/kernel/osf_sys.c
+@@ -1170,7 +1170,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
+ 		/* At this point:  (!vma || addr < vma->vm_end). */
+ 		if (limit - len < addr)
+ 			return -ENOMEM;
+-		if (!vma || addr + len <= vma->vm_start)
++		if (check_heap_stack_gap(vma, addr, len))
+ 			return addr;
+ 		addr = vma->vm_end;
+ 		vma = vma->vm_next;
+@@ -1206,6 +1206,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
  	   merely specific addresses, but regions of memory -- perhaps
  	   this feature should be incorporated into all ports?  */
  
@@ -62,7 +282,7 @@ diff -urNp linux-2.6.32.13/arch/alpha/kernel/osf_sys.c linux-2.6.32.13/arch/alph
  	if (addr) {
  		addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
  		if (addr != (unsigned long) -ENOMEM)
-@@ -1212,8 +1216,8 @@ arch_get_unmapped_area(struct file *filp
+@@ -1213,8 +1217,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
  	}
  
  	/* Next, try allocating at TASK_UNMAPPED_BASE.  */
@@ -73,10 +293,53 @@ diff -urNp linux-2.6.32.13/arch/alpha/kernel/osf_sys.c linux-2.6.32.13/arch/alph
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urNp linux-2.6.32.13/arch/alpha/mm/fault.c linux-2.6.32.13/arch/alpha/mm/fault.c
---- linux-2.6.32.13/arch/alpha/mm/fault.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/alpha/mm/fault.c	2010-05-15 13:21:13.518878295 -0400
-@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
+diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c
+index 246100e..f05bd14 100644
+--- a/arch/alpha/kernel/pci-noop.c
++++ b/arch/alpha/kernel/pci-noop.c
+@@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct device *dev, u64 mask)
+ 	return 0;
+ }
+ 
+-struct dma_map_ops alpha_noop_ops = {
++const struct dma_map_ops alpha_noop_ops = {
+ 	.alloc_coherent		= alpha_noop_alloc_coherent,
+ 	.free_coherent		= alpha_noop_free_coherent,
+ 	.map_page		= alpha_noop_map_page,
+@@ -183,7 +183,7 @@ struct dma_map_ops alpha_noop_ops = {
+ 	.set_dma_mask		= alpha_noop_set_mask,
+ };
+ 
+-struct dma_map_ops *dma_ops = &alpha_noop_ops;
++const struct dma_map_ops *dma_ops = &alpha_noop_ops;
+ EXPORT_SYMBOL(dma_ops);
+ 
+ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
+diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
+index d1dbd9a..664a19c 100644
+--- a/arch/alpha/kernel/pci_iommu.c
++++ b/arch/alpha/kernel/pci_iommu.c
+@@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct device *dev, u64 mask)
+ 	return 0;
+ }
+ 
+-struct dma_map_ops alpha_pci_ops = {
++const struct dma_map_ops alpha_pci_ops = {
+ 	.alloc_coherent		= alpha_pci_alloc_coherent,
+ 	.free_coherent		= alpha_pci_free_coherent,
+ 	.map_page		= alpha_pci_map_page,
+@@ -962,5 +962,5 @@ struct dma_map_ops alpha_pci_ops = {
+ 	.set_dma_mask		= alpha_pci_set_mask,
+ };
+ 
+-struct dma_map_ops *dma_ops = &alpha_pci_ops;
++const struct dma_map_ops *dma_ops = &alpha_pci_ops;
+ EXPORT_SYMBOL(dma_ops);
+diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
+index fadd5f8..3168191 100644
+--- a/arch/alpha/mm/fault.c
++++ b/arch/alpha/mm/fault.c
+@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
  	__reload_thread(pcb);
  }
  
@@ -201,7 +464,7 @@ diff -urNp linux-2.6.32.13/arch/alpha/mm/fault.c linux-2.6.32.13/arch/alpha/mm/f
  
  /*
   * This routine handles page faults.  It determines the address,
-@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, uns
+@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
   good_area:
  	si_code = SEGV_ACCERR;
  	if (cause < 0) {
@@ -232,10 +495,11 @@ diff -urNp linux-2.6.32.13/arch/alpha/mm/fault.c linux-2.6.32.13/arch/alpha/mm/f
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.32.13/arch/arm/include/asm/elf.h linux-2.6.32.13/arch/arm/include/asm/elf.h
---- linux-2.6.32.13/arch/arm/include/asm/elf.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/include/asm/elf.h	2010-05-15 13:21:13.518878295 -0400
-@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
+diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
+index 51662fe..2939eb4 100644
+--- a/arch/arm/include/asm/elf.h
++++ b/arch/arm/include/asm/elf.h
+@@ -111,7 +111,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
     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.  */
  
@@ -251,21 +515,23 @@ diff -urNp linux-2.6.32.13/arch/arm/include/asm/elf.h linux-2.6.32.13/arch/arm/i
  
  /* When the program starts, a1 contains a pointer to a function to be 
     registered with atexit, as per the SVR4 ABI.  A value of 0 means we 
-diff -urNp linux-2.6.32.13/arch/arm/include/asm/kmap_types.h linux-2.6.32.13/arch/arm/include/asm/kmap_types.h
---- linux-2.6.32.13/arch/arm/include/asm/kmap_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/include/asm/kmap_types.h	2010-05-15 13:21:13.518878295 -0400
-@@ -19,6 +19,7 @@ enum km_type {
- 	KM_SOFTIRQ0,
- 	KM_SOFTIRQ1,
+diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
+index e51b1e8..32a3113 100644
+--- a/arch/arm/include/asm/kmap_types.h
++++ b/arch/arm/include/asm/kmap_types.h
+@@ -21,6 +21,7 @@ enum km_type {
+ 	KM_L1_CACHE,
  	KM_L2_CACHE,
+ 	KM_KDB,
 +	KM_CLEARPAGE,
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.13/arch/arm/include/asm/uaccess.h linux-2.6.32.13/arch/arm/include/asm/uaccess.h
---- linux-2.6.32.13/arch/arm/include/asm/uaccess.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/include/asm/uaccess.h	2010-05-15 13:21:13.518878295 -0400
-@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
+diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
+index 33e4a48..243db72 100644
+--- a/arch/arm/include/asm/uaccess.h
++++ b/arch/arm/include/asm/uaccess.h
+@@ -403,6 +403,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n);
  
  static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
  {
@@ -275,7 +541,7 @@ diff -urNp linux-2.6.32.13/arch/arm/include/asm/uaccess.h linux-2.6.32.13/arch/a
  	if (access_ok(VERIFY_READ, from, n))
  		n = __copy_from_user(to, from, n);
  	else /* security hole - plug it */
-@@ -412,6 +415,9 @@ static inline unsigned long __must_check
+@@ -412,6 +415,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
  
  static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -285,10 +551,11 @@ diff -urNp linux-2.6.32.13/arch/arm/include/asm/uaccess.h linux-2.6.32.13/arch/a
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff -urNp linux-2.6.32.13/arch/arm/kernel/kgdb.c linux-2.6.32.13/arch/arm/kernel/kgdb.c
---- linux-2.6.32.13/arch/arm/kernel/kgdb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/kernel/kgdb.c	2010-05-15 13:21:13.518878295 -0400
-@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
+diff --git a/arch/arm/kernel/kgdb.c b/arch/arm/kernel/kgdb.c
+index c868a88..7c22c9f 100644
+--- a/arch/arm/kernel/kgdb.c
++++ b/arch/arm/kernel/kgdb.c
+@@ -208,7 +208,7 @@ void kgdb_arch_exit(void)
   * and we handle the normal undef case within the do_undefinstr
   * handler.
   */
@@ -297,10 +564,11 @@ diff -urNp linux-2.6.32.13/arch/arm/kernel/kgdb.c linux-2.6.32.13/arch/arm/kerne
  #ifndef __ARMEB__
  	.gdb_bpt_instr		= {0xfe, 0xde, 0xff, 0xe7}
  #else /* ! __ARMEB__ */
-diff -urNp linux-2.6.32.13/arch/arm/mach-at91/pm.c linux-2.6.32.13/arch/arm/mach-at91/pm.c
---- linux-2.6.32.13/arch/arm/mach-at91/pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/mach-at91/pm.c	2010-05-15 13:21:13.518878295 -0400
-@@ -348,7 +348,7 @@ static void at91_pm_end(void)
+diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
+index 6156689..fca5b29 100644
+--- a/arch/arm/mach-at91/pm.c
++++ b/arch/arm/mach-at91/pm.c
+@@ -294,7 +294,7 @@ static void at91_pm_end(void)
  }
  
  
@@ -309,10 +577,36 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-at91/pm.c linux-2.6.32.13/arch/arm/mach
  	.valid	= at91_pm_valid_state,
  	.begin	= at91_pm_begin,
  	.enter	= at91_pm_enter,
-diff -urNp linux-2.6.32.13/arch/arm/mach-omap1/pm.c linux-2.6.32.13/arch/arm/mach-omap1/pm.c
---- linux-2.6.32.13/arch/arm/mach-omap1/pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/mach-omap1/pm.c	2010-05-15 13:21:13.518878295 -0400
-@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq 
+diff --git a/arch/arm/mach-davinci/pm.c b/arch/arm/mach-davinci/pm.c
+index fab953b..1bd73a0 100644
+--- a/arch/arm/mach-davinci/pm.c
++++ b/arch/arm/mach-davinci/pm.c
+@@ -110,7 +110,7 @@ static int davinci_pm_enter(suspend_state_t state)
+ 	return ret;
+ }
+ 
+-static struct platform_suspend_ops davinci_pm_ops = {
++static const struct platform_suspend_ops davinci_pm_ops = {
+ 	.enter		= davinci_pm_enter,
+ 	.valid		= suspend_valid_only_mem,
+ };
+diff --git a/arch/arm/mach-msm/last_radio_log.c b/arch/arm/mach-msm/last_radio_log.c
+index b64ba5a..fb24fa6 100644
+--- a/arch/arm/mach-msm/last_radio_log.c
++++ b/arch/arm/mach-msm/last_radio_log.c
+@@ -47,6 +47,7 @@ static ssize_t last_radio_log_read(struct file *file, char __user *buf,
+ 	return count;
+ }
+ 
++/* cannot be const, see msm_init_last_radio_log */
+ static struct file_operations last_radio_log_fops = {
+ 	.read = last_radio_log_read
+ };
+diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
+index b1d3f9f..6e126ce 100644
+--- a/arch/arm/mach-omap1/pm.c
++++ b/arch/arm/mach-omap1/pm.c
+@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq = {
  
  
  
@@ -321,10 +615,11 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-omap1/pm.c linux-2.6.32.13/arch/arm/mac
  	.prepare	= omap_pm_prepare,
  	.enter		= omap_pm_enter,
  	.finish		= omap_pm_finish,
-diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c	2010-05-15 13:21:13.518878295 -0400
-@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
+diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
+index e321281..57b0f5c 100644
+--- a/arch/arm/mach-omap2/pm24xx.c
++++ b/arch/arm/mach-omap2/pm24xx.c
+@@ -325,7 +325,7 @@ static void omap2_pm_finish(void)
  	enable_hlt();
  }
  
@@ -333,10 +628,11 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.13/arch/arm
  	.prepare	= omap2_pm_prepare,
  	.enter		= omap2_pm_enter,
  	.finish		= omap2_pm_finish,
-diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c	2010-05-15 13:21:13.518878295 -0400
-@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
+diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
+index b88737f..1514908 100644
+--- a/arch/arm/mach-omap2/pm34xx.c
++++ b/arch/arm/mach-omap2/pm34xx.c
+@@ -669,7 +669,7 @@ static void omap3_pm_end(void)
  	return;
  }
  
@@ -345,10 +641,11 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.13/arch/arm
  	.begin		= omap3_pm_begin,
  	.end		= omap3_pm_end,
  	.prepare	= omap3_pm_prepare,
-diff -urNp linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c	2010-05-15 13:21:13.518878295 -0400
-@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
+diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c
+index ee3c29c..f3e60a0 100644
+--- a/arch/arm/mach-pnx4008/pm.c
++++ b/arch/arm/mach-pnx4008/pm.c
+@@ -119,7 +119,7 @@ static int pnx4008_pm_valid(suspend_state_t state)
  	       (state == PM_SUSPEND_MEM);
  }
  
@@ -357,10 +654,11 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c linux-2.6.32.13/arch/arm/m
  	.enter = pnx4008_pm_enter,
  	.valid = pnx4008_pm_valid,
  };
-diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/pm.c linux-2.6.32.13/arch/arm/mach-pxa/pm.c
---- linux-2.6.32.13/arch/arm/mach-pxa/pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/mach-pxa/pm.c	2010-05-15 13:21:13.518878295 -0400
-@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
+diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
+index 166c15f..978e1b2 100644
+--- a/arch/arm/mach-pxa/pm.c
++++ b/arch/arm/mach-pxa/pm.c
+@@ -96,7 +96,7 @@ void pxa_pm_finish(void)
  		pxa_cpu_pm_fns->finish();
  }
  
@@ -369,10 +667,11 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/pm.c linux-2.6.32.13/arch/arm/mach-
  	.valid		= pxa_pm_valid,
  	.enter		= pxa_pm_enter,
  	.prepare	= pxa_pm_prepare,
-diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c	2010-05-15 13:21:13.531870735 -0400
-@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
+diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
+index cb47672..0a366cc 100644
+--- a/arch/arm/mach-pxa/sharpsl_pm.c
++++ b/arch/arm/mach-pxa/sharpsl_pm.c
+@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)
  }
  
  #ifdef CONFIG_PM
@@ -381,9 +680,10 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.13/arch/a
  	.prepare	= pxa_pm_prepare,
  	.finish		= pxa_pm_finish,
  	.enter		= corgi_pxa_pm_enter,
-diff -urNp linux-2.6.32.13/arch/arm/mach-sa1100/pm.c linux-2.6.32.13/arch/arm/mach-sa1100/pm.c
---- linux-2.6.32.13/arch/arm/mach-sa1100/pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/mach-sa1100/pm.c	2010-05-15 13:21:13.531870735 -0400
+diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
+index c83fdc8..ab9fc44 100644
+--- a/arch/arm/mach-sa1100/pm.c
++++ b/arch/arm/mach-sa1100/pm.c
 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
  	return virt_to_phys(sp);
  }
@@ -393,10 +693,11 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-sa1100/pm.c linux-2.6.32.13/arch/arm/ma
  	.enter		= sa11x0_pm_enter,
  	.valid		= suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.32.13/arch/arm/mm/fault.c linux-2.6.32.13/arch/arm/mm/fault.c
---- linux-2.6.32.13/arch/arm/mm/fault.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/mm/fault.c	2010-05-15 13:21:13.542880278 -0400
-@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
+diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
+index cbfb2ed..de319e0 100644
+--- a/arch/arm/mm/fault.c
++++ b/arch/arm/mm/fault.c
+@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
  	}
  #endif
  
@@ -410,7 +711,7 @@ diff -urNp linux-2.6.32.13/arch/arm/mm/fault.c linux-2.6.32.13/arch/arm/mm/fault
  	tsk->thread.address = addr;
  	tsk->thread.error_code = fsr;
  	tsk->thread.trap_no = 14;
-@@ -357,6 +364,33 @@ do_page_fault(unsigned long addr, unsign
+@@ -364,6 +371,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
  }
  #endif					/* CONFIG_MMU */
  
@@ -444,10 +745,11 @@ diff -urNp linux-2.6.32.13/arch/arm/mm/fault.c linux-2.6.32.13/arch/arm/mm/fault
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-2.6.32.13/arch/arm/mm/mmap.c linux-2.6.32.13/arch/arm/mm/mmap.c
---- linux-2.6.32.13/arch/arm/mm/mmap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/mm/mmap.c	2010-05-15 13:21:13.546915063 -0400
-@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
+diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
+index f5abc51..7ec524c 100644
+--- a/arch/arm/mm/mmap.c
++++ b/arch/arm/mm/mmap.c
+@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
  	if (len > TASK_SIZE)
  		return -ENOMEM;
  
@@ -458,7 +760,13 @@ diff -urNp linux-2.6.32.13/arch/arm/mm/mmap.c linux-2.6.32.13/arch/arm/mm/mmap.c
  	if (addr) {
  		if (do_align)
  			addr = COLOUR_ALIGN(addr, pgoff);
-@@ -75,10 +79,10 @@ arch_get_unmapped_area(struct file *filp
+@@ -70,15 +74,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ 			addr = PAGE_ALIGN(addr);
+ 
+ 		vma = find_vma(mm, addr);
+-		if (TASK_SIZE - len >= addr &&
+-		    (!vma || addr + len <= vma->vm_start))
++		if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
  			return addr;
  	}
  	if (len > mm->cached_hole_size) {
@@ -472,7 +780,7 @@ diff -urNp linux-2.6.32.13/arch/arm/mm/mmap.c linux-2.6.32.13/arch/arm/mm/mmap.c
  	}
  
  full_search:
-@@ -94,8 +98,8 @@ full_search:
+@@ -94,14 +97,14 @@ full_search:
  			 * Start a new search - just in case we missed
  			 * some holes.
  			 */
@@ -483,9 +791,17 @@ diff -urNp linux-2.6.32.13/arch/arm/mm/mmap.c linux-2.6.32.13/arch/arm/mm/mmap.c
  				mm->cached_hole_size = 0;
  				goto full_search;
  			}
-diff -urNp linux-2.6.32.13/arch/arm/plat-s3c/pm.c linux-2.6.32.13/arch/arm/plat-s3c/pm.c
---- linux-2.6.32.13/arch/arm/plat-s3c/pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/arm/plat-s3c/pm.c	2010-05-15 13:21:13.546915063 -0400
+ 			return -ENOMEM;
+ 		}
+-		if (!vma || addr + len <= vma->vm_start) {
++		if (check_heap_stack_gap(vma, addr, len)) {
+ 			/*
+ 			 * Remember the place where we stopped the search:
+ 			 */
+diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c
+index 27cfca5..5bf3f2f 100644
+--- a/arch/arm/plat-samsung/pm.c
++++ b/arch/arm/plat-samsung/pm.c
 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
  	s3c_pm_check_cleanup();
  }
@@ -495,10 +811,11 @@ diff -urNp linux-2.6.32.13/arch/arm/plat-s3c/pm.c linux-2.6.32.13/arch/arm/plat-
  	.enter		= s3c_pm_enter,
  	.prepare	= s3c_pm_prepare,
  	.finish		= s3c_pm_finish,
-diff -urNp linux-2.6.32.13/arch/avr32/include/asm/elf.h linux-2.6.32.13/arch/avr32/include/asm/elf.h
---- linux-2.6.32.13/arch/avr32/include/asm/elf.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/avr32/include/asm/elf.h	2010-05-15 13:21:13.546915063 -0400
-@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
+diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
+index 3b3159b..425ea94 100644
+--- a/arch/avr32/include/asm/elf.h
++++ b/arch/avr32/include/asm/elf.h
+@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
     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.  */
  
@@ -514,9 +831,10 @@ diff -urNp linux-2.6.32.13/arch/avr32/include/asm/elf.h linux-2.6.32.13/arch/avr
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
-diff -urNp linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h	2010-05-15 13:21:13.546915063 -0400
+diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
+index b7f5c68..556135c 100644
+--- a/arch/avr32/include/asm/kmap_types.h
++++ b/arch/avr32/include/asm/kmap_types.h
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -527,9 +845,10 @@ diff -urNp linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h linux-2.6.32.13/a
  };
  
  #undef D
-diff -urNp linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c	2010-05-15 13:21:13.546915063 -0400
+diff --git a/arch/avr32/mach-at32ap/pm.c b/arch/avr32/mach-at32ap/pm.c
+index f021edf..32d680e 100644
+--- a/arch/avr32/mach-at32ap/pm.c
++++ b/arch/avr32/mach-at32ap/pm.c
 @@ -176,7 +176,7 @@ out:
  	return 0;
  }
@@ -539,10 +858,11 @@ diff -urNp linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c linux-2.6.32.13/arch/avr3
  	.valid	= avr32_pm_valid_state,
  	.enter	= avr32_pm_enter,
  };
-diff -urNp linux-2.6.32.13/arch/avr32/mm/fault.c linux-2.6.32.13/arch/avr32/mm/fault.c
---- linux-2.6.32.13/arch/avr32/mm/fault.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/avr32/mm/fault.c	2010-05-15 13:21:13.546915063 -0400
-@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
+diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
+index b61d86d..b7cf88f 100644
+--- a/arch/avr32/mm/fault.c
++++ b/arch/avr32/mm/fault.c
+@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
  
  int exception_trace = 1;
  
@@ -583,10 +903,11 @@ diff -urNp linux-2.6.32.13/arch/avr32/mm/fault.c linux-2.6.32.13/arch/avr32/mm/f
  		if (exception_trace && printk_ratelimit())
  			printk("%s%s[%d]: segfault at %08lx pc %08lx "
  			       "sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.32.13/arch/blackfin/kernel/kgdb.c linux-2.6.32.13/arch/blackfin/kernel/kgdb.c
---- linux-2.6.32.13/arch/blackfin/kernel/kgdb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/blackfin/kernel/kgdb.c	2010-05-15 13:21:13.568389913 -0400
-@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
+diff --git a/arch/blackfin/kernel/kgdb.c b/arch/blackfin/kernel/kgdb.c
+index 08bc44e..a6566ab 100644
+--- a/arch/blackfin/kernel/kgdb.c
++++ b/arch/blackfin/kernel/kgdb.c
+@@ -397,7 +397,7 @@ int kgdb_arch_handle_exception(int vector, int signo,
  	return -1;		/* this means that we do not want to exit from the handler */
  }
  
@@ -595,10 +916,11 @@ diff -urNp linux-2.6.32.13/arch/blackfin/kernel/kgdb.c linux-2.6.32.13/arch/blac
  	.gdb_bpt_instr = {0xa1},
  #ifdef CONFIG_SMP
  	.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.32.13/arch/blackfin/mach-common/pm.c linux-2.6.32.13/arch/blackfin/mach-common/pm.c
---- linux-2.6.32.13/arch/blackfin/mach-common/pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/blackfin/mach-common/pm.c	2010-05-15 13:21:13.568389913 -0400
-@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
+diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
+index ea7f95f..a1b1ba5 100644
+--- a/arch/blackfin/mach-common/pm.c
++++ b/arch/blackfin/mach-common/pm.c
+@@ -232,7 +232,7 @@ static int bfin_pm_enter(suspend_state_t state)
  	return 0;
  }
  
@@ -607,9 +929,32 @@ diff -urNp linux-2.6.32.13/arch/blackfin/mach-common/pm.c linux-2.6.32.13/arch/b
  	.enter = bfin_pm_enter,
  	.valid	= bfin_pm_valid,
  };
-diff -urNp linux-2.6.32.13/arch/frv/include/asm/kmap_types.h linux-2.6.32.13/arch/frv/include/asm/kmap_types.h
---- linux-2.6.32.13/arch/frv/include/asm/kmap_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/frv/include/asm/kmap_types.h	2010-05-15 13:21:13.568389913 -0400
+diff --git a/arch/blackfin/mm/maccess.c b/arch/blackfin/mm/maccess.c
+index b71cebc..e253211 100644
+--- a/arch/blackfin/mm/maccess.c
++++ b/arch/blackfin/mm/maccess.c
+@@ -16,7 +16,7 @@ static int validate_memory_access_address(unsigned long addr, int size)
+ 	return bfin_mem_access_type(addr, size);
+ }
+ 
+-long probe_kernel_read(void *dst, void *src, size_t size)
++long probe_kernel_read(void *dst, const void *src, size_t size)
+ {
+ 	unsigned long lsrc = (unsigned long)src;
+ 	int mem_type;
+@@ -55,7 +55,7 @@ long probe_kernel_read(void *dst, void *src, size_t size)
+ 	return -EFAULT;
+ }
+ 
+-long probe_kernel_write(void *dst, void *src, size_t size)
++long probe_kernel_write(void *dst, const void *src, size_t size)
+ {
+ 	unsigned long ldst = (unsigned long)dst;
+ 	int mem_type;
+diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
+index f8e16b2..c73ff79 100644
+--- a/arch/frv/include/asm/kmap_types.h
++++ b/arch/frv/include/asm/kmap_types.h
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -618,9 +963,42 @@ diff -urNp linux-2.6.32.13/arch/frv/include/asm/kmap_types.h linux-2.6.32.13/arc
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c	2010-05-15 13:21:13.584352190 -0400
+diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
+index 385fd30..6c3d97e 100644
+--- a/arch/frv/mm/elf-fdpic.c
++++ b/arch/frv/mm/elf-fdpic.c
+@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+ 	if (addr) {
+ 		addr = PAGE_ALIGN(addr);
+ 		vma = find_vma(current->mm, addr);
+-		if (TASK_SIZE - len >= addr &&
+-		    (!vma || addr + len <= vma->vm_start))
++		if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
+ 			goto success;
+ 	}
+ 
+@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+ 			for (; vma; vma = vma->vm_next) {
+ 				if (addr > limit)
+ 					break;
+-				if (addr + len <= vma->vm_start)
++				if (check_heap_stack_gap(vma, addr, len))
+ 					goto success;
+ 				addr = vma->vm_end;
+ 			}
+@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+ 		for (; vma; vma = vma->vm_next) {
+ 			if (addr > limit)
+ 				break;
+-			if (addr + len <= vma->vm_start)
++			if (check_heap_stack_gap(vma, addr, len))
+ 				goto success;
+ 			addr = vma->vm_end;
+ 		}
+diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c
+index e4a80d8..11a7ea1 100644
+--- a/arch/ia64/hp/common/hwsw_iommu.c
++++ b/arch/ia64/hp/common/hwsw_iommu.c
 @@ -17,7 +17,7 @@
  #include <linux/swiotlb.h>
  #include <asm/machvec.h>
@@ -630,7 +1008,7 @@ diff -urNp linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.13/arch
  
  /* swiotlb declarations & definitions: */
  extern int swiotlb_late_init_with_default_size (size_t size);
-@@ -33,7 +33,7 @@ static inline int use_swiotlb(struct dev
+@@ -33,7 +33,7 @@ static inline int use_swiotlb(struct device *dev)
  		!sba_dma_ops.dma_supported(dev, *dev->dma_mask);
  }
  
@@ -639,10 +1017,11 @@ diff -urNp linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.13/arch
  {
  	if (use_swiotlb(dev))
  		return &swiotlb_dma_ops;
-diff -urNp linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c	2010-05-15 13:21:13.614291139 -0400
-@@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d
+diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
+index 4ce8d13..62d8118 100644
+--- a/arch/ia64/hp/common/sba_iommu.c
++++ b/arch/ia64/hp/common/sba_iommu.c
+@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_driver = {
  	},
  };
  
@@ -651,7 +1030,7 @@ diff -urNp linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.13/arch/
  
  static int __init
  sba_init(void)
-@@ -2191,7 +2191,7 @@ sba_page_override(char *str)
+@@ -2211,7 +2211,7 @@ sba_page_override(char *str)
  
  __setup("sbapagesize=",sba_page_override);
  
@@ -660,45 +1039,10 @@ diff -urNp linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.13/arch/
  	.alloc_coherent		= sba_alloc_coherent,
  	.free_coherent		= sba_free_coherent,
  	.map_page		= sba_map_page,
-diff -urNp linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c	2010-05-15 13:21:13.614854679 -0400
-@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
- 
- #define elf_read_implies_exec(ex, have_pt_gnu_stack)	(!(have_pt_gnu_stack))
- 
-+#ifdef CONFIG_PAX_ASLR
-+#define PAX_ELF_ET_DYN_BASE	(current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
-+
-+#define PAX_DELTA_MMAP_LEN	(current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
-+#define PAX_DELTA_STACK_LEN	(current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
-+#endif
-+
- /* Ugly but avoids duplication */
- #include "../../../fs/binfmt_elf.c"
- 
-diff -urNp linux-2.6.32.13/arch/ia64/ia32/ia32priv.h linux-2.6.32.13/arch/ia64/ia32/ia32priv.h
---- linux-2.6.32.13/arch/ia64/ia32/ia32priv.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/ia32/ia32priv.h	2010-05-15 13:21:13.614854679 -0400
-@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
- #define ELF_DATA	ELFDATA2LSB
- #define ELF_ARCH	EM_386
- 
--#define IA32_STACK_TOP		IA32_PAGE_OFFSET
-+#ifdef CONFIG_PAX_RANDUSTACK
-+#define __IA32_DELTA_STACK	(current->mm->delta_stack)
-+#else
-+#define __IA32_DELTA_STACK	0UL
-+#endif
-+
-+#define IA32_STACK_TOP		(IA32_PAGE_OFFSET - __IA32_DELTA_STACK)
-+
- #define IA32_GATE_OFFSET	IA32_PAGE_OFFSET
- #define IA32_GATE_END		IA32_PAGE_OFFSET + PAGE_SIZE
- 
-diff -urNp linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h	2010-05-15 13:21:13.614854679 -0400
+diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
+index 7d09a09..a74b3b0 100644
+--- a/arch/ia64/include/asm/dma-mapping.h
++++ b/arch/ia64/include/asm/dma-mapping.h
 @@ -12,7 +12,7 @@
  
  #define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -708,7 +1052,7 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.13/a
  extern struct ia64_machine_vector ia64_mv;
  extern void set_iommu_machvec(void);
  
-@@ -24,7 +24,7 @@ extern void machvec_dma_sync_sg(struct d
+@@ -24,7 +24,7 @@ extern void machvec_dma_sync_sg(struct device *, struct scatterlist *, int,
  static inline void *dma_alloc_coherent(struct device *dev, size_t size,
  				       dma_addr_t *daddr, gfp_t gfp)
  {
@@ -717,7 +1061,7 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.13/a
  	void *caddr;
  
  	caddr = ops->alloc_coherent(dev, size, daddr, gfp);
-@@ -35,7 +35,7 @@ static inline void *dma_alloc_coherent(s
+@@ -35,7 +35,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
  static inline void dma_free_coherent(struct device *dev, size_t size,
  				     void *caddr, dma_addr_t daddr)
  {
@@ -726,7 +1070,7 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.13/a
  	debug_dma_free_coherent(dev, size, caddr, daddr);
  	ops->free_coherent(dev, size, caddr, daddr);
  }
-@@ -49,13 +49,13 @@ static inline void dma_free_coherent(str
+@@ -49,13 +49,13 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
  
  static inline int dma_mapping_error(struct device *dev, dma_addr_t daddr)
  {
@@ -742,10 +1086,11 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.13/a
  	return ops->dma_supported(dev, mask);
  }
  
-diff -urNp linux-2.6.32.13/arch/ia64/include/asm/elf.h linux-2.6.32.13/arch/ia64/include/asm/elf.h
---- linux-2.6.32.13/arch/ia64/include/asm/elf.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/include/asm/elf.h	2010-05-15 13:21:13.614854679 -0400
-@@ -43,6 +43,13 @@
+diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
+index b5298eb..67c6e62 100644
+--- a/arch/ia64/include/asm/elf.h
++++ b/arch/ia64/include/asm/elf.h
+@@ -42,6 +42,13 @@
   */
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x800000000UL)
  
@@ -759,10 +1104,11 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/elf.h linux-2.6.32.13/arch/ia64
  #define PT_IA_64_UNWIND		0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-2.6.32.13/arch/ia64/include/asm/machvec.h linux-2.6.32.13/arch/ia64/include/asm/machvec.h
---- linux-2.6.32.13/arch/ia64/include/asm/machvec.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/include/asm/machvec.h	2010-05-15 13:21:13.614854679 -0400
-@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
+diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h
+index 367d299..9ad4279 100644
+--- a/arch/ia64/include/asm/machvec.h
++++ b/arch/ia64/include/asm/machvec.h
+@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event_t(void);
  /* DMA-mapping interface: */
  typedef void ia64_mv_dma_init (void);
  typedef u64 ia64_mv_dma_get_required_mask (struct device *);
@@ -771,7 +1117,7 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/machvec.h linux-2.6.32.13/arch/
  
  /*
   * WARNING: The legacy I/O space is _architected_.  Platforms are
-@@ -251,7 +251,7 @@ extern void machvec_init_from_cmdline(co
+@@ -251,7 +251,7 @@ extern void machvec_init_from_cmdline(const char *cmdline);
  # endif /* CONFIG_IA64_GENERIC */
  
  extern void swiotlb_dma_init(void);
@@ -780,9 +1126,19 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/machvec.h linux-2.6.32.13/arch/
  
  /*
   * Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.32.13/arch/ia64/include/asm/pgtable.h linux-2.6.32.13/arch/ia64/include/asm/pgtable.h
---- linux-2.6.32.13/arch/ia64/include/asm/pgtable.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/include/asm/pgtable.h	2010-05-15 13:21:13.618628456 -0400
+diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
+index c3286f4..ed33359 100644
+--- a/arch/ia64/include/asm/pgtable.h
++++ b/arch/ia64/include/asm/pgtable.h
+@@ -12,7 +12,7 @@
+  *	David Mosberger-Tang <davidm@hpl.hp.com>
+  */
+ 
+-
++#include <linux/const.h>
+ #include <asm/mman.h>
+ #include <asm/page.h>
+ #include <asm/processor.h>
 @@ -143,6 +143,17 @@
  #define PAGE_READONLY	__pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
  #define PAGE_COPY	__pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
@@ -801,10 +1157,11 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/pgtable.h linux-2.6.32.13/arch/
  #define PAGE_GATE	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
  #define PAGE_KERNEL	__pgprot(__DIRTY_BITS  | _PAGE_PL_0 | _PAGE_AR_RWX)
  #define PAGE_KERNELRX	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-2.6.32.13/arch/ia64/include/asm/uaccess.h linux-2.6.32.13/arch/ia64/include/asm/uaccess.h
---- linux-2.6.32.13/arch/ia64/include/asm/uaccess.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/include/asm/uaccess.h	2010-05-15 13:21:13.626873619 -0400
-@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
+diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
+index 449c8c0..432a3d2 100644
+--- a/arch/ia64/include/asm/uaccess.h
++++ b/arch/ia64/include/asm/uaccess.h
+@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
  	const void *__cu_from = (from);							\
  	long __cu_len = (n);								\
  											\
@@ -813,7 +1170,7 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/uaccess.h linux-2.6.32.13/arch/
  		__cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void _
+@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
  	long __cu_len = (n);								\
  											\
  	__chk_user_ptr(__cu_from);							\
@@ -822,9 +1179,10 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/uaccess.h linux-2.6.32.13/arch/
  		__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-diff -urNp linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c	2010-05-15 13:21:13.626873619 -0400
+diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c
+index f2c1600..969398a 100644
+--- a/arch/ia64/kernel/dma-mapping.c
++++ b/arch/ia64/kernel/dma-mapping.c
 @@ -3,7 +3,7 @@
  /* Set this to 1 if there is a HW IOMMU in the system */
  int iommu_detected __read_mostly;
@@ -843,9 +1201,10 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c linux-2.6.32.13/arch/i
  {
  	return dma_ops;
  }
-diff -urNp linux-2.6.32.13/arch/ia64/kernel/module.c linux-2.6.32.13/arch/ia64/kernel/module.c
---- linux-2.6.32.13/arch/ia64/kernel/module.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/kernel/module.c	2010-05-15 13:21:13.626873619 -0400
+diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
+index 1481b0a..e7d38ff 100644
+--- a/arch/ia64/kernel/module.c
++++ b/arch/ia64/kernel/module.c
 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
  void
  module_free (struct module *mod, void *module_region)
@@ -856,7 +1215,7 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/module.c linux-2.6.32.13/arch/ia64/k
  		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
+@@ -502,15 +501,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
  }
  
  static inline int
@@ -898,7 +1257,7 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/module.c linux-2.6.32.13/arch/ia64/k
  }
  
  static inline int
-@@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_
+@@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
  		break;
  
  	      case RV_BDREL:
@@ -914,7 +1273,7 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/module.c linux-2.6.32.13/arch/ia64/k
  		break;
  
  	      case RV_LTV:
-@@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs,
+@@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
  		 *     addresses have been selected...
  		 */
  		uint64_t gp;
@@ -934,9 +1293,10 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/module.c linux-2.6.32.13/arch/ia64/k
  		mod->arch.gp = gp;
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
-diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-dma.c linux-2.6.32.13/arch/ia64/kernel/pci-dma.c
---- linux-2.6.32.13/arch/ia64/kernel/pci-dma.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/kernel/pci-dma.c	2010-05-15 13:21:13.626873619 -0400
+diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
+index f6b1ff0..ccacc2f 100644
+--- a/arch/ia64/kernel/pci-dma.c
++++ b/arch/ia64/kernel/pci-dma.c
 @@ -43,7 +43,7 @@ struct device fallback_dev = {
  	.dma_mask = &fallback_dev.coherent_dma_mask,
  };
@@ -946,10 +1306,11 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-dma.c linux-2.6.32.13/arch/ia64/
  
  static int __init pci_iommu_init(void)
  {
-diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c	2010-05-15 13:21:13.626873619 -0400
-@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
+diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c
+index d9485d9..e3deb12 100644
+--- a/arch/ia64/kernel/pci-swiotlb.c
++++ b/arch/ia64/kernel/pci-swiotlb.c
+@@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent(struct device *dev, size_t size,
  	return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
  }
  
@@ -958,10 +1319,11 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.13/arch/i
  	.alloc_coherent = ia64_swiotlb_alloc_coherent,
  	.free_coherent = swiotlb_free_coherent,
  	.map_page = swiotlb_map_page,
-diff -urNp linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c	2010-05-15 13:21:13.626873619 -0400
-@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
+diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
+index 609d500..7dde2a8 100644
+--- a/arch/ia64/kernel/sys_ia64.c
++++ b/arch/ia64/kernel/sys_ia64.c
+@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
  	if (REGION_NUMBER(addr) == RGN_HPAGE)
  		addr = 0;
  #endif
@@ -975,7 +1337,7 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c linux-2.6.32.13/arch/ia64
  	if (!addr)
  		addr = mm->free_area_cache;
  
-@@ -61,9 +68,9 @@ arch_get_unmapped_area (struct file *fil
+@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
  	for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
@@ -987,22 +1349,17 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c linux-2.6.32.13/arch/ia64
  				goto full_search;
  			}
  			return -ENOMEM;
-diff -urNp linux-2.6.32.13/arch/ia64/kernel/topology.c linux-2.6.32.13/arch/ia64/kernel/topology.c
---- linux-2.6.32.13/arch/ia64/kernel/topology.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/kernel/topology.c	2010-05-15 13:21:13.626873619 -0400
-@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
- 	return ret;
- }
- 
--static struct sysfs_ops cache_sysfs_ops = {
-+static const struct sysfs_ops cache_sysfs_ops = {
- 	.show   = cache_show
- };
- 
-diff -urNp linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S	2010-05-15 13:21:13.626873619 -0400
-@@ -190,7 +190,7 @@ SECTIONS
+ 		}
+-		if (!vma || addr + len <= vma->vm_start) {
++		if (check_heap_stack_gap(vma, addr, len)) {
+ 			/* Remember the address where we stopped this search:  */
+ 			mm->free_area_cache = addr + len;
+ 			return addr;
+diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
+index e07218a..fe87c0f 100644
+--- a/arch/ia64/kernel/vmlinux.lds.S
++++ b/arch/ia64/kernel/vmlinux.lds.S
+@@ -196,7 +196,7 @@ SECTIONS
    /* Per-cpu data: */
    . = ALIGN(PERCPU_PAGE_SIZE);
    PERCPU_VADDR(PERCPU_ADDR, :percpu)
@@ -1011,10 +1368,11 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.13/arch/i
    . = __phys_per_cpu_start + PERCPU_PAGE_SIZE;	/* ensure percpu data fits
    						 * into percpu page size
  						 */
-diff -urNp linux-2.6.32.13/arch/ia64/mm/fault.c linux-2.6.32.13/arch/ia64/mm/fault.c
---- linux-2.6.32.13/arch/ia64/mm/fault.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/mm/fault.c	2010-05-15 13:21:13.626873619 -0400
-@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 
+diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
+index 0799fea..4879544 100644
+--- a/arch/ia64/mm/fault.c
++++ b/arch/ia64/mm/fault.c
+@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
  	return pte_present(pte);
  }
  
@@ -1038,7 +1396,7 @@ diff -urNp linux-2.6.32.13/arch/ia64/mm/fault.c linux-2.6.32.13/arch/ia64/mm/fau
  void __kprobes
  ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
  {
-@@ -145,9 +162,23 @@ ia64_do_page_fault (unsigned long addres
+@@ -145,9 +162,23 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
  	mask = (  (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
  		| (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
  
@@ -1060,12 +1418,26 @@ diff -urNp linux-2.6.32.13/arch/ia64/mm/fault.c linux-2.6.32.13/arch/ia64/mm/fau
  
 +	}
 +
-   survive:
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.13/arch/ia64/mm/init.c linux-2.6.32.13/arch/ia64/mm/init.c
---- linux-2.6.32.13/arch/ia64/mm/init.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/mm/init.c	2010-05-15 13:21:13.626873619 -0400
+ 	 * sure we exit gracefully rather than endlessly redo the
+diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
+index 1841ee7..3d78dd6 100644
+--- a/arch/ia64/mm/hugetlbpage.c
++++ b/arch/ia64/mm/hugetlbpage.c
+@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
+ 		/* At this point:  (!vmm || addr < vmm->vm_end). */
+ 		if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
+ 			return -ENOMEM;
+-		if (!vmm || (addr + len) <= vmm->vm_start)
++		if (check_heap_stack_gap(vmm, addr, len))
+ 			return addr;
+ 		addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
+ 	}
+diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
+index ed41759..fcaf88a 100644
+--- a/arch/ia64/mm/init.c
++++ b/arch/ia64/mm/init.c
 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
  		vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
  		vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1086,10 +1458,11 @@ diff -urNp linux-2.6.32.13/arch/ia64/mm/init.c linux-2.6.32.13/arch/ia64/mm/init
  		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-2.6.32.13/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c	2010-05-15 13:21:13.626873619 -0400
-@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
+diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
+index a9d310d..447c7cc 100644
+--- a/arch/ia64/sn/pci/pci_dma.c
++++ b/arch/ia64/sn/pci/pci_dma.c
+@@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size)
  	return ret;
  }
  
@@ -1098,9 +1471,10 @@ diff -urNp linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.13/arch/ia64/
  	.alloc_coherent		= sn_dma_alloc_coherent,
  	.free_coherent		= sn_dma_free_coherent,
  	.map_page		= sn_dma_map_page,
-diff -urNp linux-2.6.32.13/arch/m32r/lib/usercopy.c linux-2.6.32.13/arch/m32r/lib/usercopy.c
---- linux-2.6.32.13/arch/m32r/lib/usercopy.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/m32r/lib/usercopy.c	2010-05-15 13:21:13.630645180 -0400
+diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
+index 82abd15..d95ae5d 100644
+--- a/arch/m32r/lib/usercopy.c
++++ b/arch/m32r/lib/usercopy.c
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1111,7 +1485,7 @@ diff -urNp linux-2.6.32.13/arch/m32r/lib/usercopy.c linux-2.6.32.13/arch/m32r/li
  	prefetch(from);
  	if (access_ok(VERIFY_WRITE, to, n))
  		__copy_user(to,from,n);
-@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, 
+@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
  unsigned long
  __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
  {
@@ -1121,10 +1495,149 @@ diff -urNp linux-2.6.32.13/arch/m32r/lib/usercopy.c linux-2.6.32.13/arch/m32r/li
  	prefetchw(to);
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c	2010-05-15 13:21:13.630645180 -0400
-@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
+diff --git a/arch/microblaze/include/asm/device.h b/arch/microblaze/include/asm/device.h
+index 123b2fe..f8926eb 100644
+--- a/arch/microblaze/include/asm/device.h
++++ b/arch/microblaze/include/asm/device.h
+@@ -13,7 +13,7 @@ struct device_node;
+ 
+ struct dev_archdata {
+ 	/* DMA operations on that device */
+-	struct dma_map_ops	*dma_ops;
++	const struct dma_map_ops	*dma_ops;
+ 	void                    *dma_data;
+ };
+ 
+diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
+index 18b3731..714c068 100644
+--- a/arch/microblaze/include/asm/dma-mapping.h
++++ b/arch/microblaze/include/asm/dma-mapping.h
+@@ -43,14 +43,14 @@ static inline unsigned long device_to_mask(struct device *dev)
+ 	return 0xfffffffful;
+ }
+ 
+-extern struct dma_map_ops *dma_ops;
++extern const struct dma_map_ops *dma_ops;
+ 
+ /*
+  * Available generic sets of operations
+  */
+-extern struct dma_map_ops dma_direct_ops;
++extern const struct dma_map_ops dma_direct_ops;
+ 
+-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
++static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
+ {
+ 	/* We don't handle the NULL dev case for ISA for now. We could
+ 	 * do it via an out of line call but it is not needed for now. The
+@@ -63,14 +63,14 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
+ 	return dev->archdata.dma_ops;
+ }
+ 
+-static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
++static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops)
+ {
+ 	dev->archdata.dma_ops = ops;
+ }
+ 
+ static inline int dma_supported(struct device *dev, u64 mask)
+ {
+-	struct dma_map_ops *ops = get_dma_ops(dev);
++	const struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+ 	if (unlikely(!ops))
+ 		return 0;
+@@ -87,7 +87,7 @@ static inline int dma_supported(struct device *dev, u64 mask)
+ 
+ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
+ {
+-	struct dma_map_ops *ops = get_dma_ops(dev);
++	const struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+ 	if (unlikely(ops == NULL))
+ 		return -EIO;
+@@ -103,7 +103,7 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
+ 
+ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
+ {
+-	struct dma_map_ops *ops = get_dma_ops(dev);
++	const struct dma_map_ops *ops = get_dma_ops(dev);
+ 	if (ops->mapping_error)
+ 		return ops->mapping_error(dev, dma_addr);
+ 
+@@ -117,7 +117,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
+ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
+ 					dma_addr_t *dma_handle, gfp_t flag)
+ {
+-	struct dma_map_ops *ops = get_dma_ops(dev);
++	const struct dma_map_ops *ops = get_dma_ops(dev);
+ 	void *memory;
+ 
+ 	BUG_ON(!ops);
+@@ -131,7 +131,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
+ static inline void dma_free_coherent(struct device *dev, size_t size,
+ 				     void *cpu_addr, dma_addr_t dma_handle)
+ {
+-	struct dma_map_ops *ops = get_dma_ops(dev);
++	const struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+ 	BUG_ON(!ops);
+ 	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
+diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
+index 5a388ee..446d58f 100644
+--- a/arch/microblaze/include/asm/pci.h
++++ b/arch/microblaze/include/asm/pci.h
+@@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
+ }
+ 
+ #ifdef CONFIG_PCI
+-extern void set_pci_dma_ops(struct dma_map_ops *dma_ops);
+-extern struct dma_map_ops *get_pci_dma_ops(void);
++extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops);
++extern const struct dma_map_ops *get_pci_dma_ops(void);
+ #else	/* CONFIG_PCI */
+ #define set_pci_dma_ops(d)
+ #define get_pci_dma_ops()	NULL
+diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c
+index 79c7465..95a4dbe 100644
+--- a/arch/microblaze/kernel/dma.c
++++ b/arch/microblaze/kernel/dma.c
+@@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page(struct device *dev,
+ 	__dma_sync_page(dma_address, 0 , size, direction);
+ }
+ 
+-struct dma_map_ops dma_direct_ops = {
++const struct dma_map_ops dma_direct_ops = {
+ 	.alloc_coherent	= dma_direct_alloc_coherent,
+ 	.free_coherent	= dma_direct_free_coherent,
+ 	.map_sg		= dma_direct_map_sg,
+diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
+index 23be25f..d32c14f 100644
+--- a/arch/microblaze/pci/pci-common.c
++++ b/arch/microblaze/pci/pci-common.c
+@@ -46,14 +46,14 @@ resource_size_t isa_mem_base;
+ /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
+ unsigned int pci_flags;
+ 
+-static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
++static const struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
+ 
+-void set_pci_dma_ops(struct dma_map_ops *dma_ops)
++void set_pci_dma_ops(const struct dma_map_ops *dma_ops)
+ {
+ 	pci_dma_ops = dma_ops;
+ }
+ 
+-struct dma_map_ops *get_pci_dma_ops(void)
++const struct dma_map_ops *get_pci_dma_ops(void)
+ {
+ 	return pci_dma_ops;
+ }
+diff --git a/arch/mips/alchemy/devboards/pm.c b/arch/mips/alchemy/devboards/pm.c
+index 4bbd313..acaf91b 100644
+--- a/arch/mips/alchemy/devboards/pm.c
++++ b/arch/mips/alchemy/devboards/pm.c
+@@ -110,7 +110,7 @@ static void db1x_pm_end(void)
  
  }
  
@@ -1133,10 +1646,11 @@ diff -urNp linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c linux-2.6.32.13/arch
  	.valid		= suspend_valid_only_mem,
  	.begin		= db1x_pm_begin,
  	.enter		= db1x_pm_enter,
-diff -urNp linux-2.6.32.13/arch/mips/include/asm/elf.h linux-2.6.32.13/arch/mips/include/asm/elf.h
---- linux-2.6.32.13/arch/mips/include/asm/elf.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/mips/include/asm/elf.h	2010-05-15 13:21:13.630645180 -0400
-@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
+diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
+index ea77a42..829dd86 100644
+--- a/arch/mips/include/asm/elf.h
++++ b/arch/mips/include/asm/elf.h
+@@ -368,6 +368,13 @@ extern const char *__elf_platform;
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
  
@@ -1147,11 +1661,14 @@ diff -urNp linux-2.6.32.13/arch/mips/include/asm/elf.h linux-2.6.32.13/arch/mips
 +#define PAX_DELTA_STACK_LEN	(test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
 +#endif
 +
- #endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.32.13/arch/mips/include/asm/page.h linux-2.6.32.13/arch/mips/include/asm/page.h
---- linux-2.6.32.13/arch/mips/include/asm/page.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/mips/include/asm/page.h	2010-05-15 13:21:13.630645180 -0400
-@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
+ #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
+ struct linux_binprm;
+ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
+index a16beaf..02e1fae 100644
+--- a/arch/mips/include/asm/page.h
++++ b/arch/mips/include/asm/page.h
+@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
    #ifdef CONFIG_CPU_MIPS32
      typedef struct { unsigned long pte_low, pte_high; } pte_t;
      #define pte_val(x)    ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
@@ -1160,10 +1677,11 @@ diff -urNp linux-2.6.32.13/arch/mips/include/asm/page.h linux-2.6.32.13/arch/mip
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)	((x).pte)
-diff -urNp linux-2.6.32.13/arch/mips/include/asm/system.h linux-2.6.32.13/arch/mips/include/asm/system.h
---- linux-2.6.32.13/arch/mips/include/asm/system.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/mips/include/asm/system.h	2010-05-15 13:21:13.630645180 -0400
-@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
+diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h
+index bb937cc..0b614cd 100644
+--- a/arch/mips/include/asm/system.h
++++ b/arch/mips/include/asm/system.h
+@@ -234,6 +234,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
  
@@ -1171,10 +1689,11 @@ diff -urNp linux-2.6.32.13/arch/mips/include/asm/system.h linux-2.6.32.13/arch/m
 +#define arch_align_stack(x) ((x) & ALMASK)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c	2010-05-15 13:21:13.630645180 -0400
-@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
+diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
+index 9fdd8bc..fcf9d68 100644
+--- a/arch/mips/kernel/binfmt_elfn32.c
++++ b/arch/mips/kernel/binfmt_elfn32.c
+@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
  
@@ -1188,10 +1707,11 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.13/arch
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c	2010-05-15 13:21:13.630645180 -0400
-@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
+diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
+index ff44823..cf0b48a 100644
+--- a/arch/mips/kernel/binfmt_elfo32.c
++++ b/arch/mips/kernel/binfmt_elfo32.c
+@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
  
@@ -1205,21 +1725,23 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.13/arch
  #include <asm/processor.h>
  
  /*
-diff -urNp linux-2.6.32.13/arch/mips/kernel/kgdb.c linux-2.6.32.13/arch/mips/kernel/kgdb.c
---- linux-2.6.32.13/arch/mips/kernel/kgdb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/mips/kernel/kgdb.c	2010-05-15 13:21:13.630645180 -0400
-@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
+diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c
+index 9b78ff6..1228099 100644
+--- a/arch/mips/kernel/kgdb.c
++++ b/arch/mips/kernel/kgdb.c
+@@ -270,6 +270,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
  	return -1;
  }
  
-+/* cannot be const */
++/* cannot be const, see kgdb_arch_init */
  struct kgdb_arch arch_kgdb_ops;
  
  /*
-diff -urNp linux-2.6.32.13/arch/mips/kernel/process.c linux-2.6.32.13/arch/mips/kernel/process.c
---- linux-2.6.32.13/arch/mips/kernel/process.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/mips/kernel/process.c	2010-05-15 13:21:13.630645180 -0400
-@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
+diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
+index 9996094..ce0968a 100644
+--- a/arch/mips/kernel/process.c
++++ b/arch/mips/kernel/process.c
+@@ -474,15 +474,3 @@ unsigned long get_wchan(struct task_struct *task)
  out:
  	return pc;
  }
@@ -1235,10 +1757,11 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/process.c linux-2.6.32.13/arch/mips/
 -
 -	return sp & ALMASK;
 -}
-diff -urNp linux-2.6.32.13/arch/mips/kernel/syscall.c linux-2.6.32.13/arch/mips/kernel/syscall.c
---- linux-2.6.32.13/arch/mips/kernel/syscall.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/mips/kernel/syscall.c	2010-05-15 13:21:13.630645180 -0400
-@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str
+diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
+index dd81b0f..2653a71 100644
+--- a/arch/mips/kernel/syscall.c
++++ b/arch/mips/kernel/syscall.c
+@@ -106,17 +106,21 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
  	do_color_align = 0;
  	if (filp || (flags & MAP_SHARED))
  		do_color_align = 1;
@@ -1250,8 +1773,12 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/syscall.c linux-2.6.32.13/arch/mips/
  	if (addr) {
  		if (do_color_align)
  			addr = COLOUR_ALIGN(addr, pgoff);
-@@ -112,7 +117,7 @@ unsigned long arch_get_unmapped_area(str
- 		    (!vmm || addr + len <= vmm->vm_start))
+ 		else
+ 			addr = PAGE_ALIGN(addr);
+ 		vmm = find_vma(current->mm, addr);
+-		if (task_size - len >= addr &&
+-		    (!vmm || addr + len <= vmm->vm_start))
++		if (task_size - len >= addr && check_heap_stack_gap(vmm, addr, len))
  			return addr;
  	}
 -	addr = TASK_UNMAPPED_BASE;
@@ -1259,15 +1786,38 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/syscall.c linux-2.6.32.13/arch/mips/
  	if (do_color_align)
  		addr = COLOUR_ALIGN(addr, pgoff);
  	else
-diff -urNp linux-2.6.32.13/arch/mips/mm/fault.c linux-2.6.32.13/arch/mips/mm/fault.c
---- linux-2.6.32.13/arch/mips/mm/fault.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/mips/mm/fault.c	2010-05-15 13:21:13.630645180 -0400
+@@ -126,7 +130,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ 		/* 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)
+diff --git a/arch/mips/loongson/common/pm.c b/arch/mips/loongson/common/pm.c
+index 6c1fd90..f55e07a 100644
+--- a/arch/mips/loongson/common/pm.c
++++ b/arch/mips/loongson/common/pm.c
+@@ -147,7 +147,7 @@ static int loongson_pm_valid_state(suspend_state_t state)
+ 	}
+ }
+ 
+-static struct platform_suspend_ops loongson_pm_ops = {
++static const struct platform_suspend_ops loongson_pm_ops = {
+ 	.valid	= loongson_pm_valid_state,
+ 	.enter	= loongson_pm_enter,
+ };
+diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
+index b78f7d9..ed674d8 100644
+--- a/arch/mips/mm/fault.c
++++ b/arch/mips/mm/fault.c
 @@ -26,6 +26,23 @@
  #include <asm/ptrace.h>
  #include <asm/highmem.h>		/* For VMALLOC_END */
  
 +#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc)
++void pax_report_insns(void *pc, void *sp)
 +{
 +	unsigned long i;
 +
@@ -1286,10 +1836,11 @@ diff -urNp linux-2.6.32.13/arch/mips/mm/fault.c linux-2.6.32.13/arch/mips/mm/fau
  /*
   * This routine handles page faults.  It determines the address,
   * and the problem, and then passes it off to one of the appropriate
-diff -urNp linux-2.6.32.13/arch/parisc/include/asm/elf.h linux-2.6.32.13/arch/parisc/include/asm/elf.h
---- linux-2.6.32.13/arch/parisc/include/asm/elf.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/parisc/include/asm/elf.h	2010-05-15 13:21:13.630645180 -0400
-@@ -343,6 +343,13 @@ struct pt_regs;	/* forward declaration..
+diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
+index 19f6cb1..6c78cf2 100644
+--- a/arch/parisc/include/asm/elf.h
++++ b/arch/parisc/include/asm/elf.h
+@@ -342,6 +342,13 @@ struct pt_regs;	/* forward declaration... */
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
  
@@ -1303,9 +1854,10 @@ diff -urNp linux-2.6.32.13/arch/parisc/include/asm/elf.h linux-2.6.32.13/arch/pa
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
     but it's not easy, and we've already done it here.  */
-diff -urNp linux-2.6.32.13/arch/parisc/include/asm/pgtable.h linux-2.6.32.13/arch/parisc/include/asm/pgtable.h
---- linux-2.6.32.13/arch/parisc/include/asm/pgtable.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/parisc/include/asm/pgtable.h	2010-05-15 13:21:13.630645180 -0400
+diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
+index 01c1503..4b0fcf4 100644
+--- a/arch/parisc/include/asm/pgtable.h
++++ b/arch/parisc/include/asm/pgtable.h
 @@ -207,6 +207,17 @@
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
@@ -1324,10 +1876,11 @@ diff -urNp linux-2.6.32.13/arch/parisc/include/asm/pgtable.h linux-2.6.32.13/arc
  #define PAGE_KERNEL	__pgprot(_PAGE_KERNEL)
  #define PAGE_KERNEL_RO	__pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
  #define PAGE_KERNEL_UNC	__pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
-diff -urNp linux-2.6.32.13/arch/parisc/kernel/module.c linux-2.6.32.13/arch/parisc/kernel/module.c
---- linux-2.6.32.13/arch/parisc/kernel/module.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/parisc/kernel/module.c	2010-05-15 13:21:13.630645180 -0400
-@@ -95,16 +95,38 @@
+diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
+index 159a2b8..196c0d8 100644
+--- a/arch/parisc/kernel/module.c
++++ b/arch/parisc/kernel/module.c
+@@ -96,16 +96,38 @@
  
  /* three functions to determine where in the module core
   * or init pieces the location is */
@@ -1370,28 +1923,27 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/module.c linux-2.6.32.13/arch/pari
  }
  
  static inline int in_local(struct module *me, void *loc)
-@@ -364,13 +386,13 @@ int module_frob_arch_sections(CONST Elf_
+@@ -365,13 +387,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
  	}
  
  	/* align things a bit */
 -	me->core_size = ALIGN(me->core_size, 16);
 -	me->arch.got_offset = me->core_size;
 -	me->core_size += gots * sizeof(struct got_entry);
--
--	me->core_size = ALIGN(me->core_size, 16);
--	me->arch.fdesc_offset = me->core_size;
--	me->core_size += fdescs * sizeof(Elf_Fdesc);
 +	me->core_size_rw = ALIGN(me->core_size_rw, 16);
 +	me->arch.got_offset = me->core_size_rw;
 +	me->core_size_rw += gots * sizeof(struct got_entry);
-+
+ 
+-	me->core_size = ALIGN(me->core_size, 16);
+-	me->arch.fdesc_offset = me->core_size;
+-	me->core_size += fdescs * sizeof(Elf_Fdesc);
 +	me->core_size_rw = ALIGN(me->core_size_rw, 16);
 +	me->arch.fdesc_offset = me->core_size_rw;
 +	me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
  
  	me->arch.got_max = gots;
  	me->arch.fdesc_max = fdescs;
-@@ -388,7 +410,7 @@ static Elf64_Word get_got(struct module 
+@@ -389,7 +411,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
  
  	BUG_ON(value == 0);
  
@@ -1400,7 +1952,7 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/module.c linux-2.6.32.13/arch/pari
  	for (i = 0; got[i].addr; i++)
  		if (got[i].addr == value)
  			goto out;
-@@ -406,7 +428,7 @@ static Elf64_Word get_got(struct module 
+@@ -407,7 +429,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
  #ifdef CONFIG_64BIT
  static Elf_Addr get_fdesc(struct module *me, unsigned long value)
  {
@@ -1409,7 +1961,7 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/module.c linux-2.6.32.13/arch/pari
  
  	if (!value) {
  		printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
-@@ -424,7 +446,7 @@ static Elf_Addr get_fdesc(struct module 
+@@ -425,7 +447,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
  
  	/* Create new one */
  	fdesc->addr = value;
@@ -1418,7 +1970,7 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/module.c linux-2.6.32.13/arch/pari
  	return (Elf_Addr)fdesc;
  }
  #endif /* CONFIG_64BIT */
-@@ -848,7 +870,7 @@ register_unwind_table(struct module *me,
+@@ -849,7 +871,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;
@@ -1427,10 +1979,29 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/module.c linux-2.6.32.13/arch/pari
  
  	DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
  	       me->arch.unwind_section, table, end, gp);
-diff -urNp linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c	2010-05-15 13:21:13.630645180 -0400
-@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
+diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
+index c9b9322..02d8940 100644
+--- a/arch/parisc/kernel/sys_parisc.c
++++ b/arch/parisc/kernel/sys_parisc.c
+@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
+ 		/* 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(vma, addr, len))
+ 			return addr;
+ 		addr = vma->vm_end;
+ 	}
+@@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
+ 		/* 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(vma, addr, len))
+ 			return addr;
+ 		addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
+ 		if (addr < vma->vm_end) /* handle wraparound */
+@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
  	if (flags & MAP_FIXED)
  		return addr;
  	if (!addr)
@@ -1439,10 +2010,11 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c linux-2.6.32.13/arch/
  
  	if (filp) {
  		addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.32.13/arch/parisc/kernel/traps.c linux-2.6.32.13/arch/parisc/kernel/traps.c
---- linux-2.6.32.13/arch/parisc/kernel/traps.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/parisc/kernel/traps.c	2010-05-15 13:21:13.630645180 -0400
-@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
+diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
+index 8b58bf0..7afff03 100644
+--- a/arch/parisc/kernel/traps.c
++++ b/arch/parisc/kernel/traps.c
+@@ -733,9 +733,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
  
  			down_read(&current->mm->mmap_sem);
  			vma = find_vma(current->mm,regs->iaoq[0]);
@@ -1453,9 +2025,10 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/traps.c linux-2.6.32.13/arch/paris
  				fault_address = regs->iaoq[0];
  				fault_space = regs->iasq[0];
  
-diff -urNp linux-2.6.32.13/arch/parisc/mm/fault.c linux-2.6.32.13/arch/parisc/mm/fault.c
---- linux-2.6.32.13/arch/parisc/mm/fault.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/parisc/mm/fault.c	2010-05-15 13:21:13.630645180 -0400
+diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
+index 18162ce..4d274ba 100644
+--- a/arch/parisc/mm/fault.c
++++ b/arch/parisc/mm/fault.c
 @@ -15,6 +15,7 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -1464,7 +2037,7 @@ diff -urNp linux-2.6.32.13/arch/parisc/mm/fault.c linux-2.6.32.13/arch/parisc/mm
  
  #include <asm/uaccess.h>
  #include <asm/traps.h>
-@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, ex
+@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
  static unsigned long
  parisc_acctyp(unsigned long code, unsigned int inst)
  {
@@ -1473,7 +2046,7 @@ diff -urNp linux-2.6.32.13/arch/parisc/mm/fault.c linux-2.6.32.13/arch/parisc/mm
  	    return VM_EXEC;
  
  	switch (inst & 0xf0000000) {
-@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsign
+@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
  			}
  #endif
  
@@ -1625,22 +2198,28 @@ diff -urNp linux-2.6.32.13/arch/parisc/mm/fault.c linux-2.6.32.13/arch/parisc/mm
  
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/device.h linux-2.6.32.13/arch/powerpc/include/asm/device.h
---- linux-2.6.32.13/arch/powerpc/include/asm/device.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/include/asm/device.h	2010-05-15 13:21:13.630645180 -0400
-@@ -14,7 +14,7 @@ struct dev_archdata {
- 	struct device_node	*of_node;
+diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h
+index a3954e4..5db6a83 100644
+--- a/arch/powerpc/include/asm/device.h
++++ b/arch/powerpc/include/asm/device.h
+@@ -11,7 +11,7 @@ struct device_node;
  
+ struct dev_archdata {
  	/* DMA operations on that device */
 -	struct dma_map_ops	*dma_ops;
 +	const struct dma_map_ops	*dma_ops;
  
  	/*
  	 * When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h	2010-05-15 13:21:13.630645180 -0400
-@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
+diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
+index c85ef23..01138ae 100644
+--- a/arch/powerpc/include/asm/dma-mapping.h
++++ b/arch/powerpc/include/asm/dma-mapping.h
+@@ -66,12 +66,13 @@ static inline unsigned long device_to_mask(struct device *dev)
+ /*
+  * Available generic sets of operations
+  */
++/* cannot be const */
  #ifdef CONFIG_PPC64
  extern struct dma_map_ops dma_iommu_ops;
  #endif
@@ -1652,7 +2231,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1
  {
  	/* We don't handle the NULL dev case for ISA for now. We could
  	 * do it via an out of line call but it is not needed for now. The
-@@ -84,7 +84,7 @@ static inline struct dma_map_ops *get_dm
+@@ -84,7 +85,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
  	return dev->archdata.dma_ops;
  }
  
@@ -1661,7 +2240,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1
  {
  	dev->archdata.dma_ops = ops;
  }
-@@ -118,7 +118,7 @@ static inline void set_dma_offset(struct
+@@ -118,7 +119,7 @@ static inline void set_dma_offset(struct device *dev, dma_addr_t off)
  
  static inline int dma_supported(struct device *dev, u64 mask)
  {
@@ -1670,7 +2249,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1
  
  	if (unlikely(dma_ops == NULL))
  		return 0;
-@@ -132,7 +132,7 @@ static inline int dma_supported(struct d
+@@ -129,7 +130,7 @@ static inline int dma_supported(struct device *dev, u64 mask)
  
  static inline int dma_set_mask(struct device *dev, u64 dma_mask)
  {
@@ -1679,7 +2258,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1
  
  	if (unlikely(dma_ops == NULL))
  		return -EIO;
-@@ -147,7 +147,7 @@ static inline int dma_set_mask(struct de
+@@ -144,7 +145,7 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
  static inline void *dma_alloc_coherent(struct device *dev, size_t size,
  				       dma_addr_t *dma_handle, gfp_t flag)
  {
@@ -1688,7 +2267,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1
  	void *cpu_addr;
  
  	BUG_ON(!dma_ops);
-@@ -162,7 +162,7 @@ static inline void *dma_alloc_coherent(s
+@@ -159,7 +160,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
  static inline void dma_free_coherent(struct device *dev, size_t size,
  				     void *cpu_addr, dma_addr_t dma_handle)
  {
@@ -1697,7 +2276,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1
  
  	BUG_ON(!dma_ops);
  
-@@ -173,7 +173,7 @@ static inline void dma_free_coherent(str
+@@ -170,7 +171,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
  
  static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
  {
@@ -1706,10 +2285,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1
  
  	if (dma_ops->mapping_error)
  		return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/elf.h linux-2.6.32.13/arch/powerpc/include/asm/elf.h
---- linux-2.6.32.13/arch/powerpc/include/asm/elf.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/include/asm/elf.h	2010-05-15 13:21:13.643322255 -0400
-@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
+diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
+index c376eda..a8cd687 100644
+--- a/arch/powerpc/include/asm/elf.h
++++ b/arch/powerpc/include/asm/elf.h
+@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
     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.  */
  
@@ -1731,7 +2311,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/elf.h linux-2.6.32.13/arch/p
  
  /*
   * Our registers are always unsigned longs, whether we're a 32 bit
-@@ -275,9 +286,6 @@ extern int arch_setup_additional_pages(s
+@@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
  	(0x7ff >> (PAGE_SHIFT - 12)) : \
  	(0x3ffff >> (PAGE_SHIFT - 12)))
  
@@ -1741,10 +2321,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/elf.h linux-2.6.32.13/arch/p
  #endif /* __KERNEL__ */
  
  /*
-diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/iommu.h linux-2.6.32.13/arch/powerpc/include/asm/iommu.h
---- linux-2.6.32.13/arch/powerpc/include/asm/iommu.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/include/asm/iommu.h	2010-05-15 13:21:13.643322255 -0400
-@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
+diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h
+index edfc980..1766f59 100644
+--- a/arch/powerpc/include/asm/iommu.h
++++ b/arch/powerpc/include/asm/iommu.h
+@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(void);
  extern void iommu_init_early_dart(void);
  extern void iommu_init_early_pasemi(void);
  
@@ -1754,45 +2335,23 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/iommu.h linux-2.6.32.13/arch
  #ifdef CONFIG_PCI
  extern void pci_iommu_init(void);
  extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h	2010-05-15 13:21:13.643322255 -0400
-@@ -26,6 +26,7 @@ enum km_type {
- 	KM_SOFTIRQ1,
+diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
+index bca8fdc..61e9580 100644
+--- a/arch/powerpc/include/asm/kmap_types.h
++++ b/arch/powerpc/include/asm/kmap_types.h
+@@ -27,6 +27,7 @@ enum km_type {
  	KM_PPC_SYNC_PAGE,
  	KM_PPC_SYNC_ICACHE,
+ 	KM_KDB,
 +	KM_CLEARPAGE,
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page_64.h linux-2.6.32.13/arch/powerpc/include/asm/page_64.h
---- linux-2.6.32.13/arch/powerpc/include/asm/page_64.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/include/asm/page_64.h	2010-05-15 13:21:13.643322255 -0400
-@@ -180,15 +180,18 @@ do {						\
-  * stack by default, so in the absense of a PT_GNU_STACK program header
-  * we turn execute permission off.
-  */
--#define VM_STACK_DEFAULT_FLAGS32	(VM_READ | VM_WRITE | VM_EXEC | \
--					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-+#define VM_STACK_DEFAULT_FLAGS32 \
-+	(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
-+	 VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
- 
- #define VM_STACK_DEFAULT_FLAGS64	(VM_READ | VM_WRITE | \
- 					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
- 
-+#ifndef CONFIG_PAX_PAGEEXEC
- #define VM_STACK_DEFAULT_FLAGS \
- 	(test_thread_flag(TIF_32BIT) ? \
- 	 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
-+#endif
- 
- #include <asm-generic/getorder.h>
- 
-diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page.h linux-2.6.32.13/arch/powerpc/include/asm/page.h
---- linux-2.6.32.13/arch/powerpc/include/asm/page.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/include/asm/page.h	2010-05-15 13:21:13.643322255 -0400
-@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
+diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
+index 53b64be..82be2e0 100644
+--- a/arch/powerpc/include/asm/page.h
++++ b/arch/powerpc/include/asm/page.h
+@@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
   * and needs to be executable.  This means the whole heap ends
   * up being executable.
   */
@@ -1804,7 +2363,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page.h linux-2.6.32.13/arch/
  
  #define VM_DATA_DEFAULT_FLAGS64	(VM_READ | VM_WRITE | \
  				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-@@ -145,6 +146,9 @@ extern phys_addr_t kernstart_addr;
+@@ -158,6 +159,9 @@ extern phys_addr_t kernstart_addr;
  #define is_kernel_addr(x)	((x) >= PAGE_OFFSET)
  #endif
  
@@ -1814,10 +2373,36 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page.h linux-2.6.32.13/arch/
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pci.h linux-2.6.32.13/arch/powerpc/include/asm/pci.h
---- linux-2.6.32.13/arch/powerpc/include/asm/pci.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/include/asm/pci.h	2010-05-15 13:21:13.643322255 -0400
-@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
+diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
+index 358ff14..fbf4ef6 100644
+--- a/arch/powerpc/include/asm/page_64.h
++++ b/arch/powerpc/include/asm/page_64.h
+@@ -172,15 +172,18 @@ do {						\
+  * stack by default, so in the absense of a PT_GNU_STACK program header
+  * we turn execute permission off.
+  */
+-#define VM_STACK_DEFAULT_FLAGS32	(VM_READ | VM_WRITE | VM_EXEC | \
+-					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
++#define VM_STACK_DEFAULT_FLAGS32 \
++	(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
++	 VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+ 
+ #define VM_STACK_DEFAULT_FLAGS64	(VM_READ | VM_WRITE | \
+ 					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+ 
++#ifndef CONFIG_PAX_PAGEEXEC
+ #define VM_STACK_DEFAULT_FLAGS \
+ 	(test_thread_flag(TIF_32BIT) ? \
+ 	 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
++#endif
+ 
+ #include <asm-generic/getorder.h>
+ 
+diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
+index a20a9ad..158bb9a 100644
+--- a/arch/powerpc/include/asm/pci.h
++++ b/arch/powerpc/include/asm/pci.h
+@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
  }
  
  #ifdef CONFIG_PCI
@@ -1828,9 +2413,10 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pci.h linux-2.6.32.13/arch/p
  #else	/* CONFIG_PCI */
  #define set_pci_dma_ops(d)
  #define get_pci_dma_ops()	NULL
-diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h	2010-05-15 13:21:13.643322255 -0400
+diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
+index 4aad413..85d86bf 100644
+--- a/arch/powerpc/include/asm/pte-hash32.h
++++ b/arch/powerpc/include/asm/pte-hash32.h
 @@ -21,6 +21,7 @@
  #define _PAGE_FILE	0x004	/* when !present: nonlinear file mapping */
  #define _PAGE_USER	0x004	/* usermode access allowed */
@@ -1839,9 +2425,10 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.13
  #define _PAGE_COHERENT	0x010	/* M: enforce memory coherence (SMP systems) */
  #define _PAGE_NO_CACHE	0x020	/* I: cache inhibit */
  #define _PAGE_WRITETHRU	0x040	/* W: cache write-through */
-diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/reg.h linux-2.6.32.13/arch/powerpc/include/asm/reg.h
---- linux-2.6.32.13/arch/powerpc/include/asm/reg.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/include/asm/reg.h	2010-05-15 13:21:13.643322255 -0400
+diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
+index d62fdf4..fb32167 100644
+--- a/arch/powerpc/include/asm/reg.h
++++ b/arch/powerpc/include/asm/reg.h
 @@ -191,6 +191,7 @@
  #define SPRN_DBCR	0x136	/* e300 Data Breakpoint Control Reg */
  #define SPRN_DSISR	0x012	/* Data Storage Interrupt Status Register */
@@ -1850,9 +2437,10 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/reg.h linux-2.6.32.13/arch/p
  #define   DSISR_PROTFAULT	0x08000000	/* protection fault */
  #define   DSISR_ISSTORE		0x02000000	/* access was a store */
  #define   DSISR_DABRMATCH	0x00400000	/* hit data breakpoint */
-diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h	2010-05-15 13:21:13.643322255 -0400
+diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/include/asm/swiotlb.h
+index 8979d4c..d2fd0d3 100644
+--- a/arch/powerpc/include/asm/swiotlb.h
++++ b/arch/powerpc/include/asm/swiotlb.h
 @@ -13,7 +13,7 @@
  
  #include <linux/swiotlb.h>
@@ -1862,10 +2450,20 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.13/ar
  
  static inline void dma_mark_clean(void *addr, size_t size) {}
  
-diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h	2010-05-15 13:21:13.643322255 -0400
-@@ -327,52 +327,6 @@ do {								\
+diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
+index bd0fb84..a42a14b 100644
+--- a/arch/powerpc/include/asm/uaccess.h
++++ b/arch/powerpc/include/asm/uaccess.h
+@@ -13,6 +13,8 @@
+ #define VERIFY_READ	0
+ #define VERIFY_WRITE	1
+ 
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++
+ /*
+  * The fs value determines whether argument validity checking should be
+  * performed or not.  If get_fs() == USER_DS, checking is performed, with
+@@ -327,52 +329,6 @@ do {								\
  extern unsigned long __copy_tofrom_user(void __user *to,
  		const void __user *from, unsigned long size);
  
@@ -1918,7 +2516,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h linux-2.6.32.13/ar
  static inline unsigned long __copy_from_user_inatomic(void *to,
  		const void __user *from, unsigned long n)
  {
-@@ -396,6 +350,10 @@ static inline unsigned long __copy_from_
+@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
  		if (ret == 0)
  			return 0;
  	}
@@ -1929,7 +2527,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h linux-2.6.32.13/ar
  	return __copy_tofrom_user((__force void __user *)to, from, n);
  }
  
-@@ -422,6 +380,10 @@ static inline unsigned long __copy_to_us
+@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
  		if (ret == 0)
  			return 0;
  	}
@@ -1940,7 +2538,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h linux-2.6.32.13/ar
  	return __copy_tofrom_user(to, (__force const void __user *)from, n);
  }
  
-@@ -439,6 +401,92 @@ static inline unsigned long __copy_to_us
+@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_user(void __user *to,
  	return __copy_to_user_inatomic(to, from, size);
  }
  
@@ -2033,34 +2631,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h linux-2.6.32.13/ar
  extern unsigned long __clear_user(void __user *addr, unsigned long size);
  
  static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c
---- linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c	2010-05-15 13:21:13.643322255 -0400
-@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
- 	&cache_assoc_attr,
- };
- 
--static struct sysfs_ops cache_index_ops = {
-+static const struct sysfs_ops cache_index_ops = {
- 	.show = cache_index_show,
- };
- 
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma.c linux-2.6.32.13/arch/powerpc/kernel/dma.c
---- linux-2.6.32.13/arch/powerpc/kernel/dma.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/dma.c	2010-05-15 13:21:13.643322255 -0400
-@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
- }
- #endif
- 
--struct dma_map_ops dma_direct_ops = {
-+const struct dma_map_ops dma_direct_ops = {
- 	.alloc_coherent	= dma_direct_alloc_coherent,
- 	.free_coherent	= dma_direct_free_coherent,
- 	.map_sg		= dma_direct_map_sg,
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c	2010-05-15 13:21:13.643322255 -0400
-@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
+diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c
+index 37771a5..648530c 100644
+--- a/arch/powerpc/kernel/dma-iommu.c
++++ b/arch/powerpc/kernel/dma-iommu.c
+@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct device *dev, struct scatterlist *sglist,
  }
  
  /* We support DMA to/from any memory page via the iommu */
@@ -2069,9 +2644,10 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.13/arch/
  {
  	struct iommu_table *tbl = get_iommu_table_base(dev);
  
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c	2010-05-15 13:21:13.646883281 -0400
+diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
+index 02f724f..065adf6 100644
+--- a/arch/powerpc/kernel/dma-swiotlb.c
++++ b/arch/powerpc/kernel/dma-swiotlb.c
 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
   * map_page, and unmap_page on highmem, use normal dma_ops
   * for everything else.
@@ -2081,9 +2657,23 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.13/arc
  	.alloc_coherent = dma_direct_alloc_coherent,
  	.free_coherent = dma_direct_free_coherent,
  	.map_sg = swiotlb_map_sg_attrs,
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S	2010-05-15 13:21:13.646883281 -0400
+diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
+index 84d6367..df07362 100644
+--- a/arch/powerpc/kernel/dma.c
++++ b/arch/powerpc/kernel/dma.c
+@@ -135,7 +135,7 @@ static inline void dma_direct_sync_single(struct device *dev,
+ }
+ #endif
+ 
+-struct dma_map_ops dma_direct_ops = {
++const struct dma_map_ops dma_direct_ops = {
+ 	.alloc_coherent	= dma_direct_alloc_coherent,
+ 	.free_coherent	= dma_direct_free_coherent,
+ 	.map_sg		= dma_direct_map_sg,
+diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
+index 24dcc0e..a300455 100644
+--- a/arch/powerpc/kernel/exceptions-64e.S
++++ b/arch/powerpc/kernel/exceptions-64e.S
 @@ -455,6 +455,7 @@ storage_fault_common:
  	std	r14,_DAR(r1)
  	std	r15,_DSISR(r1)
@@ -2102,10 +2692,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.13/
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	ld	r4,_DAR(r1)
  	bl	.bad_page_fault
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S	2010-05-15 13:21:13.646883281 -0400
-@@ -818,10 +818,10 @@ handle_page_fault:
+diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
+index 3e423fb..34f47a0 100644
+--- a/arch/powerpc/kernel/exceptions-64s.S
++++ b/arch/powerpc/kernel/exceptions-64s.S
+@@ -840,10 +840,10 @@ handle_page_fault:
  11:	ld	r4,_DAR(r1)
  	ld	r5,_DSISR(r1)
  	addi	r3,r1,STACK_FRAME_OVERHEAD
@@ -2117,10 +2708,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.13/
  	mr	r5,r3
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	lwz	r4,_DAR(r1)
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c	2010-05-15 13:21:13.646883281 -0400
-@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct 
+diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
+index 21266ab..e27733b 100644
+--- a/arch/powerpc/kernel/ibmebus.c
++++ b/arch/powerpc/kernel/ibmebus.c
+@@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct device *dev, u64 mask)
  	return 1;
  }
  
@@ -2129,11 +2721,12 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c linux-2.6.32.13/arch/po
  	.alloc_coherent = ibmebus_alloc_coherent,
  	.free_coherent  = ibmebus_free_coherent,
  	.map_sg         = ibmebus_map_sg,
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/kgdb.c linux-2.6.32.13/arch/powerpc/kernel/kgdb.c
---- linux-2.6.32.13/arch/powerpc/kernel/kgdb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/kgdb.c	2010-05-15 13:21:13.658890137 -0400
-@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
- 	if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
+diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
+index 82a7b22..fe7180e 100644
+--- a/arch/powerpc/kernel/kgdb.c
++++ b/arch/powerpc/kernel/kgdb.c
+@@ -128,7 +128,7 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs)
+ 	if (kgdb_handle_exception(1, SIGTRAP, 0, regs) != 0)
  		return 0;
  
 -	if (*(u32 *) (regs->nip) == *(u32 *) (&arch_kgdb_ops.gdb_bpt_instr))
@@ -2141,7 +2734,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/kgdb.c linux-2.6.32.13/arch/power
  		regs->nip += 4;
  
  	return 1;
-@@ -353,7 +353,7 @@ int kgdb_arch_handle_exception(int vecto
+@@ -360,7 +360,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
  /*
   * Global data
   */
@@ -2150,41 +2743,10 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/kgdb.c linux-2.6.32.13/arch/power
  	.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
  };
  
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module_32.c linux-2.6.32.13/arch/powerpc/kernel/module_32.c
---- linux-2.6.32.13/arch/powerpc/kernel/module_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/module_32.c	2010-05-15 13:21:13.658890137 -0400
-@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
- 			me->arch.core_plt_section = i;
- 	}
- 	if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
--		printk("Module doesn't contain .plt or .init.plt sections.\n");
-+		printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
- 		return -ENOEXEC;
- 	}
- 
-@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
- 
- 	DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
- 	/* Init, or core PLT? */
--	if (location >= mod->module_core
--	    && location < mod->module_core + mod->core_size)
-+	if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
-+	    (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
- 		entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
--	else
-+	else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
-+		 (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
- 		entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
-+	else {
-+		printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
-+		return ~0UL;
-+	}
- 
- 	/* Find this entry, or if that fails, the next avail. entry */
- 	while (entry->jump[0]) {
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module.c linux-2.6.32.13/arch/powerpc/kernel/module.c
---- linux-2.6.32.13/arch/powerpc/kernel/module.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/module.c	2010-05-15 13:21:13.658890137 -0400
+diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c
+index 477c663..4f50234 100644
+--- a/arch/powerpc/kernel/module.c
++++ b/arch/powerpc/kernel/module.c
 @@ -31,11 +31,24 @@
  
  LIST_HEAD(module_bug_list);
@@ -2210,7 +2772,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module.c linux-2.6.32.13/arch/pow
  	return vmalloc_exec(size);
  }
  
-@@ -45,6 +58,13 @@ void module_free(struct module *mod, voi
+@@ -45,6 +58,13 @@ void module_free(struct module *mod, void *module_region)
  	vfree(module_region);
  }
  
@@ -2224,10 +2786,44 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module.c linux-2.6.32.13/arch/pow
  static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
  				    const Elf_Shdr *sechdrs,
  				    const char *name)
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/pci-common.c linux-2.6.32.13/arch/powerpc/kernel/pci-common.c
---- linux-2.6.32.13/arch/powerpc/kernel/pci-common.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/pci-common.c	2010-05-15 13:21:13.678895652 -0400
-@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
+diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
+index f832773..0507238 100644
+--- a/arch/powerpc/kernel/module_32.c
++++ b/arch/powerpc/kernel/module_32.c
+@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
+ 			me->arch.core_plt_section = i;
+ 	}
+ 	if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
+-		printk("Module doesn't contain .plt or .init.plt sections.\n");
++		printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
+ 		return -ENOEXEC;
+ 	}
+ 
+@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *location,
+ 
+ 	DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
+ 	/* Init, or core PLT? */
+-	if (location >= mod->module_core
+-	    && location < mod->module_core + mod->core_size)
++	if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
++	    (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
+ 		entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
+-	else
++	else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
++		 (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
+ 		entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
++	else {
++		printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
++		return ~0UL;
++	}
+ 
+ 	/* Find this entry, or if that fails, the next avail. entry */
+ 	while (entry->jump[0]) {
+diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
+index 5b38f6a..8175940 100644
+--- a/arch/powerpc/kernel/pci-common.c
++++ b/arch/powerpc/kernel/pci-common.c
+@@ -51,14 +51,14 @@ resource_size_t isa_mem_base;
  unsigned int ppc_pci_flags = 0;
  
  
@@ -2245,10 +2841,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/pci-common.c linux-2.6.32.13/arch
  {
  	return pci_dma_ops;
  }
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/process.c linux-2.6.32.13/arch/powerpc/kernel/process.c
---- linux-2.6.32.13/arch/powerpc/kernel/process.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/process.c	2010-05-15 13:21:13.678895652 -0400
-@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned 
+diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
+index 773424d..1d2df74 100644
+--- a/arch/powerpc/kernel/process.c
++++ b/arch/powerpc/kernel/process.c
+@@ -1215,51 +1215,3 @@ unsigned long arch_align_stack(unsigned long sp)
  		sp -= get_random_int() & ~PAGE_MASK;
  	return sp & ~0xf;
  }
@@ -2300,10 +2897,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/process.c linux-2.6.32.13/arch/po
 -
 -	return ret;
 -}
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_32.c linux-2.6.32.13/arch/powerpc/kernel/signal_32.c
---- linux-2.6.32.13/arch/powerpc/kernel/signal_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/signal_32.c	2010-05-15 13:21:13.686885851 -0400
-@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
+diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
+index 2666101..e908fba 100644
+--- a/arch/powerpc/kernel/signal_32.c
++++ b/arch/powerpc/kernel/signal_32.c
+@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
  	/* Save user registers on the stack */
  	frame = &rt_sf->uc.uc_mcontext;
  	addr = frame;
@@ -2312,10 +2910,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_32.c linux-2.6.32.13/arch/
  		if (save_user_regs(regs, frame, 0, 1))
  			goto badframe;
  		regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_64.c linux-2.6.32.13/arch/powerpc/kernel/signal_64.c
---- linux-2.6.32.13/arch/powerpc/kernel/signal_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/signal_64.c	2010-05-15 13:21:13.686885851 -0400
-@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
+diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
+index 2fe6fc6..ada0d96 100644
+--- a/arch/powerpc/kernel/signal_64.c
++++ b/arch/powerpc/kernel/signal_64.c
+@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
  	current->thread.fpscr.val = 0;
  
  	/* Set up to return from userspace. */
@@ -2324,25 +2923,10 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_64.c linux-2.6.32.13/arch/
  		regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
  	} else {
  		err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c	2010-05-15 13:21:13.686885851 -0400
-@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
- 	if (oldlenp) {
- 		if (!error) {
- 			if (get_user(oldlen, oldlenp) ||
--			    put_user(oldlen, (compat_size_t __user *)compat_ptr(tmp.oldlenp)))
-+			    put_user(oldlen, (compat_size_t __user *)compat_ptr(tmp.oldlenp)) ||
-+			    copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused)))
- 				error = -EFAULT;
- 		}
--		copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused));
- 	}
- 	return error;
- }
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vdso.c linux-2.6.32.13/arch/powerpc/kernel/vdso.c
---- linux-2.6.32.13/arch/powerpc/kernel/vdso.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/vdso.c	2010-05-15 13:21:13.686885851 -0400
+diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
+index 13002fe..e25f4b1 100644
+--- a/arch/powerpc/kernel/vdso.c
++++ b/arch/powerpc/kernel/vdso.c
 @@ -36,6 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/vdso.h>
@@ -2351,7 +2935,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vdso.c linux-2.6.32.13/arch/power
  
  #include "setup.h"
  
-@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct l
+@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
  	vdso_base = VDSO32_MBASE;
  #endif
  
@@ -2360,7 +2944,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vdso.c linux-2.6.32.13/arch/power
  
  	/* vDSO has a problem and was disabled, just don't "enable" it for the
  	 * process
-@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct l
+@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
  	vdso_base = get_unmapped_area(NULL, vdso_base,
  				      (vdso_pages << PAGE_SHIFT) +
  				      ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
@@ -2369,10 +2953,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vdso.c linux-2.6.32.13/arch/power
  	if (IS_ERR_VALUE(vdso_base)) {
  		rc = vdso_base;
  		goto fail_mmapsem;
-diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vio.c linux-2.6.32.13/arch/powerpc/kernel/vio.c
---- linux-2.6.32.13/arch/powerpc/kernel/vio.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/kernel/vio.c	2010-05-15 13:21:13.690884467 -0400
-@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
+diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
+index 00b9436..699269a 100644
+--- a/arch/powerpc/kernel/vio.c
++++ b/arch/powerpc/kernel/vio.c
+@@ -602,11 +602,12 @@ static void vio_dma_iommu_unmap_sg(struct device *dev,
  	vio_cmo_dealloc(viodev, alloc_size);
  }
  
@@ -2386,7 +2971,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vio.c linux-2.6.32.13/arch/powerp
  	.map_page       = vio_dma_iommu_map_page,
  	.unmap_page     = vio_dma_iommu_unmap_page,
  
-@@ -857,7 +858,6 @@ static void vio_cmo_bus_remove(struct vi
+@@ -860,7 +861,6 @@ static void vio_cmo_bus_remove(struct vio_dev *viodev)
  
  static void vio_cmo_set_dma_ops(struct vio_dev *viodev)
  {
@@ -2394,9 +2979,10 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vio.c linux-2.6.32.13/arch/powerp
  	viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
  }
  
-diff -urNp linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c	2010-05-15 13:21:13.690884467 -0400
+diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
+index 5eea6f3..5d10396 100644
+--- a/arch/powerpc/lib/usercopy_64.c
++++ b/arch/powerpc/lib/usercopy_64.c
 @@ -9,22 +9,6 @@
  #include <linux/module.h>
  #include <asm/uaccess.h>
@@ -2420,7 +3006,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c linux-2.6.32.13/arch/p
  unsigned long copy_in_user(void __user *to, const void __user *from,
  			   unsigned long n)
  {
-@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *
+@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
  	return n;
  }
  
@@ -2428,9 +3014,10 @@ diff -urNp linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c linux-2.6.32.13/arch/p
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.32.13/arch/powerpc/mm/fault.c linux-2.6.32.13/arch/powerpc/mm/fault.c
---- linux-2.6.32.13/arch/powerpc/mm/fault.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/mm/fault.c	2010-05-15 13:21:13.690884467 -0400
+diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
+index 1bd712c..4a0026d 100644
+--- a/arch/powerpc/mm/fault.c
++++ b/arch/powerpc/mm/fault.c
 @@ -30,6 +30,10 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -2442,15 +3029,15 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/fault.c linux-2.6.32.13/arch/powerpc/
  
  #include <asm/firmware.h>
  #include <asm/page.h>
-@@ -40,6 +44,7 @@
- #include <asm/uaccess.h>
+@@ -41,6 +45,7 @@
  #include <asm/tlbflush.h>
  #include <asm/siginfo.h>
+ #include <mm/mmu_decl.h>
 +#include <asm/ptrace.h>
  
- 
  #ifdef CONFIG_KPROBES
-@@ -64,6 +69,33 @@ static inline int notify_page_fault(stru
+ static inline int notify_page_fault(struct pt_regs *regs)
+@@ -64,6 +69,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
  }
  #endif
  
@@ -2484,7 +3071,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/fault.c linux-2.6.32.13/arch/powerpc/
  /*
   * Check whether the instruction at regs->nip is a store using
   * an update addressing form which will update r1.
-@@ -134,7 +166,7 @@ int __kprobes do_page_fault(struct pt_re
+@@ -134,7 +166,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
  	 * indicate errors in DSISR but can validly be set in SRR1.
  	 */
  	if (trap == 0x400)
@@ -2493,7 +3080,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/fault.c linux-2.6.32.13/arch/powerpc/
  	else
  		is_write = error_code & DSISR_ISSTORE;
  #else
-@@ -250,7 +282,7 @@ good_area:
+@@ -257,7 +289,7 @@ good_area:
           * "undefined".  Of those that can be set, this is the only
           * one which seems bad.
           */
@@ -2502,7 +3089,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/fault.c linux-2.6.32.13/arch/powerpc/
                  /* Guarded storage error. */
  		goto bad_area;
  #endif /* CONFIG_8xx */
-@@ -265,7 +297,7 @@ good_area:
+@@ -272,7 +304,7 @@ good_area:
  		 * processors use the same I/D cache coherency mechanism
  		 * as embedded.
  		 */
@@ -2511,7 +3098,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/fault.c linux-2.6.32.13/arch/powerpc/
  			goto bad_area;
  #endif /* CONFIG_PPC_STD_MMU */
  
-@@ -335,6 +367,23 @@ bad_area:
+@@ -341,6 +373,23 @@ bad_area:
  bad_area_nosemaphore:
  	/* User mode accesses cause a SIGSEGV */
  	if (user_mode(regs)) {
@@ -2535,10 +3122,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/fault.c linux-2.6.32.13/arch/powerpc/
  		_exception(SIGSEGV, regs, code, address);
  		return 0;
  	}
-diff -urNp linux-2.6.32.13/arch/powerpc/mm/mmap_64.c linux-2.6.32.13/arch/powerpc/mm/mmap_64.c
---- linux-2.6.32.13/arch/powerpc/mm/mmap_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/mm/mmap_64.c	2010-05-15 13:21:13.694737832 -0400
-@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
+diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
+index 5a783d8..c23e14b 100644
+--- a/arch/powerpc/mm/mmap_64.c
++++ b/arch/powerpc/mm/mmap_64.c
+@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
  	 */
  	if (mmap_is_legacy()) {
  		mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -2561,10 +3149,38 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/mmap_64.c linux-2.6.32.13/arch/powerp
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.32.13/arch/powerpc/mm/slice.c linux-2.6.32.13/arch/powerpc/mm/slice.c
---- linux-2.6.32.13/arch/powerpc/mm/slice.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/mm/slice.c	2010-05-15 13:21:13.702894969 -0400
-@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
+diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
+index ba51948..165f6a1 100644
+--- a/arch/powerpc/mm/slice.c
++++ b/arch/powerpc/mm/slice.c
+@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
+ 	if ((mm->task_size - len) < addr)
+ 		return 0;
+ 	vma = find_vma(mm, addr);
+-	return (!vma || (addr + len) <= vma->vm_start);
++	return check_heap_stack_gap(vma, addr, len);
+ }
+ 
+ static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
+@@ -256,7 +256,7 @@ full_search:
+ 				addr = _ALIGN_UP(addr + 1,  1ul << SLICE_HIGH_SHIFT);
+ 			continue;
+ 		}
+-		if (!vma || addr + len <= vma->vm_start) {
++		if (check_heap_stack_gap(vma, addr, len)) {
+ 			/*
+ 			 * Remember the place where we stopped the search:
+ 			 */
+@@ -336,7 +336,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
+ 		 * return with success:
+ 		 */
+ 		vma = find_vma(mm, addr);
+-		if (!vma || (addr + len) <= vma->vm_start) {
++		if (check_heap_stack_gap(vma, addr, len)) {
+ 			/* remember the address as a hint for next time */
+ 			if (use_cache)
+ 				mm->free_area_cache = addr;
+@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
  	if (fixed && addr > (mm->task_size - len))
  		return -EINVAL;
  
@@ -2576,9 +3192,10 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/slice.c linux-2.6.32.13/arch/powerpc/
  	/* If hint, make sure it matches our alignment restrictions */
  	if (!fixed && addr) {
  		addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c	2010-05-15 13:21:13.702894969 -0400
+diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c
+index b5c753d..8f01abe 100644
+--- a/arch/powerpc/platforms/52xx/lite5200_pm.c
++++ b/arch/powerpc/platforms/52xx/lite5200_pm.c
 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
  	lite5200_pm_target_state = PM_SUSPEND_ON;
  }
@@ -2588,10 +3205,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
  	.valid		= lite5200_pm_valid,
  	.begin		= lite5200_pm_begin,
  	.prepare	= lite5200_pm_prepare,
-diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c	2010-05-15 13:21:13.706882202 -0400
-@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
+diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+index 7672253..4dfe095 100644
+--- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c
++++ b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+@@ -189,7 +189,7 @@ void mpc52xx_pm_finish(void)
  	iounmap(mbar);
  }
  
@@ -2600,10 +3218,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
  	.valid		= mpc52xx_pm_valid,
  	.prepare	= mpc52xx_pm_prepare,
  	.enter		= mpc52xx_pm_enter,
-diff -urNp linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c	2010-05-15 13:21:13.714896740 -0400
-@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
+diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
+index ebe6c35..8914e7b 100644
+--- a/arch/powerpc/platforms/83xx/suspend.c
++++ b/arch/powerpc/platforms/83xx/suspend.c
+@@ -311,7 +311,7 @@ static int mpc83xx_is_pci_agent(void)
  	return ret;
  }
  
@@ -2612,10 +3231,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.13
  	.valid = mpc83xx_suspend_valid,
  	.begin = mpc83xx_suspend_begin,
  	.enter = mpc83xx_suspend_enter,
-diff -urNp linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c	2010-05-15 13:21:13.726905139 -0400
-@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
+diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
+index 3712900..645f19f 100644
+--- a/arch/powerpc/platforms/cell/iommu.c
++++ b/arch/powerpc/platforms/cell/iommu.c
+@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struct device *dev, u64 mask)
  
  static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
  
@@ -2624,10 +3244,11 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.13/a
  	.alloc_coherent = dma_fixed_alloc_coherent,
  	.free_coherent  = dma_fixed_free_coherent,
  	.map_sg         = dma_fixed_map_sg,
-diff -urNp linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c	2010-05-15 13:21:13.726905139 -0400
-@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
+diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
+index 23083c3..ec00e40 100644
+--- a/arch/powerpc/platforms/ps3/system-bus.c
++++ b/arch/powerpc/platforms/ps3/system-bus.c
+@@ -695,7 +695,7 @@ static int ps3_dma_supported(struct device *_dev, u64 mask)
  	return mask >= DMA_BIT_MASK(32);
  }
  
@@ -2636,7 +3257,7 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
  	.alloc_coherent = ps3_alloc_coherent,
  	.free_coherent = ps3_free_coherent,
  	.map_sg = ps3_sb_map_sg,
-@@ -704,7 +704,7 @@ static struct dma_map_ops ps3_sb_dma_ops
+@@ -705,7 +705,7 @@ static struct dma_map_ops ps3_sb_dma_ops = {
  	.unmap_page = ps3_unmap_page,
  };
  
@@ -2645,22 +3266,46 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
  	.alloc_coherent = ps3_alloc_coherent,
  	.free_coherent = ps3_free_coherent,
  	.map_sg = ps3_ioc0_map_sg,
-diff -urNp linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig
---- linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig	2010-05-15 13:21:13.726905139 -0400
-@@ -2,6 +2,8 @@ config PPC_PSERIES
- 	depends on PPC64 && PPC_BOOK3S
- 	bool "IBM pSeries & new (POWER5-based) iSeries"
- 	select MPIC
-+	select PCI_MSI
-+	select XICS
- 	select PPC_I8259
- 	select PPC_RTAS
- 	select RTAS_ERROR_LOGGING
-diff -urNp linux-2.6.32.13/arch/s390/include/asm/elf.h linux-2.6.32.13/arch/s390/include/asm/elf.h
---- linux-2.6.32.13/arch/s390/include/asm/elf.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/s390/include/asm/elf.h	2010-05-15 13:21:13.745465180 -0400
-@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
+diff --git a/arch/powerpc/sysdev/fsl_pmc.c b/arch/powerpc/sysdev/fsl_pmc.c
+index 9082eb9..47d3ac2 100644
+--- a/arch/powerpc/sysdev/fsl_pmc.c
++++ b/arch/powerpc/sysdev/fsl_pmc.c
+@@ -53,7 +53,7 @@ static int pmc_suspend_valid(suspend_state_t state)
+ 	return 1;
+ }
+ 
+-static struct platform_suspend_ops pmc_suspend_ops = {
++static const struct platform_suspend_ops pmc_suspend_ops = {
+ 	.valid = pmc_suspend_valid,
+ 	.enter = pmc_suspend_enter,
+ };
+diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
+index bee1c0f..cdd44f3 100644
+--- a/arch/s390/Kconfig
++++ b/arch/s390/Kconfig
+@@ -230,13 +230,12 @@ config AUDIT_ARCH
+ 
+ config S390_EXEC_PROTECT
+ 	bool "Data execute protection"
++	default y
+ 	help
+ 	  This option allows to enable a buffer overflow protection for user
+-	  space programs and it also selects the addressing mode option above.
+-	  The kernel parameter noexec=on will enable this feature and also
+-	  switch the addressing modes, default is disabled. Enabling this (via
+-	  kernel parameter) on machines earlier than IBM System z9-109 EC/BC
+-	  will reduce system performance.
++	  space programs.
++	  Enabling this on machines earlier than IBM System z9-109 EC/BC will
++	  reduce system performance.
+ 
+ comment "Code generation options"
+ 
+diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
+index 354d426..883892c 100644
+--- a/arch/s390/include/asm/elf.h
++++ b/arch/s390/include/asm/elf.h
+@@ -163,6 +163,13 @@ extern unsigned int vdso_enabled;
     that it will "exec", and that there is sufficient room for the brk.  */
  #define ELF_ET_DYN_BASE		(STACK_TOP / 3 * 2)
  
@@ -2674,29 +3319,11 @@ diff -urNp linux-2.6.32.13/arch/s390/include/asm/elf.h linux-2.6.32.13/arch/s390
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports. */
  
-diff -urNp linux-2.6.32.13/arch/s390/include/asm/setup.h linux-2.6.32.13/arch/s390/include/asm/setup.h
---- linux-2.6.32.13/arch/s390/include/asm/setup.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/s390/include/asm/setup.h	2010-05-15 13:21:13.746887701 -0400
-@@ -50,13 +50,13 @@ extern unsigned long memory_end;
- void detect_memory_layout(struct mem_chunk chunk[]);
- 
- #ifdef CONFIG_S390_SWITCH_AMODE
--extern unsigned int switch_amode;
-+#define switch_amode	(1)
- #else
- #define switch_amode	(0)
- #endif
- 
- #ifdef CONFIG_S390_EXEC_PROTECT
--extern unsigned int s390_noexec;
-+#define s390_noexec	(1)
- #else
- #define s390_noexec	(0)
- #endif
-diff -urNp linux-2.6.32.13/arch/s390/include/asm/uaccess.h linux-2.6.32.13/arch/s390/include/asm/uaccess.h
---- linux-2.6.32.13/arch/s390/include/asm/uaccess.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/s390/include/asm/uaccess.h	2010-05-15 13:21:13.746887701 -0400
-@@ -232,6 +232,10 @@ static inline unsigned long __must_check
+diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
+index d6b1ed0..071ffbd 100644
+--- a/arch/s390/include/asm/uaccess.h
++++ b/arch/s390/include/asm/uaccess.h
+@@ -234,6 +234,10 @@ static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long n)
  {
  	might_fault();
@@ -2707,7 +3334,7 @@ diff -urNp linux-2.6.32.13/arch/s390/include/asm/uaccess.h linux-2.6.32.13/arch/
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-@@ -257,6 +261,9 @@ copy_to_user(void __user *to, const void
+@@ -259,6 +263,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
  static inline unsigned long __must_check
  __copy_from_user(void *to, const void __user *from, unsigned long n)
  {
@@ -2717,61 +3344,22 @@ diff -urNp linux-2.6.32.13/arch/s390/include/asm/uaccess.h linux-2.6.32.13/arch/
  	if (__builtin_constant_p(n) && (n <= 256))
  		return uaccess.copy_from_user_small(n, from, to);
  	else
-@@ -283,6 +290,10 @@ static inline unsigned long __must_check
- copy_from_user(void *to, const void __user *from, unsigned long n)
- {
+@@ -293,6 +300,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
+ 	unsigned int sz = __compiletime_object_size(to);
+ 
  	might_fault();
 +
 +	if ((long)n < 0)
 +		return n;
 +
- 	if (access_ok(VERIFY_READ, from, n))
- 		n = __copy_from_user(to, from, n);
- 	else
-diff -urNp linux-2.6.32.13/arch/s390/Kconfig linux-2.6.32.13/arch/s390/Kconfig
---- linux-2.6.32.13/arch/s390/Kconfig	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/s390/Kconfig	2010-05-15 13:21:13.754899687 -0400
-@@ -194,28 +194,26 @@ config AUDIT_ARCH
- 
- config S390_SWITCH_AMODE
- 	bool "Switch kernel/user addressing modes"
-+	default y
- 	help
- 	  This option allows to switch the addressing modes of kernel and user
--	  space. The kernel parameter switch_amode=on will enable this feature,
--	  default is disabled. Enabling this (via kernel parameter) on machines
--	  earlier than IBM System z9-109 EC/BC will reduce system performance.
-+	  space.  Enabling this on machines earlier than IBM System z9-109 EC/BC
-+	  will reduce system performance.
- 
- 	  Note that this option will also be selected by selecting the execute
--	  protection option below. Enabling the execute protection via the
--	  noexec kernel parameter will also switch the addressing modes,
--	  independent of the switch_amode kernel parameter.
-+	  protection option below. Enabling the execute protection will also
-+	  switch the addressing modes, independent of this option.
- 
- 
- config S390_EXEC_PROTECT
- 	bool "Data execute protection"
-+	default y
- 	select S390_SWITCH_AMODE
- 	help
- 	  This option allows to enable a buffer overflow protection for user
- 	  space programs and it also selects the addressing mode option above.
--	  The kernel parameter noexec=on will enable this feature and also
--	  switch the addressing modes, default is disabled. Enabling this (via
--	  kernel parameter) on machines earlier than IBM System z9-109 EC/BC
--	  will reduce system performance.
-+	  Enabling this on machines earlier than IBM System z9-109 EC/BC will
-+	  reduce system performance.
- 
- comment "Code generation options"
- 
-diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/kernel/module.c
---- linux-2.6.32.13/arch/s390/kernel/module.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/s390/kernel/module.c	2010-05-15 13:21:13.754899687 -0400
-@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
+ 	if (unlikely(sz != -1 && sz < n)) {
+ 		copy_from_user_overflow();
+ 		return n;
+diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
+index 22cfd63..a70f1db 100644
+--- a/arch/s390/kernel/module.c
++++ b/arch/s390/kernel/module.c
+@@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
  
  	/* Increase core size by size of got & plt and set start
  	   offsets for got and plt. */
@@ -2788,7 +3376,7 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/k
  	return 0;
  }
  
-@@ -256,7 +256,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -258,7 +258,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
  		if (info->got_initialized == 0) {
  			Elf_Addr *gotent;
  
@@ -2797,7 +3385,7 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/k
  				info->got_offset;
  			*gotent = val;
  			info->got_initialized = 1;
-@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -282,7 +282,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
  		else if (r_type == R_390_GOTENT ||
  			 r_type == R_390_GOTPLTENT)
  			*(unsigned int *) loc =
@@ -2806,7 +3394,7 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/k
  		else if (r_type == R_390_GOT64 ||
  			 r_type == R_390_GOTPLT64)
  			*(unsigned long *) loc = val;
-@@ -294,7 +294,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -296,7 +296,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
  	case R_390_PLTOFF64:	/* 16 bit offset from GOT to PLT. */
  		if (info->plt_initialized == 0) {
  			unsigned int *ip;
@@ -2815,7 +3403,7 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/k
  				info->plt_offset;
  #ifndef CONFIG_64BIT
  			ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
-@@ -319,7 +319,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -321,7 +321,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
  			       val - loc + 0xffffUL < 0x1ffffeUL) ||
  			      (r_type == R_390_PLT32DBL &&
  			       val - loc + 0xffffffffULL < 0x1fffffffeULL)))
@@ -2824,7 +3412,7 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/k
  					me->arch.plt_offset +
  					info->plt_offset;
  			val += rela->r_addend - loc;
-@@ -341,7 +341,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -343,7 +343,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
  	case R_390_GOTOFF32:	/* 32 bit offset to GOT.  */
  	case R_390_GOTOFF64:	/* 64 bit offset to GOT. */
  		val = val + rela->r_addend -
@@ -2833,7 +3421,7 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/k
  		if (r_type == R_390_GOTOFF16)
  			*(unsigned short *) loc = val;
  		else if (r_type == R_390_GOTOFF32)
-@@ -351,7 +351,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -353,7 +353,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
  		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. */
@@ -2842,45 +3430,42 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/k
  			rela->r_addend - loc;
  		if (r_type == R_390_GOTPC)
  			*(unsigned int *) loc = val;
-diff -urNp linux-2.6.32.13/arch/s390/kernel/setup.c linux-2.6.32.13/arch/s390/kernel/setup.c
---- linux-2.6.32.13/arch/s390/kernel/setup.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/s390/kernel/setup.c	2010-05-15 13:21:13.754899687 -0400
-@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
+diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
+index c8e8e13..73bca9f 100644
+--- a/arch/s390/kernel/setup.c
++++ b/arch/s390/kernel/setup.c
+@@ -281,7 +281,7 @@ static int __init early_parse_mem(char *p)
+ }
  early_param("mem", early_parse_mem);
  
- #ifdef CONFIG_S390_SWITCH_AMODE
--unsigned int switch_amode = 0;
--EXPORT_SYMBOL_GPL(switch_amode);
--
+-unsigned int user_mode = HOME_SPACE_MODE;
++unsigned int user_mode = SECONDARY_SPACE_MODE;
+ EXPORT_SYMBOL_GPL(user_mode);
+ 
  static int set_amode_and_uaccess(unsigned long user_amode,
- 				 unsigned long user32_amode)
- {
-@@ -334,17 +331,6 @@ static int set_amode_and_uaccess(unsigne
- 		return 0;
+@@ -310,17 +310,6 @@ static int set_amode_and_uaccess(unsigned long user_amode,
  	}
  }
--
+ 
 -/*
 - * Switch kernel/user addressing modes?
 - */
 -static int __init early_parse_switch_amode(char *p)
 -{
--	switch_amode = 1;
+-	if (user_mode != SECONDARY_SPACE_MODE)
+-		user_mode = PRIMARY_SPACE_MODE;
 -	return 0;
 -}
 -early_param("switch_amode", early_parse_switch_amode);
 -
- #else /* CONFIG_S390_SWITCH_AMODE */
- static inline int set_amode_and_uaccess(unsigned long user_amode,
- 					unsigned long user32_amode)
-@@ -353,24 +339,6 @@ static inline int set_amode_and_uaccess(
+ static int __init early_parse_user_mode(char *p)
+ {
+ 	if (p && strcmp(p, "primary") == 0)
+@@ -337,20 +326,6 @@ static int __init early_parse_user_mode(char *p)
  }
- #endif /* CONFIG_S390_SWITCH_AMODE */
+ early_param("user_mode", early_parse_user_mode);
  
 -#ifdef CONFIG_S390_EXEC_PROTECT
--unsigned int s390_noexec = 0;
--EXPORT_SYMBOL_GPL(s390_noexec);
--
 -/*
 - * Enable execute protection?
 - */
@@ -2888,8 +3473,7 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/setup.c linux-2.6.32.13/arch/s390/ke
 -{
 -	if (!strncmp(p, "off", 3))
 -		return 0;
--	switch_amode = 1;
--	s390_noexec = 1;
+-	user_mode = SECONDARY_SPACE_MODE;
 -	return 0;
 -}
 -early_param("noexec", early_parse_noexec);
@@ -2897,11 +3481,25 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/setup.c linux-2.6.32.13/arch/s390/ke
 -
  static void setup_addressing_mode(void)
  {
- 	if (s390_noexec) {
-diff -urNp linux-2.6.32.13/arch/s390/mm/mmap.c linux-2.6.32.13/arch/s390/mm/mmap.c
---- linux-2.6.32.13/arch/s390/mm/mmap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/s390/mm/mmap.c	2010-05-15 13:21:13.770895237 -0400
-@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
+ 	if (user_mode == SECONDARY_SPACE_MODE) {
+diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
+index a8c2af8..93a9d95 100644
+--- a/arch/s390/mm/maccess.c
++++ b/arch/s390/mm/maccess.c
+@@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void *dst, void *src, size_t size)
+ 	return rc ? rc : count;
+ }
+ 
+-long probe_kernel_write(void *dst, void *src, size_t size)
++long probe_kernel_write(void *dst, const void *src, size_t size)
+ {
+ 	long copied = 0;
+ 
+diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
+index 869efba..b9d76aa 100644
+--- a/arch/s390/mm/mmap.c
++++ b/arch/s390/mm/mmap.c
+@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
  	 */
  	if (mmap_is_legacy()) {
  		mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -2924,7 +3522,7 @@ diff -urNp linux-2.6.32.13/arch/s390/mm/mmap.c linux-2.6.32.13/arch/s390/mm/mmap
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-@@ -153,10 +165,22 @@ void arch_pick_mmap_layout(struct mm_str
+@@ -153,10 +165,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
  	 */
  	if (mmap_is_legacy()) {
  		mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -2947,10 +3545,11 @@ diff -urNp linux-2.6.32.13/arch/s390/mm/mmap.c linux-2.6.32.13/arch/s390/mm/mmap
  		mm->get_unmapped_area = s390_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c	2010-05-15 13:21:13.770895237 -0400
-@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
+diff --git a/arch/sh/boards/mach-hp6xx/pm.c b/arch/sh/boards/mach-hp6xx/pm.c
+index 4499a37..adc9b4b 100644
+--- a/arch/sh/boards/mach-hp6xx/pm.c
++++ b/arch/sh/boards/mach-hp6xx/pm.c
+@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_t state)
  	return 0;
  }
  
@@ -2959,22 +3558,73 @@ diff -urNp linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.13/arch/s
  	.enter		= hp6x0_pm_enter,
  	.valid		= suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c
---- linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c	2010-05-15 13:21:13.782909212 -0400
-@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
- 	NULL,
- };
+diff --git a/arch/sh/include/asm/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h
+index bea3337..0c92252 100644
+--- a/arch/sh/include/asm/dma-mapping.h
++++ b/arch/sh/include/asm/dma-mapping.h
+@@ -1,10 +1,10 @@
+ #ifndef __ASM_SH_DMA_MAPPING_H
+ #define __ASM_SH_DMA_MAPPING_H
  
--static struct sysfs_ops sq_sysfs_ops = {
-+static const struct sysfs_ops sq_sysfs_ops = {
- 	.show	= sq_sysfs_show,
- 	.store	= sq_sysfs_store,
- };
-diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c	2010-05-15 13:21:13.782909212 -0400
-@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
+-extern struct dma_map_ops *dma_ops;
++extern const struct dma_map_ops *dma_ops;
+ extern void no_iommu_init(void);
+ 
+-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
++static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
+ {
+ 	return dma_ops;
+ }
+@@ -14,7 +14,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
+ 
+ static inline int dma_supported(struct device *dev, u64 mask)
+ {
+-	struct dma_map_ops *ops = get_dma_ops(dev);
++	const struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+ 	if (ops->dma_supported)
+ 		return ops->dma_supported(dev, mask);
+@@ -24,7 +24,7 @@ static inline int dma_supported(struct device *dev, u64 mask)
+ 
+ static inline int dma_set_mask(struct device *dev, u64 mask)
+ {
+-	struct dma_map_ops *ops = get_dma_ops(dev);
++	const struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+ 	if (!dev->dma_mask || !dma_supported(dev, mask))
+ 		return -EIO;
+@@ -59,7 +59,7 @@ static inline int dma_get_cache_alignment(void)
+ 
+ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
+ {
+-	struct dma_map_ops *ops = get_dma_ops(dev);
++	const struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+ 	if (ops->mapping_error)
+ 		return ops->mapping_error(dev, dma_addr);
+@@ -70,7 +70,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
+ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
+ 				       dma_addr_t *dma_handle, gfp_t gfp)
+ {
+-	struct dma_map_ops *ops = get_dma_ops(dev);
++	const struct dma_map_ops *ops = get_dma_ops(dev);
+ 	void *memory;
+ 
+ 	if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))
+@@ -87,7 +87,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
+ static inline void dma_free_coherent(struct device *dev, size_t size,
+ 				     void *vaddr, dma_addr_t dma_handle)
+ {
+-	struct dma_map_ops *ops = get_dma_ops(dev);
++	const struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+ 	if (dma_release_from_coherent(dev, get_order(size), vaddr))
+ 		return;
+diff --git a/arch/sh/kernel/cpu/shmobile/pm.c b/arch/sh/kernel/cpu/shmobile/pm.c
+index e559687..a6f95ae 100644
+--- a/arch/sh/kernel/cpu/shmobile/pm.c
++++ b/arch/sh/kernel/cpu/shmobile/pm.c
+@@ -141,7 +141,7 @@ static int sh_pm_enter(suspend_state_t state)
  	return 0;
  }
  
@@ -2983,11 +3633,25 @@ diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.13/arch
  	.enter          = sh_pm_enter,
  	.valid          = suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.32.13/arch/sh/kernel/kgdb.c linux-2.6.32.13/arch/sh/kernel/kgdb.c
---- linux-2.6.32.13/arch/sh/kernel/kgdb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sh/kernel/kgdb.c	2010-05-15 13:21:13.782909212 -0400
-@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
- {
+diff --git a/arch/sh/kernel/dma-nommu.c b/arch/sh/kernel/dma-nommu.c
+index 3c55b87..92ccab3 100644
+--- a/arch/sh/kernel/dma-nommu.c
++++ b/arch/sh/kernel/dma-nommu.c
+@@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device *dev, struct scatterlist *sg,
+ }
+ #endif
+ 
+-struct dma_map_ops nommu_dma_ops = {
++const struct dma_map_ops nommu_dma_ops = {
+ 	.alloc_coherent		= dma_generic_alloc_coherent,
+ 	.free_coherent		= dma_generic_free_coherent,
+ 	.map_page		= nommu_map_page,
+diff --git a/arch/sh/kernel/kgdb.c b/arch/sh/kernel/kgdb.c
+index efb6d39..49e7304 100644
+--- a/arch/sh/kernel/kgdb.c
++++ b/arch/sh/kernel/kgdb.c
+@@ -319,7 +319,7 @@ void kgdb_arch_exit(void)
+ 	unregister_die_notifier(&kgdb_notifier);
  }
  
 -struct kgdb_arch arch_kgdb_ops = {
@@ -2995,18 +3659,96 @@ diff -urNp linux-2.6.32.13/arch/sh/kernel/kgdb.c linux-2.6.32.13/arch/sh/kernel/
  	/* Breakpoint instruction: trapa #0x3c */
  #ifdef CONFIG_CPU_LITTLE_ENDIAN
  	.gdb_bpt_instr		= { 0x3c, 0xc3 },
-diff -urNp linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h	2010-05-15 13:21:13.782909212 -0400
-@@ -14,18 +14,38 @@
+diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
+index c86a085..819f30c 100644
+--- a/arch/sh/mm/consistent.c
++++ b/arch/sh/mm/consistent.c
+@@ -22,7 +22,7 @@
+ 
+ #define PREALLOC_DMA_DEBUG_ENTRIES	4096
+ 
+-struct dma_map_ops *dma_ops;
++const struct dma_map_ops *dma_ops;
+ EXPORT_SYMBOL(dma_ops);
+ 
+ static int __init dma_init(void)
+diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
+index afeb710..fa68ac9 100644
+--- a/arch/sh/mm/mmap.c
++++ b/arch/sh/mm/mmap.c
+@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ 			addr = PAGE_ALIGN(addr);
+ 
+ 		vma = find_vma(mm, addr);
+-		if (TASK_SIZE - len >= addr &&
+-		    (!vma || addr + len <= vma->vm_start))
++		if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
+ 			return addr;
+ 	}
+ 
+@@ -106,7 +105,7 @@ full_search:
+ 			}
+ 			return -ENOMEM;
+ 		}
+-		if (likely(!vma || addr + len <= vma->vm_start)) {
++		if (likely(check_heap_stack_gap(vma, addr, len))) {
+ 			/*
+ 			 * Remember the place where we stopped the search:
+ 			 */
+@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ 			addr = PAGE_ALIGN(addr);
+ 
+ 		vma = find_vma(mm, addr);
+-		if (TASK_SIZE - len >= addr &&
+-		    (!vma || addr + len <= vma->vm_start))
++		if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
+ 			return addr;
+ 	}
+ 
+@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ 	/* 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(vma, addr - len, len)) {
+ 			/* remember the address as a hint for next time */
+ 			return (mm->free_area_cache = addr-len);
+ 		}
+@@ -199,7 +197,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ 		 * return with success:
+ 		 */
+ 		vma = find_vma(mm, addr);
+-		if (likely(!vma || addr+len <= vma->vm_start)) {
++		if (likely(check_heap_stack_gap(vma, addr, len))) {
+ 			/* remember the address as a hint for next time */
+ 			return (mm->free_area_cache = addr);
+ 		}
+diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
+index 113225b..7fd04e7 100644
+--- a/arch/sparc/Makefile
++++ b/arch/sparc/Makefile
+@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sparc/oprofile/
+ # Export what is needed by arch/sparc/boot/Makefile
+ export VMLINUX_INIT VMLINUX_MAIN
+ VMLINUX_INIT := $(head-y) $(init-y)
+-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
++VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
+ VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
+ VMLINUX_MAIN += $(drivers-y) $(net-y)
+ 
+diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
+index bdb2ff8..69e69f3 100644
+--- a/arch/sparc/include/asm/atomic_64.h
++++ b/arch/sparc/include/asm/atomic_64.h
+@@ -14,18 +14,40 @@
  #define ATOMIC64_INIT(i)	{ (i) }
  
- #define atomic_read(v)		((v)->counter)
+ #define atomic_read(v)		(*(volatile int *)&(v)->counter)
 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
 +{
 +	return v->counter;
 +}
- #define atomic64_read(v)	((v)->counter)
+ #define atomic64_read(v)	(*(volatile long *)&(v)->counter)
 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
 +{
 +	return v->counter;
@@ -3025,27 +3767,46 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h linux-2.6.32.13/ar
  
  extern void atomic_add(int, atomic_t *);
 +extern void atomic_add_unchecked(int, atomic_unchecked_t *);
- extern void atomic64_add(int, atomic64_t *);
-+extern void atomic64_add_unchecked(int, atomic64_unchecked_t *);
+ extern void atomic64_add(long, atomic64_t *);
++extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
  extern void atomic_sub(int, atomic_t *);
 +extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
- extern void atomic64_sub(int, atomic64_t *);
+ extern void atomic64_sub(long, atomic64_t *);
++extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
  
  extern int atomic_add_ret(int, atomic_t *);
- extern int atomic64_add_ret(int, atomic64_t *);
-+extern int atomic64_add_ret_unchecked(int, atomic64_unchecked_t *);
++extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
+ extern long atomic64_add_ret(long, atomic64_t *);
++extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
  extern int atomic_sub_ret(int, atomic_t *);
- extern int atomic64_sub_ret(int, atomic64_t *);
+ extern long atomic64_sub_ret(long, atomic64_t *);
  
-@@ -34,6 +54,7 @@ extern int atomic64_sub_ret(int, atomic6
+@@ -33,12 +55,24 @@ extern long atomic64_sub_ret(long, atomic64_t *);
+ #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
  
  #define atomic_inc_return(v) atomic_add_ret(1, v)
++static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
++{
++	return atomic_add_ret_unchecked(1, v);
++}
  #define atomic64_inc_return(v) atomic64_add_ret(1, v)
-+#define atomic64_inc_return_unchecked(v) atomic64_add_ret_unchecked(1, v)
++static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
++{
++	return atomic64_add_ret_unchecked(1, v);
++}
  
  #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
  #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
-@@ -59,7 +80,15 @@ extern int atomic64_sub_ret(int, atomic6
+ 
+ #define atomic_add_return(i, v) atomic_add_ret(i, v)
++static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
++{
++	return atomic_add_ret_unchecked(i, v);
++}
+ #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
+ 
+ /*
+@@ -59,10 +93,26 @@ extern long atomic64_sub_ret(long, atomic64_t *);
  #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
  
  #define atomic_inc(v) atomic_add(1, v)
@@ -3060,8 +3821,19 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h linux-2.6.32.13/ar
 +}
  
  #define atomic_dec(v) atomic_sub(1, v)
++static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
++{
++	atomic_sub_unchecked(1, v);
++}
  #define atomic64_dec(v) atomic64_sub(1, v)
-@@ -72,17 +101,28 @@ extern int atomic64_sub_ret(int, atomic6
++static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
++{
++	atomic64_sub_unchecked(1, v);
++}
+ 
+ #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
+ #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
+@@ -72,17 +122,28 @@ extern long atomic64_sub_ret(long, atomic64_t *);
  
  static inline int atomic_add_unless(atomic_t *v, int a, int u)
  {
@@ -3094,9 +3866,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h linux-2.6.32.13/ar
  }
  
  #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-@@ -93,17 +133,28 @@ static inline int atomic_add_unless(atom
+@@ -93,17 +154,28 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
  
- static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
+ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
  {
 -	long c, old;
 +	long c, old, new;
@@ -3127,10 +3899,11 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h linux-2.6.32.13/ar
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h	2010-05-15 13:21:13.782909212 -0400
-@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
+diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
+index 4b4a0c0..29925cb 100644
+--- a/arch/sparc/include/asm/dma-mapping.h
++++ b/arch/sparc/include/asm/dma-mapping.h
+@@ -13,10 +13,10 @@ extern int dma_supported(struct device *dev, u64 mask);
  #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
  #define dma_is_consistent(d, h)	(1)
  
@@ -3143,7 +3916,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.13/
  {
  #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
  	if (dev->bus == &pci_bus_type)
-@@ -31,7 +31,7 @@ static inline struct dma_map_ops *get_dm
+@@ -30,7 +30,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
  static inline void *dma_alloc_coherent(struct device *dev, size_t size,
  				       dma_addr_t *dma_handle, gfp_t flag)
  {
@@ -3152,7 +3925,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.13/
  	void *cpu_addr;
  
  	cpu_addr = ops->alloc_coherent(dev, size, dma_handle, flag);
-@@ -42,7 +42,7 @@ static inline void *dma_alloc_coherent(s
+@@ -41,7 +41,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
  static inline void dma_free_coherent(struct device *dev, size_t size,
  				     void *cpu_addr, dma_addr_t dma_handle)
  {
@@ -3161,10 +3934,11 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.13/
  
  	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
  	ops->free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_32.h linux-2.6.32.13/arch/sparc/include/asm/elf_32.h
---- linux-2.6.32.13/arch/sparc/include/asm/elf_32.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/include/asm/elf_32.h	2010-05-15 13:21:13.782909212 -0400
-@@ -116,6 +116,13 @@ typedef struct {
+diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
+index 4269ca6..e3da77f 100644
+--- a/arch/sparc/include/asm/elf_32.h
++++ b/arch/sparc/include/asm/elf_32.h
+@@ -114,6 +114,13 @@ typedef struct {
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
  
@@ -3178,10 +3952,11 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_32.h linux-2.6.32.13/arch/
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  This can NOT be done in userspace
     on Sparc.  */
-diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_64.h linux-2.6.32.13/arch/sparc/include/asm/elf_64.h
---- linux-2.6.32.13/arch/sparc/include/asm/elf_64.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/include/asm/elf_64.h	2010-05-15 13:21:13.788083684 -0400
-@@ -163,6 +163,12 @@ typedef struct {
+diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
+index e678803..dfb3071 100644
+--- a/arch/sparc/include/asm/elf_64.h
++++ b/arch/sparc/include/asm/elf_64.h
+@@ -162,6 +162,12 @@ typedef struct {
  #define ELF_ET_DYN_BASE		0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE	0x0000000070000000UL
  
@@ -3194,9 +3969,10 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_64.h linux-2.6.32.13/arch/
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  */
-diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h	2010-05-15 13:21:13.788083684 -0400
+diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
+index 0ece77f..6242e98 100644
+--- a/arch/sparc/include/asm/pgtable_32.h
++++ b/arch/sparc/include/asm/pgtable_32.h
 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
  BTFIXUPDEF_INT(page_none)
  BTFIXUPDEF_INT(page_copy)
@@ -3228,9 +4004,10 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.13/a
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h	2010-05-15 13:21:13.788083684 -0400
+diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
+index 1407c07..7e10231 100644
+--- a/arch/sparc/include/asm/pgtsrmmu.h
++++ b/arch/sparc/include/asm/pgtsrmmu.h
 @@ -115,6 +115,13 @@
  				    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3245,10 +4022,11 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.13/arc
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
  				    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urNp linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h	2010-05-15 13:21:13.798894063 -0400
-@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
+diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
+index 073936a..9bcd257 100644
+--- a/arch/sparc/include/asm/spinlock_64.h
++++ b/arch/sparc/include/asm/spinlock_64.h
+@@ -99,7 +99,12 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
  	__asm__ __volatile__ (
  "1:	ldsw		[%2], %0\n"
  "	brlz,pn		%0, 2f\n"
@@ -3262,7 +4040,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.13/
  "	cas		[%2], %0, %1\n"
  "	cmp		%0, %1\n"
  "	bne,pn		%%icc, 1b\n"
-@@ -112,7 +117,7 @@ static void inline arch_read_lock(raw_rw
+@@ -112,7 +117,7 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
  "	.previous"
  	: "=&r" (tmp1), "=&r" (tmp2)
  	: "r" (lock)
@@ -3270,8 +4048,8 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.13/
 +	: "memory", "cc");
  }
  
- static int inline arch_read_trylock(raw_rwlock_t *lock)
-@@ -123,7 +128,12 @@ static int inline arch_read_trylock(raw_
+ static int inline arch_read_trylock(arch_rwlock_t *lock)
+@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
  "1:	ldsw		[%2], %0\n"
  "	brlz,a,pn	%0, 2f\n"
  "	 mov		0, %0\n"
@@ -3285,7 +4063,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.13/
  "	cas		[%2], %0, %1\n"
  "	cmp		%0, %1\n"
  "	bne,pn		%%icc, 1b\n"
-@@ -142,7 +152,12 @@ static void inline arch_read_unlock(raw_
+@@ -142,7 +152,12 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
  
  	__asm__ __volatile__(
  "1:	lduw	[%2], %0\n"
@@ -3299,10 +4077,29 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.13/
  "	cas	[%2], %0, %1\n"
  "	cmp	%0, %1\n"
  "	bne,pn	%%xcc, 1b\n"
-diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h	2010-05-15 13:21:13.798894063 -0400
-@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
+diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
+index e88fbe5..96b0ce5 100644
+--- a/arch/sparc/include/asm/uaccess.h
++++ b/arch/sparc/include/asm/uaccess.h
+@@ -1,5 +1,13 @@
+ #ifndef ___ASM_SPARC_UACCESS_H
+ #define ___ASM_SPARC_UACCESS_H
++
++#ifdef __KERNEL__
++#ifndef __ASSEMBLY__
++#include <linux/types.h>
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++#endif
++#endif
++
+ #if defined(__sparc__) && defined(__arch64__)
+ #include <asm/uaccess_64.h>
+ #else
+diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
+index 25f1d10..a78c5fe 100644
+--- a/arch/sparc/include/asm/uaccess_32.h
++++ b/arch/sparc/include/asm/uaccess_32.h
+@@ -249,14 +249,25 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
  
  static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -3330,12 +4127,19 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.13/a
  	return __copy_user(to, (__force void __user *) from, n);
  }
  
- static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
+@@ -272,19 +283,27 @@ static inline unsigned long copy_from_user(void *to, const void __user *from, un
  {
--	if (n && __access_ok((unsigned long) from, n))
+ 	int sz = __compiletime_object_size(to);
+ 
 +	if ((long)n < 0)
 +		return n;
 +
+ 	if (unlikely(sz != -1 && sz < n)) {
+ 		copy_from_user_overflow();
+ 		return n;
+ 	}
+ 
+-	if (n && __access_ok((unsigned long) from, n))
 +	if (n && __access_ok((unsigned long) from, n)) {
 +		if (!__builtin_constant_p(n))
 +			check_object_size(to, n, false);
@@ -3353,10 +4157,11 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.13/a
  	return __copy_user((__force void __user *) to, from, n);
  }
  
-diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h	2010-05-15 13:21:13.798894063 -0400
-@@ -9,6 +9,7 @@
+diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
+index 2406788..02da64f 100644
+--- a/arch/sparc/include/asm/uaccess_64.h
++++ b/arch/sparc/include/asm/uaccess_64.h
+@@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <linux/string.h>
  #include <linux/thread_info.h>
@@ -3364,20 +4169,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.13/a
  #include <asm/asi.h>
  #include <asm/system.h>
  #include <asm/spitfire.h>
-@@ -203,6 +204,7 @@ __asm__ __volatile__(							\
-        : "=r" (x) : "r" (__m(addr)), "i" (retval))
- 
- extern int __get_user_bad(void);
-+extern void check_object_size(const void *ptr, unsigned long n, bool to);
- 
- extern unsigned long __must_check ___copy_from_user(void *to,
- 						    const void __user *from,
-@@ -212,8 +214,15 @@ extern unsigned long copy_from_user_fixu
- static inline unsigned long __must_check
- copy_from_user(void *to, const void __user *from, unsigned long size)
- {
--	unsigned long ret = ___copy_from_user(to, from, size);
-+	unsigned long ret;
+@@ -224,6 +225,12 @@ copy_from_user(void *to, const void __user *from, unsigned long size)
+ 	int sz = __compiletime_object_size(to);
+ 	unsigned long ret = size;
  
 +	if ((long)size < 0 || size > INT_MAX)
 +		return size;
@@ -3385,11 +4179,10 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.13/a
 +	if (!__builtin_constant_p(size))
 +		check_object_size(to, size, false);
 +
-+	ret = ___copy_from_user(to, from, size);
- 	if (unlikely(ret))
- 		ret = copy_from_user_fixup(to, from, size);
- 	return ret;
-@@ -228,8 +237,15 @@ extern unsigned long copy_to_user_fixup(
+ 	if (likely(sz == -1 || sz >= size)) {
+ 		ret = ___copy_from_user(to, from, size);
+ 		if (unlikely(ret))
+@@ -243,8 +250,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
  static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long size)
  {
@@ -3406,10 +4199,24 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.13/a
  	if (unlikely(ret))
  		ret = copy_to_user_fixup(to, from, size);
  	return ret;
-diff -urNp linux-2.6.32.13/arch/sparc/kernel/iommu.c linux-2.6.32.13/arch/sparc/kernel/iommu.c
---- linux-2.6.32.13/arch/sparc/kernel/iommu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/kernel/iommu.c	2010-05-15 13:21:13.798894063 -0400
-@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
+diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
+index 0c2dc1f..7ec02c7 100644
+--- a/arch/sparc/kernel/Makefile
++++ b/arch/sparc/kernel/Makefile
+@@ -3,7 +3,7 @@
+ #
+ 
+ asflags-y := -ansi
+-ccflags-y := -Werror
++#ccflags-y := -Werror
+ 
+ extra-y     := head_$(BITS).o
+ extra-y     += init_task.o
+diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
+index 47977a7..639bf96 100644
+--- a/arch/sparc/kernel/iommu.c
++++ b/arch/sparc/kernel/iommu.c
+@@ -828,7 +828,7 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev,
  	spin_unlock_irqrestore(&iommu->lock, flags);
  }
  
@@ -3418,7 +4225,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/iommu.c linux-2.6.32.13/arch/sparc/
  	.alloc_coherent		= dma_4u_alloc_coherent,
  	.free_coherent		= dma_4u_free_coherent,
  	.map_page		= dma_4u_map_page,
-@@ -837,7 +837,7 @@ static struct dma_map_ops sun4u_dma_ops 
+@@ -839,7 +839,7 @@ static struct dma_map_ops sun4u_dma_ops = {
  	.sync_sg_for_cpu	= dma_4u_sync_sg_for_cpu,
  };
  
@@ -3427,10 +4234,11 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/iommu.c linux-2.6.32.13/arch/sparc/
  EXPORT_SYMBOL(dma_ops);
  
  extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.32.13/arch/sparc/kernel/ioport.c linux-2.6.32.13/arch/sparc/kernel/ioport.c
---- linux-2.6.32.13/arch/sparc/kernel/ioport.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/kernel/ioport.c	2010-05-15 13:21:13.798894063 -0400
-@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
+diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
+index 703e4aa..043a5f2 100644
+--- a/arch/sparc/kernel/ioport.c
++++ b/arch/sparc/kernel/ioport.c
+@@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
  	BUG();
  }
  
@@ -3439,7 +4247,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/ioport.c linux-2.6.32.13/arch/sparc
  	.alloc_coherent		= sbus_alloc_coherent,
  	.free_coherent		= sbus_free_coherent,
  	.map_page		= sbus_map_page,
-@@ -403,7 +403,7 @@ struct dma_map_ops sbus_dma_ops = {
+@@ -408,7 +408,7 @@ struct dma_map_ops sbus_dma_ops = {
  	.sync_sg_for_device	= sbus_sync_sg_for_device,
  };
  
@@ -3448,7 +4256,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/ioport.c linux-2.6.32.13/arch/sparc
  EXPORT_SYMBOL(dma_ops);
  
  static int __init sparc_register_ioport(void)
-@@ -640,7 +640,7 @@ static void pci32_sync_sg_for_device(str
+@@ -645,7 +645,7 @@ static void pci32_sync_sg_for_device(struct device *device, struct scatterlist *
  	}
  }
  
@@ -3457,11 +4265,12 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/ioport.c linux-2.6.32.13/arch/sparc
  	.alloc_coherent		= pci32_alloc_coherent,
  	.free_coherent		= pci32_free_coherent,
  	.map_page		= pci32_map_page,
-diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c	2010-05-15 13:21:13.810880669 -0400
-@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
- {
+diff --git a/arch/sparc/kernel/kgdb_32.c b/arch/sparc/kernel/kgdb_32.c
+index 539243b..d61227d 100644
+--- a/arch/sparc/kernel/kgdb_32.c
++++ b/arch/sparc/kernel/kgdb_32.c
+@@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)
+ 	regs->npc = regs->pc + 4;
  }
  
 -struct kgdb_arch arch_kgdb_ops = {
@@ -3469,11 +4278,12 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c linux-2.6.32.13/arch/spar
  	/* Breakpoint instruction: ta 0x7d */
  	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x7d },
  };
-diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c	2010-05-15 13:21:13.810880669 -0400
-@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
- {
+diff --git a/arch/sparc/kernel/kgdb_64.c b/arch/sparc/kernel/kgdb_64.c
+index 768290a..d8a4286 100644
+--- a/arch/sparc/kernel/kgdb_64.c
++++ b/arch/sparc/kernel/kgdb_64.c
+@@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)
+ 	regs->tnpc = regs->tpc + 4;
  }
  
 -struct kgdb_arch arch_kgdb_ops = {
@@ -3481,22 +4291,11 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c linux-2.6.32.13/arch/spar
  	/* Breakpoint instruction: ta 0x72 */
  	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x72 },
  };
-diff -urNp linux-2.6.32.13/arch/sparc/kernel/Makefile linux-2.6.32.13/arch/sparc/kernel/Makefile
---- linux-2.6.32.13/arch/sparc/kernel/Makefile	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/kernel/Makefile	2010-05-15 13:21:13.810880669 -0400
-@@ -3,7 +3,7 @@
- #
- 
- asflags-y := -ansi
--ccflags-y := -Werror
-+#ccflags-y := -Werror
- 
- extra-y     := head_$(BITS).o
- extra-y     += init_task.o
-diff -urNp linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c	2010-05-15 13:21:13.810880669 -0400
-@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
+diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
+index a24af6f..bc0f1cf 100644
+--- a/arch/sparc/kernel/pci_sun4v.c
++++ b/arch/sparc/kernel/pci_sun4v.c
+@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,
  	spin_unlock_irqrestore(&iommu->lock, flags);
  }
  
@@ -3505,10 +4304,11 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.13/arch/sp
  	.alloc_coherent			= dma_4v_alloc_coherent,
  	.free_coherent			= dma_4v_free_coherent,
  	.map_page			= dma_4v_map_page,
-diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c	2010-05-15 13:21:13.810880669 -0400
-@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
+diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
+index ee995b7..2393b36 100644
+--- a/arch/sparc/kernel/sys_sparc_32.c
++++ b/arch/sparc/kernel/sys_sparc_32.c
+@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
  	if (ARCH_SUN4C && len > 0x20000000)
  		return -ENOMEM;
  	if (!addr)
@@ -3517,10 +4317,20 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.13/arch
  
  	if (flags & MAP_SHARED)
  		addr = COLOUR_ALIGN(addr);
-diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c	2010-05-15 13:21:13.810880669 -0400
-@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
+@@ -72,7 +72,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+ 		}
+ 		if (TASK_SIZE - PAGE_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 (flags & MAP_SHARED)
+diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
+index 3d435c4..14d838e 100644
+--- a/arch/sparc/kernel/sys_sparc_64.c
++++ b/arch/sparc/kernel/sys_sparc_64.c
+@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
  		/* We do not accept a shared mapping if it would violate
  		 * cache aliasing constraints.
  		 */
@@ -3529,7 +4339,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch
  		    ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
  			return -EINVAL;
  		return addr;
-@@ -140,6 +140,10 @@ unsigned long arch_get_unmapped_area(str
+@@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
  	if (filp || (flags & MAP_SHARED))
  		do_color_align = 1;
  
@@ -3540,7 +4350,14 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch
  	if (addr) {
  		if (do_color_align)
  			addr = COLOUR_ALIGN(addr, pgoff);
-@@ -153,9 +157,9 @@ unsigned long arch_get_unmapped_area(str
+@@ -146,15 +150,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+ 			addr = PAGE_ALIGN(addr);
+ 
+ 		vma = find_vma(mm, addr);
+-		if (task_size - len >= addr &&
+-		    (!vma || addr + len <= vma->vm_start))
++		if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
+ 			return addr;
  	}
  
  	if (len > mm->cached_hole_size) {
@@ -3552,7 +4369,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch
  	        mm->cached_hole_size = 0;
  	}
  
-@@ -175,8 +179,8 @@ full_search:
+@@ -174,14 +177,14 @@ full_search:
  			vma = find_vma(mm, VA_EXCLUDE_END);
  		}
  		if (unlikely(task_size < addr)) {
@@ -3563,7 +4380,14 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch
  				mm->cached_hole_size = 0;
  				goto full_search;
  			}
-@@ -216,7 +220,7 @@ arch_get_unmapped_area_topdown(struct fi
+ 			return -ENOMEM;
+ 		}
+-		if (likely(!vma || addr + len <= vma->vm_start)) {
++		if (likely(check_heap_stack_gap(vma, addr, len))) {
+ 			/*
+ 			 * Remember the place where we stopped the search:
+ 			 */
+@@ -215,7 +218,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
  		/* We do not accept a shared mapping if it would violate
  		 * cache aliasing constraints.
  		 */
@@ -3572,8 +4396,36 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch
  		    ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
  			return -EINVAL;
  		return addr;
-@@ -384,6 +388,12 @@ void arch_pick_mmap_layout(struct mm_str
- 	    current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY ||
+@@ -236,8 +239,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ 			addr = PAGE_ALIGN(addr);
+ 
+ 		vma = find_vma(mm, addr);
+-		if (task_size - len >= addr &&
+-		    (!vma || addr + len <= vma->vm_start))
++		if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
+ 			return addr;
+ 	}
+ 
+@@ -258,7 +260,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ 	/* 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(vma, addr - len, len)) {
+ 			/* remember the address as a hint for next time */
+ 			return (mm->free_area_cache = addr-len);
+ 		}
+@@ -278,7 +280,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ 		 * return with success:
+ 		 */
+ 		vma = find_vma(mm, addr);
+-		if (likely(!vma || addr+len <= vma->vm_start)) {
++		if (likely(check_heap_stack_gap(vma, addr, len))) {
+ 			/* remember the address as a hint for next time */
+ 			return (mm->free_area_cache = addr);
+ 		}
+@@ -385,6 +387,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+ 	    gap == RLIM_INFINITY ||
  	    sysctl_legacy_va_layout) {
  		mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
 +
@@ -3585,7 +4437,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch
  		mm->get_unmapped_area = arch_get_unmapped_area;
  		mm->unmap_area = arch_unmap_area;
  	} else {
-@@ -398,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_str
+@@ -397,6 +405,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
  			gap = (task_size / 6 * 5);
  
  		mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
@@ -3598,10 +4450,11 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.32.13/arch/sparc/kernel/traps_64.c linux-2.6.32.13/arch/sparc/kernel/traps_64.c
---- linux-2.6.32.13/arch/sparc/kernel/traps_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/kernel/traps_64.c	2010-05-15 13:21:13.836227385 -0400
-@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
+diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
+index 42ad2ba..3aafd82 100644
+--- a/arch/sparc/kernel/traps_64.c
++++ b/arch/sparc/kernel/traps_64.c
+@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
  
  	lvl -= 0x100;
  	if (regs->tstate & TSTATE_PRIV) {
@@ -3614,7 +4467,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/traps_64.c linux-2.6.32.13/arch/spa
  		sprintf(buffer, "Kernel bad sw trap %lx", lvl);
  		die_if_kernel(buffer, regs);
  	}
-@@ -111,11 +117,16 @@ void bad_trap(struct pt_regs *regs, long
+@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
  void bad_trap_tl1(struct pt_regs *regs, long lvl)
  {
  	char buffer[32];
@@ -3632,9 +4485,10 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/traps_64.c linux-2.6.32.13/arch/spa
  	dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
  
  	sprintf (buffer, "Bad trap %lx at tl>0", lvl);
-diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc/lib/atomic_64.S
---- linux-2.6.32.13/arch/sparc/lib/atomic_64.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/lib/atomic_64.S	2010-05-15 13:21:13.836227385 -0400
+diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
+index 0268210..f0291ca 100644
+--- a/arch/sparc/lib/atomic_64.S
++++ b/arch/sparc/lib/atomic_64.S
 @@ -18,7 +18,12 @@
  atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
  	BACKOFF_SETUP(%o2)
@@ -3649,7 +4503,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc
  	cas	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%icc, 2f
-@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = at
+@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
  2:	BACKOFF_SPIN(%o2, %o3, 1b)
  	.size	atomic_add, .-atomic_add
  
@@ -3683,7 +4537,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc
  	cas	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%icc, 2f
-@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = at
+@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
  2:	BACKOFF_SPIN(%o2, %o3, 1b)
  	.size	atomic_sub, .-atomic_sub
  
@@ -3717,7 +4571,28 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc
  	cas	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%icc, 2f
-@@ -64,7 +109,12 @@ atomic_add_ret: /* %o0 = increment, %o1 
+@@ -59,12 +104,33 @@ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
+ 2:	BACKOFF_SPIN(%o2, %o3, 1b)
+ 	.size	atomic_add_ret, .-atomic_add_ret
+ 
++	.globl	atomic_add_ret_unchecked
++	.type	atomic_add_ret_unchecked,#function
++atomic_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
++	BACKOFF_SETUP(%o2)
++1:	lduw	[%o1], %g1
++	addcc	%g1, %o0, %g7
++	cas	[%o1], %g1, %g7
++	cmp	%g1, %g7
++	bne,pn	%icc, 2f
++	 add	%g7, %o0, %g7
++	sra	%g7, 0, %o0
++	retl
++	 nop
++2:	BACKOFF_SPIN(%o2, %o3, 1b)
++	.size	atomic_add_ret_unchecked, .-atomic_add_ret_unchecked
++
+ 	.globl	atomic_sub_ret
+ 	.type	atomic_sub_ret,#function
  atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
  	BACKOFF_SETUP(%o2)
  1:	lduw	[%o1], %g1
@@ -3731,7 +4606,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc
  	cas	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%icc, 2f
-@@ -80,7 +130,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 
+@@ -80,7 +146,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
  atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
  	BACKOFF_SETUP(%o2)
  1:	ldx	[%o1], %g1
@@ -3745,7 +4620,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, 2f
-@@ -90,12 +145,32 @@ atomic64_add: /* %o0 = increment, %o1 = 
+@@ -90,12 +161,32 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
  2:	BACKOFF_SPIN(%o2, %o3, 1b)
  	.size	atomic64_add, .-atomic64_add
  
@@ -3779,7 +4654,27 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, 2f
-@@ -110,7 +185,12 @@ atomic64_sub: /* %o0 = decrement, %o1 = 
+@@ -105,12 +196,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
+ 2:	BACKOFF_SPIN(%o2, %o3, 1b)
+ 	.size	atomic64_sub, .-atomic64_sub
+ 
++	.globl	atomic64_sub_unchecked
++	.type	atomic64_sub_unchecked,#function
++atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
++	BACKOFF_SETUP(%o2)
++1:	ldx	[%o1], %g1
++	subcc	%g1, %o0, %g7
++	casx	[%o1], %g1, %g7
++	cmp	%g1, %g7
++	bne,pn	%xcc, 2f
++	 nop
++	retl
++	 nop
++2:	BACKOFF_SPIN(%o2, %o3, 1b)
++	.size	atomic64_sub_unchecked, .-atomic64_sub_unchecked
++
+ 	.globl	atomic64_add_ret
+ 	.type	atomic64_add_ret,#function
  atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
  	BACKOFF_SETUP(%o2)
  1:	ldx	[%o1], %g1
@@ -3793,7 +4688,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, 2f
-@@ -121,12 +201,33 @@ atomic64_add_ret: /* %o0 = increment, %o
+@@ -121,12 +232,33 @@ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
  2:	BACKOFF_SPIN(%o2, %o3, 1b)
  	.size	atomic64_add_ret, .-atomic64_add_ret
  
@@ -3828,10 +4723,11 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, 2f
-diff -urNp linux-2.6.32.13/arch/sparc/lib/ksyms.c linux-2.6.32.13/arch/sparc/lib/ksyms.c
---- linux-2.6.32.13/arch/sparc/lib/ksyms.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/lib/ksyms.c	2010-05-15 13:21:13.836227385 -0400
-@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write);
+diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
+index 1b30bb3..ab5bb67 100644
+--- a/arch/sparc/lib/ksyms.c
++++ b/arch/sparc/lib/ksyms.c
+@@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* Atomic counter implementation. */
  EXPORT_SYMBOL(atomic_add);
@@ -3841,10 +4737,18 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/ksyms.c linux-2.6.32.13/arch/sparc/lib
 +EXPORT_SYMBOL(atomic_sub_unchecked);
  EXPORT_SYMBOL(atomic_sub_ret);
  EXPORT_SYMBOL(atomic64_add);
++EXPORT_SYMBOL(atomic64_add_unchecked);
  EXPORT_SYMBOL(atomic64_add_ret);
-diff -urNp linux-2.6.32.13/arch/sparc/lib/rwsem_64.S linux-2.6.32.13/arch/sparc/lib/rwsem_64.S
---- linux-2.6.32.13/arch/sparc/lib/rwsem_64.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/lib/rwsem_64.S	2010-05-15 13:21:13.836227385 -0400
++EXPORT_SYMBOL(atomic64_add_ret_unchecked);
+ EXPORT_SYMBOL(atomic64_sub);
++EXPORT_SYMBOL(atomic64_sub_unchecked);
+ EXPORT_SYMBOL(atomic64_sub_ret);
+ 
+ /* Atomic bit operations. */
+diff --git a/arch/sparc/lib/rwsem_64.S b/arch/sparc/lib/rwsem_64.S
+index 91a7d29..ce75c29 100644
+--- a/arch/sparc/lib/rwsem_64.S
++++ b/arch/sparc/lib/rwsem_64.S
 @@ -11,7 +11,12 @@
  	.globl		__down_read
  __down_read:
@@ -3943,22 +4847,24 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/rwsem_64.S linux-2.6.32.13/arch/sparc/
  	cas		[%o0], %g3, %g7
  	cmp		%g3, %g7
  	bne,pn		%icc, 1b
-diff -urNp linux-2.6.32.13/arch/sparc/Makefile linux-2.6.32.13/arch/sparc/Makefile
---- linux-2.6.32.13/arch/sparc/Makefile	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/Makefile	2010-05-15 13:21:13.836227385 -0400
-@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sparc
- # Export what is needed by arch/sparc/boot/Makefile
- export VMLINUX_INIT VMLINUX_MAIN
- VMLINUX_INIT := $(head-y) $(init-y)
--VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
- VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
- VMLINUX_MAIN += $(drivers-y) $(net-y)
+diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
+index 79836a7..62f47a2 100644
+--- a/arch/sparc/mm/Makefile
++++ b/arch/sparc/mm/Makefile
+@@ -2,7 +2,7 @@
+ #
  
-diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_32.c linux-2.6.32.13/arch/sparc/mm/fault_32.c
---- linux-2.6.32.13/arch/sparc/mm/fault_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/mm/fault_32.c	2010-05-15 13:21:13.836227385 -0400
-@@ -21,6 +21,9 @@
+ asflags-y := -ansi
+-ccflags-y := -Werror
++#ccflags-y := -Werror
+ 
+ obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
+ obj-y                   += fault_$(BITS).o
+diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
+index bd86016..1417ea6 100644
+--- a/arch/sparc/mm/fault_32.c
++++ b/arch/sparc/mm/fault_32.c
+@@ -22,6 +22,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
  #include <linux/kdebug.h>
@@ -3968,7 +4874,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_32.c linux-2.6.32.13/arch/sparc/m
  
  #include <asm/system.h>
  #include <asm/page.h>
-@@ -167,6 +170,267 @@ static unsigned long compute_si_addr(str
+@@ -209,6 +212,268 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
  	return safe_compute_effective_address(regs, insn);
  }
  
@@ -4004,6 +4910,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_32.c linux-2.6.32.13/arch/sparc/m
 +{
 +	int ret;
 +
++	INIT_LIST_HEAD(&vma->anon_vma_chain);
 +	vma->vm_mm = current->mm;
 +	vma->vm_start = addr;
 +	vma->vm_end = addr + PAGE_SIZE;
@@ -4233,10 +5140,10 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_32.c linux-2.6.32.13/arch/sparc/m
 +}
 +#endif
 +
- asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
- 			       unsigned long address)
+ static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
+ 				      int text_fault)
  {
-@@ -231,6 +495,24 @@ good_area:
+@@ -282,6 +547,24 @@ good_area:
  		if(!(vma->vm_flags & VM_WRITE))
  			goto bad_area;
  	} else {
@@ -4261,10 +5168,11 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_32.c linux-2.6.32.13/arch/sparc/m
  		/* Allow reads even for write-only mappings */
  		if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
  			goto bad_area;
-diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_64.c linux-2.6.32.13/arch/sparc/mm/fault_64.c
---- linux-2.6.32.13/arch/sparc/mm/fault_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/mm/fault_64.c	2010-05-15 13:21:13.842890995 -0400
-@@ -20,6 +20,9 @@
+diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
+index f92ce56..359834d 100644
+--- a/arch/sparc/mm/fault_64.c
++++ b/arch/sparc/mm/fault_64.c
+@@ -21,6 +21,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
  #include <linux/percpu.h>
@@ -4274,7 +5182,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_64.c linux-2.6.32.13/arch/sparc/m
  
  #include <asm/page.h>
  #include <asm/pgtable.h>
-@@ -249,6 +252,456 @@ static void noinline bogus_32bit_fault_a
+@@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
  	show_regs(regs);
  }
  
@@ -4310,6 +5218,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_64.c linux-2.6.32.13/arch/sparc/m
 +{
 +	int ret;
 +
++	INIT_LIST_HEAD(&vma->anon_vma_chain);
 +	vma->vm_mm = current->mm;
 +	vma->vm_start = addr;
 +	vma->vm_end = addr + PAGE_SIZE;
@@ -4731,7 +5640,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_64.c linux-2.6.32.13/arch/sparc/m
  asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
  {
  	struct mm_struct *mm = current->mm;
-@@ -315,6 +768,29 @@ asmlinkage void __kprobes do_sparc64_fau
+@@ -340,6 +794,29 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
  	if (!vma)
  		goto bad_area;
  
@@ -4761,10 +5670,52 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_64.c linux-2.6.32.13/arch/sparc/m
  	/* Pure DTLB misses do not tell us whether the fault causing
  	 * load/store/atomic was a write or not, it only says that there
  	 * was no match.  So in such a case we (carefully) read the
-diff -urNp linux-2.6.32.13/arch/sparc/mm/init_32.c linux-2.6.32.13/arch/sparc/mm/init_32.c
---- linux-2.6.32.13/arch/sparc/mm/init_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/mm/init_32.c	2010-05-15 13:21:13.842890995 -0400
-@@ -317,6 +317,9 @@ extern void device_scan(void);
+diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
+index 5fdddf1..bfa67f0 100644
+--- a/arch/sparc/mm/hugetlbpage.c
++++ b/arch/sparc/mm/hugetlbpage.c
+@@ -68,7 +68,7 @@ full_search:
+ 			}
+ 			return -ENOMEM;
+ 		}
+-		if (likely(!vma || addr + len <= vma->vm_start)) {
++		if (likely(check_heap_stack_gap(vma, addr, len))) {
+ 			/*
+ 			 * Remember the place where we stopped the search:
+ 			 */
+@@ -107,7 +107,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ 	/* 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(vma, addr - len, len)) {
+ 			/* remember the address as a hint for next time */
+ 			return (mm->free_area_cache = addr-len);
+ 		}
+@@ -125,7 +125,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ 		 * return with success:
+ 		 */
+ 		vma = find_vma(mm, addr);
+-		if (likely(!vma || addr+len <= vma->vm_start)) {
++		if (likely(check_heap_stack_gap(vma, addr, len))) {
+ 			/* remember the address as a hint for next time */
+ 			return (mm->free_area_cache = addr);
+ 		}
+@@ -182,8 +182,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+ 	if (addr) {
+ 		addr = ALIGN(addr, HPAGE_SIZE);
+ 		vma = find_vma(mm, addr);
+-		if (task_size - len >= addr &&
+-		    (!vma || addr + len <= vma->vm_start))
++		if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
+ 			return addr;
+ 	}
+ 	if (mm->get_unmapped_area == arch_get_unmapped_area)
+diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
+index 6d0e02c..c0b5fa7 100644
+--- a/arch/sparc/mm/init_32.c
++++ b/arch/sparc/mm/init_32.c
+@@ -318,6 +318,9 @@ extern void device_scan(void);
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
  
@@ -4774,7 +5725,7 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/init_32.c linux-2.6.32.13/arch/sparc/mm
  void __init paging_init(void)
  {
  	switch(sparc_cpu_model) {
-@@ -345,17 +348,17 @@ void __init paging_init(void)
+@@ -346,17 +349,17 @@ void __init paging_init(void)
  
  	/* Initialize the protection map with non-constant, MMU dependent values. */
  	protection_map[0] = PAGE_NONE;
@@ -4798,22 +5749,11 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/init_32.c linux-2.6.32.13/arch/sparc/mm
  	protection_map[12] = PAGE_READONLY;
  	protection_map[13] = PAGE_READONLY;
  	protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.32.13/arch/sparc/mm/Makefile linux-2.6.32.13/arch/sparc/mm/Makefile
---- linux-2.6.32.13/arch/sparc/mm/Makefile	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/mm/Makefile	2010-05-15 13:21:13.842890995 -0400
-@@ -2,7 +2,7 @@
- #
- 
- asflags-y := -ansi
--ccflags-y := -Werror
-+#ccflags-y := -Werror
- 
- obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
- obj-y                   += fault_$(BITS).o
-diff -urNp linux-2.6.32.13/arch/sparc/mm/srmmu.c linux-2.6.32.13/arch/sparc/mm/srmmu.c
---- linux-2.6.32.13/arch/sparc/mm/srmmu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/sparc/mm/srmmu.c	2010-05-15 13:21:13.854885513 -0400
-@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
+diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
+index b0b43aa..22982cd 100644
+--- a/arch/sparc/mm/srmmu.c
++++ b/arch/sparc/mm/srmmu.c
+@@ -2198,6 +2198,13 @@ void __init ld_mmu_srmmu(void)
  	PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
  	BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
  	BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY));
@@ -4827,9 +5767,10 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/srmmu.c linux-2.6.32.13/arch/sparc/mm/s
  	BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
  	page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  
-diff -urNp linux-2.6.32.13/arch/um/include/asm/kmap_types.h linux-2.6.32.13/arch/um/include/asm/kmap_types.h
---- linux-2.6.32.13/arch/um/include/asm/kmap_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/um/include/asm/kmap_types.h	2010-05-15 13:21:13.854885513 -0400
+diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
+index 6c03acd..a5e0215 100644
+--- a/arch/um/include/asm/kmap_types.h
++++ b/arch/um/include/asm/kmap_types.h
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -4838,9 +5779,10 @@ diff -urNp linux-2.6.32.13/arch/um/include/asm/kmap_types.h linux-2.6.32.13/arch
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.13/arch/um/include/asm/page.h linux-2.6.32.13/arch/um/include/asm/page.h
---- linux-2.6.32.13/arch/um/include/asm/page.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/um/include/asm/page.h	2010-05-15 13:21:13.854885513 -0400
+diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
+index 4cc9b6c..02e5029 100644
+--- a/arch/um/include/asm/page.h
++++ b/arch/um/include/asm/page.h
 @@ -14,6 +14,9 @@
  #define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)
  #define PAGE_MASK	(~(PAGE_SIZE-1))
@@ -4851,9 +5793,10 @@ diff -urNp linux-2.6.32.13/arch/um/include/asm/page.h linux-2.6.32.13/arch/um/in
  #ifndef __ASSEMBLY__
  
  struct page;
-diff -urNp linux-2.6.32.13/arch/um/sys-i386/syscalls.c linux-2.6.32.13/arch/um/sys-i386/syscalls.c
---- linux-2.6.32.13/arch/um/sys-i386/syscalls.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/um/sys-i386/syscalls.c	2010-05-15 13:21:13.862896966 -0400
+diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c
+index 70ca357..728d1cc 100644
+--- a/arch/um/sys-i386/syscalls.c
++++ b/arch/um/sys-i386/syscalls.c
 @@ -11,6 +11,21 @@
  #include "asm/uaccess.h"
  #include "asm/unistd.h"
@@ -4874,12 +5817,142 @@ diff -urNp linux-2.6.32.13/arch/um/sys-i386/syscalls.c linux-2.6.32.13/arch/um/s
 +}
 +
  /*
-  * Perform the select(nd, in, out, ex, tv) and mmap() system
-  * calls. Linux/i386 didn't use to be able to handle more than
-diff -urNp linux-2.6.32.13/arch/x86/boot/bitops.h linux-2.6.32.13/arch/x86/boot/bitops.h
---- linux-2.6.32.13/arch/x86/boot/bitops.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/boot/bitops.h	2010-05-15 13:21:13.862896966 -0400
-@@ -26,7 +26,7 @@ static inline int variable_test_bit(int 
+  * The prototype on i386 is:
+  *
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index f942bb7..d2fc06f 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -1038,7 +1038,7 @@ choice
+ 
+ config NOHIGHMEM
+ 	bool "off"
+-	depends on !X86_NUMAQ
++	depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
+ 	---help---
+ 	  Linux can use up to 64 Gigabytes of physical memory on x86 systems.
+ 	  However, the address space of 32-bit x86 processors is only 4
+@@ -1075,7 +1075,7 @@ config NOHIGHMEM
+ 
+ config HIGHMEM4G
+ 	bool "4GB"
+-	depends on !X86_NUMAQ
++	depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
+ 	---help---
+ 	  Select this if you have a 32-bit processor and between 1 and 4
+ 	  gigabytes of physical RAM.
+@@ -1129,7 +1129,7 @@ config PAGE_OFFSET
+ 	hex
+ 	default 0xB0000000 if VMSPLIT_3G_OPT
+ 	default 0x80000000 if VMSPLIT_2G
+-	default 0x78000000 if VMSPLIT_2G_OPT
++	default 0x70000000 if VMSPLIT_2G_OPT
+ 	default 0x40000000 if VMSPLIT_1G
+ 	default 0xC0000000
+ 	depends on X86_32
+@@ -1461,7 +1461,7 @@ config ARCH_USES_PG_UNCACHED
+ 
+ config EFI
+ 	bool "EFI runtime service support"
+-	depends on ACPI
++	depends on ACPI && !PAX_KERNEXEC
+ 	---help---
+ 	  This enables the kernel to use EFI runtime services that are
+ 	  available (such as the EFI variable services).
+@@ -1548,6 +1548,7 @@ config KEXEC_JUMP
+ config PHYSICAL_START
+ 	hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
+ 	default "0x1000000"
++	range 0x400000 0x40000000
+ 	---help---
+ 	  This gives the physical address where the kernel is loaded.
+ 
+@@ -1611,6 +1612,7 @@ config X86_NEED_RELOCS
+ config PHYSICAL_ALIGN
+ 	hex "Alignment value to which kernel should be aligned" if X86_32
+ 	default "0x1000000"
++	range 0x400000 0x1000000 if PAX_KERNEXEC
+ 	range 0x2000 0x1000000
+ 	---help---
+ 	  This value puts the alignment restrictions on physical address
+@@ -1642,9 +1644,10 @@ config HOTPLUG_CPU
+ 	  Say N if you want to disable CPU hotplug.
+ 
+ config COMPAT_VDSO
+-	def_bool y
++	def_bool n
+ 	prompt "Compat VDSO support"
+ 	depends on X86_32 || IA32_EMULATION
++	depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
+ 	---help---
+ 	  Map the 32-bit VDSO to the predictable old-style address too.
+ 
+diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
+index 2ac9069..483cbad 100644
+--- a/arch/x86/Kconfig.cpu
++++ b/arch/x86/Kconfig.cpu
+@@ -336,7 +336,7 @@ config X86_PPRO_FENCE
+ 
+ config X86_F00F_BUG
+ 	def_bool y
+-	depends on M586MMX || M586TSC || M586 || M486 || M386
++	depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
+ 
+ config X86_INVD_BUG
+ 	def_bool y
+@@ -360,7 +360,7 @@ config X86_POPAD_OK
+ 
+ config X86_ALIGNMENT_16
+ 	def_bool y
+-	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
++	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
+ 
+ config X86_INTEL_USERCOPY
+ 	def_bool y
+@@ -406,7 +406,7 @@ config X86_CMPXCHG64
+ # generates cmov.
+ config X86_CMOV
+ 	def_bool y
+-	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
++	depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
+ 
+ config X86_MINIMUM_CPU_FAMILY
+ 	int
+diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
+index 7508508..2c53b5e 100644
+--- a/arch/x86/Kconfig.debug
++++ b/arch/x86/Kconfig.debug
+@@ -97,7 +97,7 @@ config X86_PTDUMP
+ config DEBUG_RODATA
+ 	bool "Write protect kernel read-only data structures"
+ 	default y
+-	depends on DEBUG_KERNEL
++	depends on DEBUG_KERNEL && BROKEN
+ 	---help---
+ 	  Mark the kernel read-only data as write-protected in the pagetables,
+ 	  in order to catch accidental (and incorrect) writes to such const
+diff --git a/arch/x86/Makefile b/arch/x86/Makefile
+index 8aa1b59..4094bef 100644
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -191,3 +191,12 @@ define archhelp
+   echo  '                  FDARGS="..."  arguments for the booted kernel'
+   echo  '                  FDINITRD=file initrd for the booted kernel'
+ endef
++
++define OLD_LD
++
++*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
++*** Please upgrade your binutils to 2.18 or newer
++endef
++
++archprepare:
++	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
+diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
+index 878e4b9..20537ab 100644
+--- a/arch/x86/boot/bitops.h
++++ b/arch/x86/boot/bitops.h
+@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
  	u8 v;
  	const u32 *p = (const u32 *)addr;
  
@@ -4888,7 +5961,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/bitops.h linux-2.6.32.13/arch/x86/boot/
  	return v;
  }
  
-@@ -37,7 +37,7 @@ static inline int variable_test_bit(int 
+@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
  
  static inline void set_bit(int nr, void *addr)
  {
@@ -4897,9 +5970,10 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/bitops.h linux-2.6.32.13/arch/x86/boot/
  }
  
  #endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.32.13/arch/x86/boot/boot.h linux-2.6.32.13/arch/x86/boot/boot.h
---- linux-2.6.32.13/arch/x86/boot/boot.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/boot/boot.h	2010-05-15 13:21:13.862896966 -0400
+diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
+index 98239d2..f40214c 100644
+--- a/arch/x86/boot/boot.h
++++ b/arch/x86/boot/boot.h
 @@ -82,7 +82,7 @@ static inline void io_delay(void)
  static inline u16 ds(void)
  {
@@ -4909,7 +5983,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/boot.h linux-2.6.32.13/arch/x86/boot/bo
  	return seg;
  }
  
-@@ -178,7 +178,7 @@ static inline void wrgs32(u32 v, addr_t 
+@@ -178,7 +178,7 @@ static inline void wrgs32(u32 v, addr_t addr)
  static inline int memcmp(const void *s1, const void *s2, size_t len)
  {
  	u8 diff;
@@ -4918,9 +5992,10 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/boot.h linux-2.6.32.13/arch/x86/boot/bo
  	    : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
  	return diff;
  }
-diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_32.S linux-2.6.32.13/arch/x86/boot/compressed/head_32.S
---- linux-2.6.32.13/arch/x86/boot/compressed/head_32.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/boot/compressed/head_32.S	2010-05-15 13:21:13.862896966 -0400
+diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
+index f543b70..b60fba8 100644
+--- a/arch/x86/boot/compressed/head_32.S
++++ b/arch/x86/boot/compressed/head_32.S
 @@ -76,7 +76,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl    %eax, %ebx
@@ -4949,9 +6024,10 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_32.S linux-2.6.32.13/ar
  	addl	%ebx, -__PAGE_OFFSET(%ebx, %ecx)
  	jmp	1b
  2:
-diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_64.S linux-2.6.32.13/arch/x86/boot/compressed/head_64.S
---- linux-2.6.32.13/arch/x86/boot/compressed/head_64.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/boot/compressed/head_64.S	2010-05-15 13:21:13.862896966 -0400
+diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
+index faff0dc..f859ead 100644
+--- a/arch/x86/boot/compressed/head_64.S
++++ b/arch/x86/boot/compressed/head_64.S
 @@ -91,7 +91,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl	%eax, %ebx
@@ -4961,7 +6037,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_64.S linux-2.6.32.13/ar
  #endif
  
  	/* Target address to relocate to for decompression */
-@@ -234,7 +234,7 @@ ENTRY(startup_64)
+@@ -233,7 +233,7 @@ ENTRY(startup_64)
  	notq	%rax
  	andq	%rax, %rbp
  #else
@@ -4970,10 +6046,11 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_64.S linux-2.6.32.13/ar
  #endif
  
  	/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/misc.c linux-2.6.32.13/arch/x86/boot/compressed/misc.c
---- linux-2.6.32.13/arch/x86/boot/compressed/misc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/boot/compressed/misc.c	2010-05-15 13:21:13.866567010 -0400
-@@ -288,7 +288,7 @@ static void parse_elf(void *output)
+diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
+index 51e2407..c05c3f6 100644
+--- a/arch/x86/boot/compressed/misc.c
++++ b/arch/x86/boot/compressed/misc.c
+@@ -285,7 +285,7 @@ static void parse_elf(void *output)
  		case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
  			dest = output;
@@ -4982,7 +6059,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/misc.c linux-2.6.32.13/arch/
  #else
  			dest = (void *)(phdr->p_paddr);
  #endif
-@@ -335,7 +335,7 @@ asmlinkage void decompress_kernel(void *
+@@ -332,7 +332,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
  		error("Destination address too large");
  #endif
  #ifndef CONFIG_RELOCATABLE
@@ -4991,9 +6068,10 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/misc.c linux-2.6.32.13/arch/
  		error("Wrong destination address");
  #endif
  
-diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c	2010-05-15 13:21:13.866567010 -0400
+diff --git a/arch/x86/boot/compressed/mkpiggy.c b/arch/x86/boot/compressed/mkpiggy.c
+index 5c22812..1138426 100644
+--- a/arch/x86/boot/compressed/mkpiggy.c
++++ b/arch/x86/boot/compressed/mkpiggy.c
 @@ -74,7 +74,7 @@ int main(int argc, char *argv[])
  
  	offs = (olen > ilen) ? olen - ilen : 0;
@@ -5002,15 +6080,16 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.13/ar
 +	offs += 64*1024;	/* Add 64K bytes slack */
  	offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
  
- 	printf(".section \".rodata.compressed\",\"a\",@progbits\n");
-diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arch/x86/boot/compressed/relocs.c
---- linux-2.6.32.13/arch/x86/boot/compressed/relocs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/boot/compressed/relocs.c	2010-05-15 13:21:13.866567010 -0400
-@@ -10,8 +10,11 @@
- #define USE_BSD
- #include <endian.h>
+ 	printf(".section \".rodata..compressed\",\"a\",@progbits\n");
+diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
+index 89bbf4e..869908e 100644
+--- a/arch/x86/boot/compressed/relocs.c
++++ b/arch/x86/boot/compressed/relocs.c
+@@ -13,8 +13,11 @@
  
-+#include "../../../../include/linux/autoconf.h"
+ static void die(char *fmt, ...);
+ 
++#include "../../../../include/generated/autoconf.h"
 +
  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  static Elf32_Ehdr ehdr;
@@ -5018,16 +6097,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc
  static unsigned long reloc_count, reloc_idx;
  static unsigned long *relocs;
  
-@@ -37,7 +40,7 @@ static const char* safe_abs_relocs[] = {
- 
- static int is_safe_abs_reloc(const char* sym_name)
- {
--	int i;
-+	unsigned int i;
- 
- 	for (i = 0; i < ARRAY_SIZE(safe_abs_relocs); i++) {
- 		if (!strcmp(sym_name, safe_abs_relocs[i]))
-@@ -245,9 +248,39 @@ static void read_ehdr(FILE *fp)
+@@ -270,9 +273,39 @@ static void read_ehdr(FILE *fp)
  	}
  }
  
@@ -5068,7 +6138,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc
  	Elf32_Shdr shdr;
  
  	secs = calloc(ehdr.e_shnum, sizeof(struct section));
-@@ -282,7 +315,7 @@ static void read_shdrs(FILE *fp)
+@@ -307,7 +340,7 @@ static void read_shdrs(FILE *fp)
  
  static void read_strtabs(FILE *fp)
  {
@@ -5077,7 +6147,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc
  	for (i = 0; i < ehdr.e_shnum; i++) {
  		struct section *sec = &secs[i];
  		if (sec->shdr.sh_type != SHT_STRTAB) {
-@@ -307,7 +340,7 @@ static void read_strtabs(FILE *fp)
+@@ -332,7 +365,7 @@ static void read_strtabs(FILE *fp)
  
  static void read_symtabs(FILE *fp)
  {
@@ -5086,7 +6156,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc
  	for (i = 0; i < ehdr.e_shnum; i++) {
  		struct section *sec = &secs[i];
  		if (sec->shdr.sh_type != SHT_SYMTAB) {
-@@ -340,7 +373,9 @@ static void read_symtabs(FILE *fp)
+@@ -365,7 +398,9 @@ static void read_symtabs(FILE *fp)
  
  static void read_relocs(FILE *fp)
  {
@@ -5097,7 +6167,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc
  	for (i = 0; i < ehdr.e_shnum; i++) {
  		struct section *sec = &secs[i];
  		if (sec->shdr.sh_type != SHT_REL) {
-@@ -360,9 +395,18 @@ static void read_relocs(FILE *fp)
+@@ -385,9 +420,18 @@ static void read_relocs(FILE *fp)
  			die("Cannot read symbol table: %s\n",
  				strerror(errno));
  		}
@@ -5117,7 +6187,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc
  			rel->r_info   = elf32_to_cpu(rel->r_info);
  		}
  	}
-@@ -371,14 +415,14 @@ static void read_relocs(FILE *fp)
+@@ -396,14 +440,14 @@ static void read_relocs(FILE *fp)
  
  static void print_absolute_symbols(void)
  {
@@ -5134,7 +6204,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc
  
  		if (sec->shdr.sh_type != SHT_SYMTAB) {
  			continue;
-@@ -406,14 +450,14 @@ static void print_absolute_symbols(void)
+@@ -431,14 +475,14 @@ static void print_absolute_symbols(void)
  
  static void print_absolute_relocs(void)
  {
@@ -5151,7 +6221,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc
  		if (sec->shdr.sh_type != SHT_REL) {
  			continue;
  		}
-@@ -474,13 +518,13 @@ static void print_absolute_relocs(void)
+@@ -499,13 +543,13 @@ static void print_absolute_relocs(void)
  
  static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
  {
@@ -5167,17 +6237,17 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc
  		struct section *sec = &secs[i];
  
  		if (sec->shdr.sh_type != SHT_REL) {
-@@ -504,6 +548,21 @@ static void walk_relocs(void (*visit)(El
- 			if (sym->st_shndx == SHN_ABS) {
+@@ -530,6 +574,22 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
+ 			    !is_rel_reloc(sym_name(sym_strtab, sym))) {
  				continue;
  			}
 +			/* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
-+			if (!strcmp(sec_name(sym->st_shndx), ".data.percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
++			if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
 +				continue;
 +
 +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
 +			/* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
-+			if (!strcmp(sec_name(sym->st_shndx), ".data") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
++			if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
 +				continue;
 +			if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
 +				continue;
@@ -5186,10 +6256,11 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc
 +			if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
 +				continue;
 +#endif
- 			if (r_type == R_386_NONE || r_type == R_386_PC32) {
- 				/*
- 				 * NONE can be ignored and and PC relative
-@@ -541,7 +600,7 @@ static int cmp_relocs(const void *va, co
++
+ 			switch (r_type) {
+ 			case R_386_NONE:
+ 			case R_386_PC32:
+@@ -571,7 +631,7 @@ static int cmp_relocs(const void *va, const void *vb)
  
  static void emit_relocs(int as_text)
  {
@@ -5198,7 +6269,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc
  	/* Count how many relocations I have and allocate space for them. */
  	reloc_count = 0;
  	walk_relocs(count_reloc);
-@@ -634,6 +693,7 @@ int main(int argc, char **argv)
+@@ -665,6 +725,7 @@ int main(int argc, char **argv)
  			fname, strerror(errno));
  	}
  	read_ehdr(fp);
@@ -5206,9 +6277,10 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc
  	read_shdrs(fp);
  	read_strtabs(fp);
  	read_symtabs(fp);
-diff -urNp linux-2.6.32.13/arch/x86/boot/cpucheck.c linux-2.6.32.13/arch/x86/boot/cpucheck.c
---- linux-2.6.32.13/arch/x86/boot/cpucheck.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/boot/cpucheck.c	2010-05-15 13:21:13.878594921 -0400
+diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
+index 4d3ff03..e4972ff 100644
+--- a/arch/x86/boot/cpucheck.c
++++ b/arch/x86/boot/cpucheck.c
 @@ -74,7 +74,7 @@ static int has_fpu(void)
  	u16 fcw = -1, fsw = -1;
  	u32 cr0;
@@ -5263,7 +6335,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/cpucheck.c linux-2.6.32.13/arch/x86/boo
  			    : "+a" (eax),
  			      "=c" (cpu.flags[6]),
  			      "=d" (cpu.flags[1])
-@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *r
+@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
  		u32 ecx = MSR_K7_HWCR;
  		u32 eax, edx;
  
@@ -5275,7 +6347,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/cpucheck.c linux-2.6.32.13/arch/x86/boo
  
  		get_flags();	/* Make sure it really did something */
  		err = check_flags();
-@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *r
+@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
  		u32 ecx = MSR_VIA_FCR;
  		u32 eax, edx;
  
@@ -5287,7 +6359,7 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/cpucheck.c linux-2.6.32.13/arch/x86/boo
  
  		set_bit(X86_FEATURE_CX8, cpu.flags);
  		err = check_flags();
-@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *r
+@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
  		u32 eax, edx;
  		u32 level = 1;
  
@@ -5304,10 +6376,11 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/cpucheck.c linux-2.6.32.13/arch/x86/boo
  
  		err = check_flags();
  	}
-diff -urNp linux-2.6.32.13/arch/x86/boot/header.S linux-2.6.32.13/arch/x86/boot/header.S
---- linux-2.6.32.13/arch/x86/boot/header.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/boot/header.S	2010-05-15 13:21:13.878594921 -0400
-@@ -224,7 +224,7 @@ setup_data:		.quad 0			# 64-bit physical
+diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
+index 93e689f..504ba09 100644
+--- a/arch/x86/boot/header.S
++++ b/arch/x86/boot/header.S
+@@ -224,7 +224,7 @@ setup_data:		.quad 0			# 64-bit physical pointer to
  						# single linked list of
  						# struct setup_data
  
@@ -5316,9 +6389,10 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/header.S linux-2.6.32.13/arch/x86/boot/
  
  #define ZO_INIT_SIZE	(ZO__end - ZO_startup_32 + ZO_z_extract_offset)
  #define VO_INIT_SIZE	(VO__end - VO__text)
-diff -urNp linux-2.6.32.13/arch/x86/boot/memory.c linux-2.6.32.13/arch/x86/boot/memory.c
---- linux-2.6.32.13/arch/x86/boot/memory.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/boot/memory.c	2010-05-15 13:21:13.878594921 -0400
+diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
+index cae3feb..ff8ff2a 100644
+--- a/arch/x86/boot/memory.c
++++ b/arch/x86/boot/memory.c
 @@ -19,7 +19,7 @@
  
  static int detect_memory_e820(void)
@@ -5328,10 +6402,23 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/memory.c linux-2.6.32.13/arch/x86/boot/
  	struct biosregs ireg, oreg;
  	struct e820entry *desc = boot_params.e820_map;
  	static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-2.6.32.13/arch/x86/boot/video.c linux-2.6.32.13/arch/x86/boot/video.c
---- linux-2.6.32.13/arch/x86/boot/video.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/boot/video.c	2010-05-15 13:21:13.878594921 -0400
-@@ -90,7 +90,7 @@ static void store_mode_params(void)
+diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
+index 11e8c6e..fdbb1ed 100644
+--- a/arch/x86/boot/video-vesa.c
++++ b/arch/x86/boot/video-vesa.c
+@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
+ 
+ 	boot_params.screen_info.vesapm_seg = oreg.es;
+ 	boot_params.screen_info.vesapm_off = oreg.di;
++	boot_params.screen_info.vesapm_size = oreg.cx;
+ }
+ 
+ /*
+diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
+index 43eda28..5ab5fdb 100644
+--- a/arch/x86/boot/video.c
++++ b/arch/x86/boot/video.c
+@@ -96,7 +96,7 @@ static void store_mode_params(void)
  static unsigned int get_entry(void)
  {
  	char entry_buf[4];
@@ -5340,20 +6427,72 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/video.c linux-2.6.32.13/arch/x86/boot/v
  	int key;
  	unsigned int v;
  
-diff -urNp linux-2.6.32.13/arch/x86/boot/video-vesa.c linux-2.6.32.13/arch/x86/boot/video-vesa.c
---- linux-2.6.32.13/arch/x86/boot/video-vesa.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/boot/video-vesa.c	2010-05-15 13:21:13.878594921 -0400
-@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
+diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
+index 0350311..a2de328 100644
+--- a/arch/x86/ia32/ia32_aout.c
++++ b/arch/x86/ia32/ia32_aout.c
+@@ -168,6 +168,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
+ 	unsigned long dump_start, dump_size;
+ 	struct user32 dump;
  
- 	boot_params.screen_info.vesapm_seg = oreg.es;
- 	boot_params.screen_info.vesapm_off = oreg.di;
-+	boot_params.screen_info.vesapm_size = oreg.cx;
++	memset(&dump, 0, sizeof(dump));
++
+ 	fs = get_fs();
+ 	set_fs(KERNEL_DS);
+ 	has_dumped = 1;
+@@ -217,12 +219,6 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
+ 		dump_size = dump.u_ssize << PAGE_SHIFT;
+ 		DUMP_WRITE(dump_start, dump_size);
+ 	}
+-	/*
+-	 * Finally dump the task struct.  Not be used by gdb, but
+-	 * could be useful
+-	 */
+-	set_fs(KERNEL_DS);
+-	DUMP_WRITE(current, sizeof(*current));
+ end_coredump:
+ 	set_fs(fs);
+ 	return has_dumped;
+diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
+index 588a7aa..d49dacb 100644
+--- a/arch/x86/ia32/ia32_signal.c
++++ b/arch/x86/ia32/ia32_signal.c
+@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
+ 	sp -= frame_size;
+ 	/* Align the stack pointer according to the i386 ABI,
+ 	 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
+-	sp = ((sp + 4) & -16ul) - 4;
++	sp = ((sp - 12) & -16ul) - 4;
+ 	return (void __user *) sp;
  }
  
- /*
-diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia32/ia32entry.S
---- linux-2.6.32.13/arch/x86/ia32/ia32entry.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/ia32/ia32entry.S	2010-05-15 13:21:13.878594921 -0400
+@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+ 		0xb8,
+ 		__NR_ia32_rt_sigreturn,
+ 		0x80cd,
+-		0,
++		0
+ 	};
+ 
+ 	frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
+@@ -533,9 +533,11 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+ 
+ 		if (ka->sa.sa_flags & SA_RESTORER)
+ 			restorer = ka->sa.sa_restorer;
++		else if (current->mm->context.vdso)
++			/* Return stub is in 32bit vsyscall page */
++			restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
+ 		else
+-			restorer = VDSO32_SYMBOL(current->mm->context.vdso,
+-						 rt_sigreturn);
++			restorer = &frame->retcode;
+ 		put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
+ 
+ 		/*
+diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
+index 4f5f71e..392161a 100644
+--- a/arch/x86/ia32/ia32entry.S
++++ b/arch/x86/ia32/ia32entry.S
 @@ -13,6 +13,7 @@
  #include <asm/thread_info.h>	
  #include <asm/segment.h>
@@ -5362,7 +6501,7 @@ diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia
  #include <linux/linkage.h>
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
-@@ -114,6 +115,11 @@ ENTRY(ia32_sysenter_target)
+@@ -120,6 +121,11 @@ ENTRY(ia32_sysenter_target)
  	SWAPGS_UNSAFE_STACK
  	movq	PER_CPU_VAR(kernel_stack), %rsp
  	addq	$(KERNEL_STACK_OFFSET),%rsp
@@ -5374,7 +6513,7 @@ diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia
  	/*
  	 * No need to follow this irqs on/off section: the syscall
  	 * disabled irqs, here we enable it straight after entry:
-@@ -144,6 +150,12 @@ ENTRY(ia32_sysenter_target)
+@@ -150,6 +156,12 @@ ENTRY(ia32_sysenter_target)
  	SAVE_ARGS 0,0,1
   	/* no need to do an access_ok check here because rbp has been
   	   32bit zero extended */ 
@@ -5387,7 +6526,7 @@ diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia
  1:	movl	(%rbp),%ebp
   	.section __ex_table,"a"
   	.quad 1b,ia32_badarg
-@@ -166,6 +178,11 @@ sysenter_dispatch:
+@@ -172,6 +184,11 @@ sysenter_dispatch:
  	testl	$_TIF_ALLWORK_MASK,TI_flags(%r10)
  	jnz	sysexit_audit
  sysexit_from_sys_call:
@@ -5399,7 +6538,7 @@ diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia
  	andl    $~TS_COMPAT,TI_status(%r10)
  	/* clear IF, that popfq doesn't enable interrupts early */
  	andl  $~0x200,EFLAGS-R11(%rsp) 
-@@ -284,6 +301,11 @@ ENTRY(ia32_cstar_target)
+@@ -290,6 +307,11 @@ ENTRY(ia32_cstar_target)
  	movl	%esp,%r8d
  	CFI_REGISTER	rsp,r8
  	movq	PER_CPU_VAR(kernel_stack),%rsp
@@ -5411,7 +6550,7 @@ diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia
  	/*
  	 * No need to follow this irqs on/off section: the syscall
  	 * disabled irqs and here we enable it straight after entry:
-@@ -305,6 +327,12 @@ ENTRY(ia32_cstar_target)
+@@ -311,6 +333,12 @@ ENTRY(ia32_cstar_target)
  	/* no need to do an access_ok check here because r8 has been
  	   32bit zero extended */ 
  	/* hardware stack frame is complete now */	
@@ -5424,7 +6563,7 @@ diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia
  1:	movl	(%r8),%r9d
  	.section __ex_table,"a"
  	.quad 1b,ia32_badarg
-@@ -327,6 +355,11 @@ cstar_dispatch:
+@@ -333,6 +361,11 @@ cstar_dispatch:
  	testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
  	jnz sysretl_audit
  sysretl_from_sys_call:
@@ -5436,7 +6575,7 @@ diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia
  	andl $~TS_COMPAT,TI_status(%r10)
  	RESTORE_ARGS 1,-ARG_SKIP,1,1,1
  	movl RIP-ARGOFFSET(%rsp),%ecx
-@@ -409,6 +442,11 @@ ENTRY(ia32_syscall)
+@@ -415,6 +448,11 @@ ENTRY(ia32_syscall)
  	CFI_REL_OFFSET	rip,RIP-RIP
  	PARAVIRT_ADJUST_EXCEPTION_FRAME
  	SWAPGS
@@ -5448,43 +6587,24 @@ diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia
  	/*
  	 * No need to follow this irqs on/off section: the syscall
  	 * disabled irqs and here we enable it straight after entry:
-diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32_signal.c linux-2.6.32.13/arch/x86/ia32/ia32_signal.c
---- linux-2.6.32.13/arch/x86/ia32/ia32_signal.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/ia32/ia32_signal.c	2010-05-15 13:21:13.878594921 -0400
-@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 
- 	sp -= frame_size;
- 	/* Align the stack pointer according to the i386 ABI,
- 	 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
--	sp = ((sp + 4) & -16ul) - 4;
-+	sp = ((sp - 12) & -16ul) - 4;
- 	return (void __user *) sp;
- }
- 
-@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct 
- 		0xb8,
- 		__NR_ia32_rt_sigreturn,
- 		0x80cd,
--		0,
-+		0
- 	};
- 
- 	frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/alternative.h linux-2.6.32.13/arch/x86/include/asm/alternative.h
---- linux-2.6.32.13/arch/x86/include/asm/alternative.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/alternative.h	2010-05-15 13:21:13.878594921 -0400
-@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
-       "	 .byte 662b-661b\n"			/* sourcelen       */	\
+diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
+index 03b6bb5..ed0fb81 100644
+--- a/arch/x86/include/asm/alternative.h
++++ b/arch/x86/include/asm/alternative.h
+@@ -91,7 +91,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
        "	 .byte 664f-663f\n"			/* replacementlen  */	\
+       "	 .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */	\
        ".previous\n"							\
 -      ".section .altinstr_replacement, \"ax\"\n"			\
 +      ".section .altinstr_replacement, \"a\"\n"			\
        "663:\n\t" newinstr "\n664:\n"		/* replacement     */	\
        ".previous"
  
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/apm.h linux-2.6.32.13/arch/x86/include/asm/apm.h
---- linux-2.6.32.13/arch/x86/include/asm/apm.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/apm.h	2010-05-15 13:21:13.878594921 -0400
-@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
+diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
+index 20370c6..a2eb9b0 100644
+--- a/arch/x86/include/asm/apm.h
++++ b/arch/x86/include/asm/apm.h
+@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
  	__asm__ __volatile__(APM_DO_ZERO_SEGS
  		"pushl %%edi\n\t"
  		"pushl %%ebp\n\t"
@@ -5493,7 +6613,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/apm.h linux-2.6.32.13/arch/x86/i
  		"setc %%al\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_as
+@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
  	__asm__ __volatile__(APM_DO_ZERO_SEGS
  		"pushl %%edi\n\t"
  		"pushl %%ebp\n\t"
@@ -5502,10 +6622,28 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/apm.h linux-2.6.32.13/arch/x86/i
  		"setc %%bl\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch/x86/include/asm/atomic_32.h
---- linux-2.6.32.13/arch/x86/include/asm/atomic_32.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/atomic_32.h	2010-05-15 13:21:13.878594921 -0400
-@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
+diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
+index b3ed1e1..6b18beb 100644
+--- a/arch/x86/include/asm/asm.h
++++ b/arch/x86/include/asm/asm.h
+@@ -37,6 +37,12 @@
+ #define _ASM_SI		__ASM_REG(si)
+ #define _ASM_DI		__ASM_REG(di)
+ 
++#ifdef CONFIG_X86_32
++#define _ASM_INTO	"into"
++#else
++#define _ASM_INTO	"int $4"
++#endif
++
+ /* Exception table entry */
+ #ifdef __ASSEMBLY__
+ # define _ASM_EXTABLE(from,to)	    \
+diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
+index 952a826..c4830ea 100644
+--- a/arch/x86/include/asm/atomic.h
++++ b/arch/x86/include/asm/atomic.h
+@@ -26,6 +26,17 @@ static inline int atomic_read(const atomic_t *v)
  }
  
  /**
@@ -5523,7 +6661,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
   * atomic_set - set atomic variable
   * @v: pointer of type atomic_t
   * @i: required value
-@@ -37,6 +48,18 @@ static inline void atomic_set(atomic_t *
+@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
  }
  
  /**
@@ -5542,7 +6680,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
   * atomic_add - add integer to atomic variable
   * @i: integer value to add
   * @v: pointer of type atomic_t
-@@ -45,7 +68,29 @@ static inline void atomic_set(atomic_t *
+@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
   */
  static inline void atomic_add(int i, atomic_t *v)
  {
@@ -5552,7 +6690,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
 +		     LOCK_PREFIX "subl %1,%0\n"
-+		     "into\n0:\n"
++		     _ASM_INTO "\n0:\n"
 +		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -5573,7 +6711,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
  		     : "+m" (v->counter)
  		     : "ir" (i));
  }
-@@ -59,7 +104,29 @@ static inline void atomic_add(int i, ato
+@@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
   */
  static inline void atomic_sub(int i, atomic_t *v)
  {
@@ -5583,7 +6721,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
 +		     LOCK_PREFIX "addl %1,%0\n"
-+		     "into\n0:\n"
++		     _ASM_INTO "\n0:\n"
 +		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -5604,7 +6742,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
  		     : "+m" (v->counter)
  		     : "ir" (i));
  }
-@@ -77,7 +144,16 @@ static inline int atomic_sub_and_test(in
+@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
  {
  	unsigned char c;
  
@@ -5614,7 +6752,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
 +		     LOCK_PREFIX "addl %2,%0\n"
-+		     "into\n0:\n"
++		     _ASM_INTO "\n0:\n"
 +		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -5622,7 +6760,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
  		     : "+m" (v->counter), "=qm" (c)
  		     : "ir" (i) : "memory");
  	return c;
-@@ -91,7 +167,30 @@ static inline int atomic_sub_and_test(in
+@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
   */
  static inline void atomic_inc(atomic_t *v)
  {
@@ -5630,13 +6768,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
 +	asm volatile(LOCK_PREFIX "incl %0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+		     "into\n0:\n"
-+		     ".pushsection .fixup,\"ax\"\n"
-+		     "1:\n"
++		     "jno 0f\n"
 +		     LOCK_PREFIX "decl %0\n"
-+		     "jmp 0b\n"
-+		     ".popsection\n"
-+		     _ASM_EXTABLE(0b, 1b)
++		     _ASM_INTO "\n0:\n"
++		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +		     : "+m" (v->counter));
@@ -5654,7 +6789,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
  		     : "+m" (v->counter));
  }
  
-@@ -103,7 +202,18 @@ static inline void atomic_inc(atomic_t *
+@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
   */
  static inline void atomic_dec(atomic_t *v)
  {
@@ -5662,19 +6797,28 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
 +	asm volatile(LOCK_PREFIX "decl %0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+		     "into\n0:\n"
-+		     ".pushsection .fixup,\"ax\"\n"
-+		     "1: \n"
++		     "jno 0f\n"
 +		     LOCK_PREFIX "incl %0\n"
-+		     "jmp 0b\n"
-+		     ".popsection\n"
-+		     _ASM_EXTABLE(0b, 1b)
++		     _ASM_INTO "\n0:\n"
++		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
++		     : "+m" (v->counter));
++}
++
++/**
++ * atomic_dec_unchecked - decrement atomic variable
++ * @v: pointer of type atomic_t
++ *
++ * Atomically decrements @v by 1.
++ */
++static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
++{
++	asm volatile(LOCK_PREFIX "decl %0\n"
  		     : "+m" (v->counter));
  }
  
-@@ -119,7 +229,19 @@ static inline int atomic_dec_and_test(at
+@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
  {
  	unsigned char c;
  
@@ -5682,20 +6826,17 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
 +	asm volatile(LOCK_PREFIX "decl %0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+		     "into\n0:\n"
-+		     ".pushsection .fixup,\"ax\"\n"
-+		     "1: \n"
++		     "jno 0f\n"
 +		     LOCK_PREFIX "incl %0\n"
-+		     "jmp 0b\n"
-+		     ".popsection\n"
-+		     _ASM_EXTABLE(0b, 1b)
++		     _ASM_INTO "\n0:\n"
++		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +		     "sete %1\n"
  		     : "+m" (v->counter), "=qm" (c)
  		     : : "memory");
  	return c != 0;
-@@ -137,7 +259,19 @@ static inline int atomic_inc_and_test(at
+@@ -138,7 +263,16 @@ static inline int atomic_inc_and_test(atomic_t *v)
  {
  	unsigned char c;
  
@@ -5703,20 +6844,17 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
 +	asm volatile(LOCK_PREFIX "incl %0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+		     "into\n0:\n"
-+		     ".pushsection .fixup,\"ax\"\n"
-+		     "1: \n"
++		     "jno 0f\n"
 +		     LOCK_PREFIX "decl %0\n"
-+		     "jmp 0b\n"
-+		     ".popsection\n"
-+		     _ASM_EXTABLE(0b, 1b)
++		     _ASM_INTO "\n0:\n"
++		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +		     "sete %1\n"
  		     : "+m" (v->counter), "=qm" (c)
  		     : : "memory");
  	return c != 0;
-@@ -156,7 +290,16 @@ static inline int atomic_add_negative(in
+@@ -157,7 +291,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
  {
  	unsigned char c;
  
@@ -5726,7 +6864,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
 +		     LOCK_PREFIX "subl %2,%0\n"
-+		     "into\n0:\n"
++		     _ASM_INTO "\n0:\n"
 +		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -5734,7 +6872,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
  		     : "+m" (v->counter), "=qm" (c)
  		     : "ir" (i) : "memory");
  	return c;
-@@ -179,6 +322,46 @@ static inline int atomic_add_return(int 
+@@ -180,6 +323,46 @@ static inline int atomic_add_return(int i, atomic_t *v)
  #endif
  	/* Modern 486+ processor */
  	__i = i;
@@ -5743,7 +6881,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
 +		     "movl %0, %1\n"
-+		     "into\n0:\n"
++		     _ASM_INTO "\n0:\n"
 +		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -5781,7 +6919,18 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
  	asm volatile(LOCK_PREFIX "xaddl %0, %1"
  		     : "+r" (i), "+m" (v->counter)
  		     : : "memory");
-@@ -227,22 +410,34 @@ static inline int atomic_xchg(atomic_t *
+@@ -208,6 +391,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
+ }
+ 
+ #define atomic_inc_return(v)  (atomic_add_return(1, v))
++static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
++{
++	return atomic_add_return_unchecked(1, v);
++}
+ #define atomic_dec_return(v)  (atomic_sub_return(1, v))
+ 
+ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
+@@ -231,17 +418,30 @@ static inline int atomic_xchg(atomic_t *v, int new)
   */
  static inline int atomic_add_unless(atomic_t *v, int a, int u)
  {
@@ -5797,7 +6946,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
 +		asm volatile("addl %2,%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+			     "into\n0:\n"
++			     "jno 0f\n"
++			     "subl %2,%0\n"
++			     _ASM_INTO "\n0:\n"
 +			     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -5814,13 +6965,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
  }
  
  #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
- 
- #define atomic_inc_return(v)  (atomic_add_return(1, v))
-+#define atomic_inc_return_unchecked(v)  (atomic_add_return_unchecked(1, v))
- #define atomic_dec_return(v)  (atomic_sub_return(1, v))
- 
- /* These are x86-specific, used by some header files */
-@@ -266,6 +461,14 @@ typedef struct {
+diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
+index 2a934aa..5c1a942 100644
+--- a/arch/x86/include/asm/atomic64_32.h
++++ b/arch/x86/include/asm/atomic64_32.h
+@@ -12,6 +12,14 @@ typedef struct {
  	u64 __aligned(8) counter;
  } atomic64_t;
  
@@ -5834,262 +6983,12 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch
 +
  #define ATOMIC64_INIT(val)	{ (val) }
  
- extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch/x86/include/asm/atomic_64.h
---- linux-2.6.32.13/arch/x86/include/asm/atomic_64.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/atomic_64.h	2010-05-15 13:21:13.878594921 -0400
-@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
- }
- 
- /**
-+ * atomic_read_unchecked - read atomic variable
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically reads the value of @v.
-+ */
-+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
-+{
-+	return v->counter;
-+}
-+
-+/**
-  * atomic_set - set atomic variable
-  * @v: pointer of type atomic_t
-  * @i: required value
-@@ -36,6 +47,18 @@ static inline void atomic_set(atomic_t *
- }
- 
- /**
-+ * atomic_set_unchecked - set atomic variable
-+ * @v: pointer of type atomic_unchecked_t
-+ * @i: required value
-+ *
-+ * Atomically sets the value of @v to @i.
-+ */
-+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
-+{
-+	v->counter = i;
-+}
-+
-+/**
-  * atomic_add - add integer to atomic variable
-  * @i: integer value to add
-  * @v: pointer of type atomic_t
-@@ -44,7 +67,29 @@ static inline void atomic_set(atomic_t *
-  */
- static inline void atomic_add(int i, atomic_t *v)
- {
--	asm volatile(LOCK_PREFIX "addl %1,%0"
-+	asm volatile(LOCK_PREFIX "addl %1,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+		     "jno 0f\n"
-+		     LOCK_PREFIX "subl %1,%0\n"
-+		     "int $4\n0:\n"
-+		     _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+		     : "=m" (v->counter)
-+		     : "ir" (i), "m" (v->counter));
-+}
-+
-+/**
-+ * atomic_add_unchecked - add integer to atomic variable
-+ * @i: integer value to add
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically adds @i to @v.
-+ */
-+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
-+{
-+	asm volatile(LOCK_PREFIX "addl %1,%0\n"
- 		     : "=m" (v->counter)
- 		     : "ir" (i), "m" (v->counter));
- }
-@@ -58,7 +103,29 @@ static inline void atomic_add(int i, ato
-  */
- static inline void atomic_sub(int i, atomic_t *v)
- {
--	asm volatile(LOCK_PREFIX "subl %1,%0"
-+	asm volatile(LOCK_PREFIX "subl %1,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+		     "jno 0f\n"
-+		     LOCK_PREFIX "addl %1,%0\n"
-+		     "int $4\n0:\n"
-+		     _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+		     : "=m" (v->counter)
-+		     : "ir" (i), "m" (v->counter));
-+}
-+
-+/**
-+ * atomic_sub_unchecked - subtract the atomic variable
-+ * @i: integer value to subtract
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically subtracts @i from @v.
-+ */
-+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
-+{
-+	asm volatile(LOCK_PREFIX "subl %1,%0\n"
- 		     : "=m" (v->counter)
- 		     : "ir" (i), "m" (v->counter));
- }
-@@ -76,7 +143,16 @@ static inline int atomic_sub_and_test(in
- {
- 	unsigned char c;
- 
--	asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
-+	asm volatile(LOCK_PREFIX "subl %2,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+		     "jno 0f\n"
-+		     LOCK_PREFIX "addl %2,%0\n"
-+		     "int $4\n0:\n"
-+		     _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+		     "sete %1\n"
- 		     : "=m" (v->counter), "=qm" (c)
- 		     : "ir" (i), "m" (v->counter) : "memory");
- 	return c;
-@@ -90,7 +166,32 @@ static inline int atomic_sub_and_test(in
-  */
- static inline void atomic_inc(atomic_t *v)
- {
--	asm volatile(LOCK_PREFIX "incl %0"
-+	asm volatile(LOCK_PREFIX "incl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+		     "jno 0f\n"
-+		     "int $4\n0:\n"
-+		     ".pushsection .fixup,\"ax\"\n"
-+		     "1:\n"
-+		     LOCK_PREFIX "decl %0\n"
-+		     "jmp 0b\n"
-+		     ".popsection\n"
-+		     _ASM_EXTABLE(0b, 1b)
-+#endif
-+
-+		     : "=m" (v->counter)
-+		     : "m" (v->counter));
-+}
-+
-+/**
-+ * atomic_inc_unchecked - increment atomic variable
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically increments @v by 1.
-+ */
-+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
-+{
-+	asm volatile(LOCK_PREFIX "incl %0\n"
- 		     : "=m" (v->counter)
- 		     : "m" (v->counter));
- }
-@@ -103,7 +204,19 @@ static inline void atomic_inc(atomic_t *
-  */
- static inline void atomic_dec(atomic_t *v)
- {
--	asm volatile(LOCK_PREFIX "decl %0"
-+	asm volatile(LOCK_PREFIX "decl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+		     "jno 0f\n"
-+		     "int $4\n0:\n"
-+		     ".pushsection .fixup,\"ax\"\n"
-+		     "1: \n"
-+		     LOCK_PREFIX "incl %0\n"
-+		     "jmp 0b\n"
-+		     ".popsection\n"
-+		     _ASM_EXTABLE(0b, 1b)
-+#endif
-+
- 		     : "=m" (v->counter)
- 		     : "m" (v->counter));
- }
-@@ -120,7 +233,20 @@ static inline int atomic_dec_and_test(at
- {
- 	unsigned char c;
- 
--	asm volatile(LOCK_PREFIX "decl %0; sete %1"
-+	asm volatile(LOCK_PREFIX "decl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+		     "jno 0f\n"
-+		     "int $4\n0:\n"
-+		     ".pushsection .fixup,\"ax\"\n"
-+		     "1: \n"
-+		     LOCK_PREFIX "incl %0\n"
-+		     "jmp 0b\n"
-+		     ".popsection\n"
-+		     _ASM_EXTABLE(0b, 1b)
-+#endif
-+
-+		     "sete %1\n"
- 		     : "=m" (v->counter), "=qm" (c)
- 		     : "m" (v->counter) : "memory");
- 	return c != 0;
-@@ -138,7 +264,20 @@ static inline int atomic_inc_and_test(at
- {
- 	unsigned char c;
- 
--	asm volatile(LOCK_PREFIX "incl %0; sete %1"
-+	asm volatile(LOCK_PREFIX "incl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+		     "jno 0f\n"
-+		     "int $4\n0:\n"
-+		     ".pushsection .fixup,\"ax\"\n"
-+		     "1: \n"
-+		     LOCK_PREFIX "decl %0\n"
-+		     "jmp 0b\n"
-+		     ".popsection\n"
-+		     _ASM_EXTABLE(0b, 1b)
-+#endif
-+
-+		     "sete %1\n"
- 		     : "=m" (v->counter), "=qm" (c)
- 		     : "m" (v->counter) : "memory");
- 	return c != 0;
-@@ -157,7 +296,16 @@ static inline int atomic_add_negative(in
- {
- 	unsigned char c;
- 
--	asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
-+	asm volatile(LOCK_PREFIX "addl %2,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+		     "jno 0f\n"
-+		     LOCK_PREFIX "subl %2,%0\n"
-+		     "int $4\n0:\n"
-+		     _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+		     "sets %1\n"
- 		     : "=m" (v->counter), "=qm" (c)
- 		     : "ir" (i), "m" (v->counter) : "memory");
- 	return c;
-@@ -173,7 +321,15 @@ static inline int atomic_add_negative(in
- static inline int atomic_add_return(int i, atomic_t *v)
- {
- 	int __i = i;
--	asm volatile(LOCK_PREFIX "xaddl %0, %1"
-+	asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+		     "jno 0f\n"
-+		     "movl %0, %1\n"
-+		     "int $4\n0:\n"
-+		     _ASM_EXTABLE(0b, 0b)
-+#endif
-+
- 		     : "+r" (i), "+m" (v->counter)
- 		     : : "memory");
- 	return i + __i;
-@@ -204,6 +360,18 @@ static inline long atomic64_read(const a
+ #ifdef CONFIG_X86_CMPXCHG64
+diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
+index 49fd1ea..6b79575 100644
+--- a/arch/x86/include/asm/atomic64_64.h
++++ b/arch/x86/include/asm/atomic64_64.h
+@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
  }
  
  /**
@@ -6108,7 +7007,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
   * atomic64_set - set atomic64 variable
   * @v: pointer to type atomic64_t
   * @i: required value
-@@ -216,6 +384,18 @@ static inline void atomic64_set(atomic64
+@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
  }
  
  /**
@@ -6127,7 +7026,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
   * atomic64_add - add integer to atomic64 variable
   * @i: integer value to add
   * @v: pointer to type atomic64_t
-@@ -224,6 +404,28 @@ static inline void atomic64_set(atomic64
+@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
   */
  static inline void atomic64_add(long i, atomic64_t *v)
  {
@@ -6156,7 +7055,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
  	asm volatile(LOCK_PREFIX "addq %1,%0"
  		     : "=m" (v->counter)
  		     : "er" (i), "m" (v->counter));
-@@ -238,7 +440,15 @@ static inline void atomic64_add(long i, 
+@@ -56,7 +102,15 @@ static inline void atomic64_add(long i, atomic64_t *v)
   */
  static inline void atomic64_sub(long i, atomic64_t *v)
  {
@@ -6173,7 +7072,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
  		     : "=m" (v->counter)
  		     : "er" (i), "m" (v->counter));
  }
-@@ -256,7 +466,16 @@ static inline int atomic64_sub_and_test(
+@@ -74,7 +128,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
  {
  	unsigned char c;
  
@@ -6191,7 +7090,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
  		     : "=m" (v->counter), "=qm" (c)
  		     : "er" (i), "m" (v->counter) : "memory");
  	return c;
-@@ -270,6 +489,31 @@ static inline int atomic64_sub_and_test(
+@@ -88,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
   */
  static inline void atomic64_inc(atomic64_t *v)
  {
@@ -6199,13 +7098,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
-+		     "int $4\n0:\n"
-+		     ".pushsection .fixup,\"ax\"\n"
-+		     "1:\n"
 +		     LOCK_PREFIX "decq %0\n"
-+		     "jmp 0b\n"
-+		     ".popsection\n"
-+		     _ASM_EXTABLE(0b, 1b)
++		     "int $4\n0:\n"
++		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +		     : "=m" (v->counter)
@@ -6223,7 +7118,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
  	asm volatile(LOCK_PREFIX "incq %0"
  		     : "=m" (v->counter)
  		     : "m" (v->counter));
-@@ -283,7 +527,19 @@ static inline void atomic64_inc(atomic64
+@@ -101,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
   */
  static inline void atomic64_dec(atomic64_t *v)
  {
@@ -6232,19 +7127,28 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
-+		     "int $4\n0:\n"
-+		     ".pushsection .fixup,\"ax\"\n"
-+		     "1: \n"
 +		     LOCK_PREFIX "incq %0\n"
-+		     "jmp 0b\n"
-+		     ".popsection\n"
-+		     _ASM_EXTABLE(0b, 1b)
++		     "int $4\n0:\n"
++		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
++		     : "=m" (v->counter)
++		     : "m" (v->counter));
++}
++
++/**
++ * atomic64_dec_unchecked - decrement atomic64 variable
++ * @v: pointer to type atomic64_t
++ *
++ * Atomically decrements @v by 1.
++ */
++static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
++{
++	asm volatile(LOCK_PREFIX "decq %0\n"
  		     : "=m" (v->counter)
  		     : "m" (v->counter));
  }
-@@ -300,7 +556,20 @@ static inline int atomic64_dec_and_test(
+@@ -118,7 +223,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
  {
  	unsigned char c;
  
@@ -6253,20 +7157,16 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
-+		     "int $4\n0:\n"
-+		     ".pushsection .fixup,\"ax\"\n"
-+		     "1: \n"
 +		     LOCK_PREFIX "incq %0\n"
-+		     "jmp 0b\n"
-+		     ".popsection\n"
-+		     _ASM_EXTABLE(0b, 1b)
++		     "int $4\n0:\n"
++		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +		     "sete %1\n"
  		     : "=m" (v->counter), "=qm" (c)
  		     : "m" (v->counter) : "memory");
  	return c != 0;
-@@ -318,7 +587,20 @@ static inline int atomic64_inc_and_test(
+@@ -136,7 +250,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
  {
  	unsigned char c;
  
@@ -6275,20 +7175,16 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +		     "jno 0f\n"
-+		     "int $4\n0:\n"
-+		     ".pushsection .fixup,\"ax\"\n"
-+		     "1: \n"
 +		     LOCK_PREFIX "decq %0\n"
-+		     "jmp 0b\n"
-+		     ".popsection\n"
-+		     _ASM_EXTABLE(0b, 1b)
++		     "int $4\n0:\n"
++		     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +		     "sete %1\n"
  		     : "=m" (v->counter), "=qm" (c)
  		     : "m" (v->counter) : "memory");
  	return c != 0;
-@@ -337,7 +619,16 @@ static inline int atomic64_add_negative(
+@@ -155,7 +278,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
  {
  	unsigned char c;
  
@@ -6306,7 +7202,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
  		     : "=m" (v->counter), "=qm" (c)
  		     : "er" (i), "m" (v->counter) : "memory");
  	return c;
-@@ -353,7 +644,31 @@ static inline int atomic64_add_negative(
+@@ -171,7 +303,31 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
  static inline long atomic64_add_return(long i, atomic64_t *v)
  {
  	long __i = i;
@@ -6339,49 +7235,18 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
  		     : "+r" (i), "+m" (v->counter)
  		     : : "memory");
  	return i + __i;
-@@ -365,6 +680,7 @@ static inline long atomic64_sub_return(l
+@@ -183,6 +339,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
  }
  
  #define atomic64_inc_return(v)  (atomic64_add_return(1, (v)))
-+#define atomic64_inc_return_unchecked(v)  (atomic64_add_return_unchecked(1, (v)))
++static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
++{
++	return atomic64_add_return_unchecked(1, v);
++}
  #define atomic64_dec_return(v)  (atomic64_sub_return(1, (v)))
  
  static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
-@@ -398,17 +714,29 @@ static inline long atomic_xchg(atomic_t 
-  */
- static inline int atomic_add_unless(atomic_t *v, int a, int u)
- {
--	int c, old;
-+	int c, old, new;
- 	c = atomic_read(v);
- 	for (;;) {
--		if (unlikely(c == (u)))
-+		if (unlikely(c == u))
- 			break;
--		old = atomic_cmpxchg((v), c, c + (a));
-+
-+		asm volatile("addl %2,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+			     "jno 0f\n"
-+			     "int $4\n0:\n"
-+			     _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+			     : "=r" (new)
-+			     : "0" (c), "ir" (a));
-+
-+		old = atomic_cmpxchg(v, c, new);
- 		if (likely(old == c))
- 			break;
- 		c = old;
- 	}
--	return c != (u);
-+	return c != u;
- }
- 
- #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-@@ -424,17 +752,29 @@ static inline int atomic_add_unless(atom
+@@ -206,17 +366,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
   */
  static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
  {
@@ -6394,18 +7259,19 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
  			break;
 -		old = atomic64_cmpxchg((v), c, c + (a));
 +
-+		asm volatile("addq %2,%0\n"
++		asm volatile("add %2,%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +			     "jno 0f\n"
++			     "sub %2,%0\n"
 +			     "int $4\n0:\n"
 +			     _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +			     : "=r" (new)
-+			     : "0" (c), "er" (a));
++			     : "0" (c), "ir" (a));
 +
-+		old = atomic64_cmpxchg((v), c, new);
++		old = atomic64_cmpxchg(v, c, new);
  		if (likely(old == c))
  			break;
  		c = old;
@@ -6414,10 +7280,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch
 +	return c != u;
  }
  
- /**
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/boot.h linux-2.6.32.13/arch/x86/include/asm/boot.h
---- linux-2.6.32.13/arch/x86/include/asm/boot.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/boot.h	2010-05-15 13:21:13.878594921 -0400
+ #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
+diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
+index 3b62ab5..ea86950 100644
+--- a/arch/x86/include/asm/boot.h
++++ b/arch/x86/include/asm/boot.h
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -6435,42 +7302,36 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/boot.h linux-2.6.32.13/arch/x86/
  /* Minimum kernel alignment, as a power of two */
  #ifdef CONFIG_X86_64
  #define MIN_KERNEL_ALIGN_LG2	PMD_SHIFT
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/cacheflush.h linux-2.6.32.13/arch/x86/include/asm/cacheflush.h
---- linux-2.6.32.13/arch/x86/include/asm/cacheflush.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/cacheflush.h	2010-05-15 13:21:13.878594921 -0400
-@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
- static inline unsigned long get_page_memtype(struct page *pg)
- {
- 	if (!PageUncached(pg) && !PageWC(pg))
--		return -1;
-+		return ~0UL;
- 	else if (!PageUncached(pg) && PageWC(pg))
- 		return _PAGE_CACHE_WC;
- 	else if (PageUncached(pg) && !PageWC(pg))
-@@ -85,7 +85,7 @@ static inline void set_page_memtype(stru
- 		SetPageWC(pg);
- 		break;
- 	default:
--	case -1:
-+	case ~0UL:
- 		ClearPageUncached(pg);
- 		ClearPageWC(pg);
- 		break;
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/cache.h linux-2.6.32.13/arch/x86/include/asm/cache.h
---- linux-2.6.32.13/arch/x86/include/asm/cache.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/cache.h	2010-05-15 13:21:13.878594921 -0400
+diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
+index 48f99f1..982b21c 100644
+--- a/arch/x86/include/asm/cache.h
++++ b/arch/x86/include/asm/cache.h
 @@ -8,6 +8,7 @@
  #define L1_CACHE_BYTES	(1 << L1_CACHE_SHIFT)
  
- #define __read_mostly __attribute__((__section__(".data.read_mostly")))
-+#define __read_only __attribute__((__section__(".data.read_only")))
+ #define __read_mostly __attribute__((__section__(".data..read_mostly")))
++#define __read_only __attribute__((__section__(".data..read_only")))
  
- #ifdef CONFIG_X86_VSMP
- /* vSMP Internode cacheline shift */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/checksum_32.h linux-2.6.32.13/arch/x86/include/asm/checksum_32.h
---- linux-2.6.32.13/arch/x86/include/asm/checksum_32.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/checksum_32.h	2010-05-15 13:21:13.878594921 -0400
-@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
+ #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
+ #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
+diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
+index 63e35ec..718f045 100644
+--- a/arch/x86/include/asm/cacheflush.h
++++ b/arch/x86/include/asm/cacheflush.h
+@@ -66,7 +66,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
+ 	unsigned long pg_flags = pg->flags & _PGMT_MASK;
+ 
+ 	if (pg_flags == _PGMT_DEFAULT)
+-		return -1;
++		return ~0UL;
+ 	else if (pg_flags == _PGMT_WC)
+ 		return _PAGE_CACHE_WC;
+ 	else if (pg_flags == _PGMT_UC_MINUS)
+diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
+index 46fc474..b02b0f9 100644
+--- a/arch/x86/include/asm/checksum_32.h
++++ b/arch/x86/include/asm/checksum_32.h
+@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
  					    int len, __wsum sum,
  					    int *src_err_ptr, int *dst_err_ptr);
  
@@ -6485,7 +7346,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/checksum_32.h linux-2.6.32.13/ar
  /*
   *	Note: when you get a NULL pointer exception here this means someone
   *	passed in an incorrect kernel address to one of these functions.
-@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_f
+@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
  						 int *err_ptr)
  {
  	might_sleep();
@@ -6494,7 +7355,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/checksum_32.h linux-2.6.32.13/ar
  					 len, sum, err_ptr, NULL);
  }
  
-@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_us
+@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
  {
  	might_sleep();
  	if (access_ok(VERIFY_WRITE, dst, len))
@@ -6503,9 +7364,23 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/checksum_32.h linux-2.6.32.13/ar
  						 len, sum, NULL, err_ptr);
  
  	if (len)
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/include/asm/desc.h
---- linux-2.6.32.13/arch/x86/include/asm/desc.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/desc.h	2010-05-15 13:21:13.882891085 -0400
+diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
+index 14e0ee1..c5ff697 100644
+--- a/arch/x86/include/asm/cpufeature.h
++++ b/arch/x86/include/asm/cpufeature.h
+@@ -323,7 +323,7 @@ static __always_inline __pure bool __static_cpu_has(u8 bit)
+ 			     " .byte 4f - 3f\n"		/* replacement len */
+ 			     " .byte 0xff + (4f-3f) - (2b-1b)\n" /* padding */
+ 			     ".previous\n"
+-			     ".section .altinstr_replacement,\"ax\"\n"
++			     ".section .altinstr_replacement,\"a\"\n"
+ 			     "3: movb $1,%0\n"
+ 			     "4:\n"
+ 			     ".previous\n"
+diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
+index 617bd56..8d4356d 100644
+--- a/arch/x86/include/asm/desc.h
++++ b/arch/x86/include/asm/desc.h
 @@ -4,6 +4,7 @@
  #include <asm/desc_defs.h>
  #include <asm/ldt.h>
@@ -6514,7 +7389,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/
  #include <linux/smp.h>
  
  static inline void fill_ldt(struct desc_struct *desc,
-@@ -15,6 +16,7 @@ static inline void fill_ldt(struct desc_
+@@ -15,6 +16,7 @@ static inline void fill_ldt(struct desc_struct *desc,
  	desc->base1 = (info->base_addr & 0x00ff0000) >> 16;
  	desc->type = (info->read_exec_only ^ 1) << 1;
  	desc->type |= info->contents << 2;
@@ -6522,7 +7397,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/
  	desc->s = 1;
  	desc->dpl = 0x3;
  	desc->p = info->seg_not_present ^ 1;
-@@ -31,16 +33,12 @@ static inline void fill_ldt(struct desc_
+@@ -31,16 +33,12 @@ static inline void fill_ldt(struct desc_struct *desc,
  }
  
  extern struct desc_ptr idt_descr;
@@ -6542,7 +7417,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/
  }
  
  #ifdef CONFIG_X86_64
-@@ -115,19 +113,24 @@ static inline void paravirt_free_ldt(str
+@@ -115,19 +113,24 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
  static inline void native_write_idt_entry(gate_desc *idt, int entry,
  					  const gate_desc *gate)
  {
@@ -6567,7 +7442,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/
  	switch (type) {
  	case DESC_TSS:
  		size = sizeof(tss_desc);
-@@ -139,7 +142,10 @@ static inline void native_write_gdt_entr
+@@ -139,7 +142,10 @@ static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry,
  		size = sizeof(struct desc_struct);
  		break;
  	}
@@ -6578,7 +7453,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/
  }
  
  static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
-@@ -211,7 +217,9 @@ static inline void native_set_ldt(const 
+@@ -211,7 +217,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
  
  static inline void native_load_tr_desc(void)
  {
@@ -6588,7 +7463,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/
  }
  
  static inline void native_load_gdt(const struct desc_ptr *dtr)
-@@ -246,8 +254,10 @@ static inline void native_load_tls(struc
+@@ -246,8 +254,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
  	unsigned int i;
  	struct desc_struct *gdt = get_cpu_gdt_table(cpu);
  
@@ -6599,7 +7474,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/
  }
  
  #define _LDT_empty(info)				\
-@@ -309,7 +319,7 @@ static inline void set_desc_limit(struct
+@@ -309,7 +319,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
  	desc->limit = (limit >> 16) & 0xf;
  }
  
@@ -6608,7 +7483,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/
  			     unsigned dpl, unsigned ist, unsigned seg)
  {
  	gate_desc s;
-@@ -327,7 +337,7 @@ static inline void _set_gate(int gate, u
+@@ -327,7 +337,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
   * Pentium F0 0F bugfix can have resulted in the mapped
   * IDT being write-protected.
   */
@@ -6617,7 +7492,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/
  {
  	BUG_ON((unsigned)n > 0xFF);
  	_set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
-@@ -356,19 +366,19 @@ static inline void alloc_intr_gate(unsig
+@@ -356,19 +366,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
  /*
   * This routine sets up an interrupt gate at directory privilege level 3.
   */
@@ -6640,7 +7515,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/
  {
  	BUG_ON((unsigned)n > 0xFF);
  	_set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
-@@ -377,19 +387,31 @@ static inline void set_trap_gate(unsigne
+@@ -377,19 +387,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
  static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
  {
  	BUG_ON((unsigned)n > 0xFF);
@@ -6675,9 +7550,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/device.h linux-2.6.32.13/arch/x86/include/asm/device.h
---- linux-2.6.32.13/arch/x86/include/asm/device.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/device.h	2010-05-15 13:21:13.882891085 -0400
+diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h
+index 029f230..0b9b1b3 100644
+--- a/arch/x86/include/asm/device.h
++++ b/arch/x86/include/asm/device.h
 @@ -6,7 +6,7 @@ struct dev_archdata {
  	void	*acpi_handle;
  #endif
@@ -6685,12 +7561,13 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/device.h linux-2.6.32.13/arch/x8
 -struct dma_map_ops *dma_ops;
 +	const struct dma_map_ops *dma_ops;
  #endif
- #ifdef CONFIG_DMAR
+ #if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
  	void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h	2010-05-15 13:21:13.882891085 -0400
-@@ -25,9 +25,9 @@ extern int iommu_merge;
+diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
+index ac91eed..a3eae19 100644
+--- a/arch/x86/include/asm/dma-mapping.h
++++ b/arch/x86/include/asm/dma-mapping.h
+@@ -26,9 +26,9 @@ extern int iommu_merge;
  extern struct device x86_dma_fallback_dev;
  extern int panic_on_overflow;
  
@@ -6702,7 +7579,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h linux-2.6.32.13/ar
  {
  #ifdef CONFIG_X86_32
  	return dma_ops;
-@@ -44,7 +44,7 @@ static inline struct dma_map_ops *get_dm
+@@ -45,7 +45,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
  /* Make sure we keep the same behaviour */
  static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
  {
@@ -6711,7 +7588,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h linux-2.6.32.13/ar
  	if (ops->mapping_error)
  		return ops->mapping_error(dev, dma_addr);
  
-@@ -122,7 +122,7 @@ static inline void *
+@@ -123,7 +123,7 @@ static inline void *
  dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
  		gfp_t gfp)
  {
@@ -6720,7 +7597,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h linux-2.6.32.13/ar
  	void *memory;
  
  	gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
-@@ -149,7 +149,7 @@ dma_alloc_coherent(struct device *dev, s
+@@ -150,7 +150,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
  static inline void dma_free_coherent(struct device *dev, size_t size,
  				     void *vaddr, dma_addr_t bus)
  {
@@ -6729,22 +7606,24 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h linux-2.6.32.13/ar
  
  	WARN_ON(irqs_disabled());       /* for portability */
  
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/e820.h linux-2.6.32.13/arch/x86/include/asm/e820.h
---- linux-2.6.32.13/arch/x86/include/asm/e820.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/e820.h	2010-05-15 13:21:13.882891085 -0400
-@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
+diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
+index ec8a52d..7bbff69 100644
+--- a/arch/x86/include/asm/e820.h
++++ b/arch/x86/include/asm/e820.h
+@@ -69,7 +69,7 @@ struct e820map {
+ #define ISA_START_ADDRESS	0xa0000
  #define ISA_END_ADDRESS		0x100000
- #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
  
 -#define BIOS_BEGIN		0x000a0000
 +#define BIOS_BEGIN		0x000c0000
  #define BIOS_END		0x00100000
  
  #ifdef __KERNEL__
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/elf.h linux-2.6.32.13/arch/x86/include/asm/elf.h
---- linux-2.6.32.13/arch/x86/include/asm/elf.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/elf.h	2010-05-15 13:21:13.882891085 -0400
-@@ -257,7 +257,25 @@ extern int force_personality32;
+diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
+index f2ad216..569e1f7 100644
+--- a/arch/x86/include/asm/elf.h
++++ b/arch/x86/include/asm/elf.h
+@@ -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.  */
  
@@ -6770,7 +7649,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/elf.h linux-2.6.32.13/arch/x86/i
  
  /* 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,
-@@ -311,8 +329,7 @@ do {									\
+@@ -291,8 +309,7 @@ do {									\
  #define ARCH_DLINFO							\
  do {									\
  	if (vdso_enabled)						\
@@ -6780,7 +7659,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/elf.h linux-2.6.32.13/arch/x86/i
  } while (0)
  
  #define AT_SYSINFO		32
-@@ -323,7 +340,7 @@ do {									\
+@@ -303,7 +320,7 @@ do {									\
  
  #endif /* !CONFIG_X86_32 */
  
@@ -6789,7 +7668,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/elf.h linux-2.6.32.13/arch/x86/i
  
  #define VDSO_ENTRY							\
  	((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
-@@ -337,7 +354,4 @@ extern int arch_setup_additional_pages(s
+@@ -317,7 +334,4 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
  extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
  #define compat_arch_setup_additional_pages	syscall32_setup_pages
  
@@ -6797,9 +7676,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/elf.h linux-2.6.32.13/arch/x86/i
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/futex.h linux-2.6.32.13/arch/x86/include/asm/futex.h
---- linux-2.6.32.13/arch/x86/include/asm/futex.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/futex.h	2010-05-15 13:21:13.882891085 -0400
+diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
+index 1f11ce4..c8cfd20 100644
+--- a/arch/x86/include/asm/futex.h
++++ b/arch/x86/include/asm/futex.h
 @@ -11,17 +11,54 @@
  #include <asm/processor.h>
  #include <asm/system.h>
@@ -6871,7 +7751,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/futex.h linux-2.6.32.13/arch/x86
  {
  	int op = (encoded_op >> 28) & 7;
  	int cmp = (encoded_op >> 24) & 15;
-@@ -61,11 +100,20 @@ static inline int futex_atomic_op_inuser
+@@ -61,11 +100,20 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
  
  	switch (op) {
  	case FUTEX_OP_SET:
@@ -6892,7 +7772,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/futex.h linux-2.6.32.13/arch/x86
  		break;
  	case FUTEX_OP_OR:
  		__futex_atomic_op2("orl %4, %3", ret, oldval, uaddr, oparg);
-@@ -109,7 +157,7 @@ static inline int futex_atomic_op_inuser
+@@ -109,7 +157,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
  	return ret;
  }
  
@@ -6901,7 +7781,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/futex.h linux-2.6.32.13/arch/x86
  						int newval)
  {
  
-@@ -119,17 +167,31 @@ static inline int futex_atomic_cmpxchg_i
+@@ -119,17 +167,31 @@ static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
  		return -ENOSYS;
  #endif
  
@@ -6936,10 +7816,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/futex.h linux-2.6.32.13/arch/x86
  		     : "memory"
  	);
  
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/i387.h linux-2.6.32.13/arch/x86/include/asm/i387.h
---- linux-2.6.32.13/arch/x86/include/asm/i387.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/i387.h	2010-05-15 13:21:13.886644440 -0400
-@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
+diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
+index c991b3a..e47dda2 100644
+--- a/arch/x86/include/asm/i387.h
++++ b/arch/x86/include/asm/i387.h
+@@ -77,6 +77,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
  {
  	int err;
  
@@ -6951,7 +7832,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/i387.h linux-2.6.32.13/arch/x86/
  	asm volatile("1:  rex64/fxrstor (%[fx])\n\t"
  		     "2:\n"
  		     ".section .fixup,\"ax\"\n"
-@@ -105,6 +110,11 @@ static inline int fxsave_user(struct i38
+@@ -127,6 +132,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
  {
  	int err;
  
@@ -6963,7 +7844,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/i387.h linux-2.6.32.13/arch/x86/
  	asm volatile("1:  rex64/fxsave (%[fx])\n\t"
  		     "2:\n"
  		     ".section .fixup,\"ax\"\n"
-@@ -195,13 +205,8 @@ static inline int fxrstor_checking(struc
+@@ -220,13 +230,8 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
  }
  
  /* We need a safe address that is cheap to find and that is already
@@ -6979,10 +7860,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/i387.h linux-2.6.32.13/arch/x86/
  
  /*
   * These must be called with preempt disabled
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/io_64.h linux-2.6.32.13/arch/x86/include/asm/io_64.h
---- linux-2.6.32.13/arch/x86/include/asm/io_64.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/io_64.h	2010-05-15 13:21:13.886644440 -0400
-@@ -140,6 +140,17 @@ __OUTS(l)
+diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
+index 6a45ec4..2104674 100644
+--- a/arch/x86/include/asm/io.h
++++ b/arch/x86/include/asm/io.h
+@@ -214,6 +214,17 @@ extern void set_iounmap_nonlazy(void);
  
  #include <linux/vmalloc.h>
  
@@ -6997,25 +7879,27 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/io_64.h linux-2.6.32.13/arch/x86
 +	return (pfn + (count >> PAGE_SHIFT)) < (1 << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
 +}
 +
- #include <asm-generic/iomap.h>
- 
- void __memcpy_fromio(void *, unsigned long, unsigned);
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/iommu.h linux-2.6.32.13/arch/x86/include/asm/iommu.h
---- linux-2.6.32.13/arch/x86/include/asm/iommu.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/iommu.h	2010-05-15 13:21:13.886644440 -0400
-@@ -3,7 +3,7 @@
+ /*
+  * Convert a virtual cached pointer to an uncached pointer
+  */
+diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h
+index 345c99c..7938698 100644
+--- a/arch/x86/include/asm/iommu.h
++++ b/arch/x86/include/asm/iommu.h
+@@ -1,7 +1,7 @@
+ #ifndef _ASM_X86_IOMMU_H
+ #define _ASM_X86_IOMMU_H
  
- extern void pci_iommu_shutdown(void);
- extern void no_iommu_init(void);
 -extern struct dma_map_ops nommu_dma_ops;
 +extern const struct dma_map_ops nommu_dma_ops;
  extern int force_iommu, no_iommu;
  extern int iommu_detected;
  extern int iommu_pass_through;
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/irqflags.h linux-2.6.32.13/arch/x86/include/asm/irqflags.h
---- linux-2.6.32.13/arch/x86/include/asm/irqflags.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/irqflags.h	2010-05-15 13:21:13.886644440 -0400
-@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
+diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
+index 9e2b952..557206e 100644
+--- a/arch/x86/include/asm/irqflags.h
++++ b/arch/x86/include/asm/irqflags.h
+@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_irq_save(void)
  	sti;					\
  	sysexit
  
@@ -7027,10 +7911,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/irqflags.h linux-2.6.32.13/arch/
  #else
  #define INTERRUPT_RETURN		iret
  #define ENABLE_INTERRUPTS_SYSEXIT	sti; sysexit
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/kvm_host.h linux-2.6.32.13/arch/x86/include/asm/kvm_host.h
---- linux-2.6.32.13/arch/x86/include/asm/kvm_host.h	2010-04-29 17:49:37.497949072 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/kvm_host.h	2010-05-15 13:21:13.886644440 -0400
-@@ -532,7 +532,7 @@ struct kvm_x86_ops {
+diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
+index 76f5483..ae8e300 100644
+--- a/arch/x86/include/asm/kvm_host.h
++++ b/arch/x86/include/asm/kvm_host.h
+@@ -536,7 +536,7 @@ struct kvm_x86_ops {
  	const struct trace_print_flags *exit_reasons_str;
  };
  
@@ -7039,9 +7924,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/kvm_host.h linux-2.6.32.13/arch/
  
  int kvm_mmu_module_init(void);
  void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/local.h linux-2.6.32.13/arch/x86/include/asm/local.h
---- linux-2.6.32.13/arch/x86/include/asm/local.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/local.h	2010-05-15 13:21:13.886644440 -0400
+diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
+index 2e99724..1fcf079 100644
+--- a/arch/x86/include/asm/local.h
++++ b/arch/x86/include/asm/local.h
 @@ -18,26 +18,90 @@ typedef struct {
  
  static inline void local_inc(local_t *l)
@@ -7137,7 +8023,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/local.h linux-2.6.32.13/arch/x86
  		     : "+m" (l->a.counter)
  		     : "ir" (i));
  }
-@@ -55,7 +119,24 @@ static inline int local_sub_and_test(lon
+@@ -55,7 +119,24 @@ static inline int local_sub_and_test(long i, local_t *l)
  {
  	unsigned char c;
  
@@ -7163,7 +8049,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/local.h linux-2.6.32.13/arch/x86
  		     : "+m" (l->a.counter), "=qm" (c)
  		     : "ir" (i) : "memory");
  	return c;
-@@ -73,7 +154,24 @@ static inline int local_dec_and_test(loc
+@@ -73,7 +154,24 @@ static inline int local_dec_and_test(local_t *l)
  {
  	unsigned char c;
  
@@ -7189,7 +8075,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/local.h linux-2.6.32.13/arch/x86
  		     : "+m" (l->a.counter), "=qm" (c)
  		     : : "memory");
  	return c != 0;
-@@ -91,7 +189,24 @@ static inline int local_inc_and_test(loc
+@@ -91,7 +189,24 @@ static inline int local_inc_and_test(local_t *l)
  {
  	unsigned char c;
  
@@ -7215,7 +8101,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/local.h linux-2.6.32.13/arch/x86
  		     : "+m" (l->a.counter), "=qm" (c)
  		     : : "memory");
  	return c != 0;
-@@ -110,7 +225,24 @@ static inline int local_add_negative(lon
+@@ -110,7 +225,24 @@ static inline int local_add_negative(long i, local_t *l)
  {
  	unsigned char c;
  
@@ -7241,7 +8127,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/local.h linux-2.6.32.13/arch/x86
  		     : "+m" (l->a.counter), "=qm" (c)
  		     : "ir" (i) : "memory");
  	return c;
-@@ -133,7 +265,23 @@ static inline long local_add_return(long
+@@ -133,7 +265,23 @@ static inline long local_add_return(long i, local_t *l)
  #endif
  	/* Modern 486+ processor */
  	__i = i;
@@ -7266,10 +8152,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/local.h linux-2.6.32.13/arch/x86
  		     : "+r" (i), "+m" (l->a.counter)
  		     : : "memory");
  	return i + __i;
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h
---- linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h	2010-05-15 13:21:13.886644440 -0400
-@@ -81,8 +81,8 @@ static inline unsigned char current_lock
+diff --git a/arch/x86/include/asm/mc146818rtc.h b/arch/x86/include/asm/mc146818rtc.h
+index 01fdf56..3bb1b14 100644
+--- a/arch/x86/include/asm/mc146818rtc.h
++++ b/arch/x86/include/asm/mc146818rtc.h
+@@ -81,8 +81,8 @@ static inline unsigned char current_lock_cmos_reg(void)
  #else
  #define lock_cmos_prefix(reg) do {} while (0)
  #define lock_cmos_suffix(reg) do {} while (0)
@@ -7280,9 +8167,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.13/ar
  #define do_i_have_lock_cmos() 0
  #define current_lock_cmos_reg() 0
  #endif
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/microcode.h linux-2.6.32.13/arch/x86/include/asm/microcode.h
---- linux-2.6.32.13/arch/x86/include/asm/microcode.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/microcode.h	2010-05-15 13:21:13.886644440 -0400
+diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
+index ef51b50..514ba37 100644
+--- a/arch/x86/include/asm/microcode.h
++++ b/arch/x86/include/asm/microcode.h
 @@ -12,13 +12,13 @@ struct device;
  enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
  
@@ -7323,9 +8211,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/microcode.h linux-2.6.32.13/arch
  {
  	return NULL;
  }
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/mman.h linux-2.6.32.13/arch/x86/include/asm/mman.h
---- linux-2.6.32.13/arch/x86/include/asm/mman.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/mman.h	2010-05-15 13:21:13.886644440 -0400
+diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
+index 593e51d..fa69c9a 100644
+--- a/arch/x86/include/asm/mman.h
++++ b/arch/x86/include/asm/mman.h
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -7341,10 +8230,41 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mman.h linux-2.6.32.13/arch/x86/
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu_context.h linux-2.6.32.13/arch/x86/include/asm/mmu_context.h
---- linux-2.6.32.13/arch/x86/include/asm/mmu_context.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/mmu_context.h	2010-05-15 13:21:13.886644440 -0400
-@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
+diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
+index 80a1dee..239c67d 100644
+--- a/arch/x86/include/asm/mmu.h
++++ b/arch/x86/include/asm/mmu.h
+@@ -9,10 +9,23 @@
+  * we put the segment information here.
+  */
+ typedef struct {
+-	void *ldt;
++	struct desc_struct *ldt;
+ 	int size;
+ 	struct mutex lock;
+-	void *vdso;
++	unsigned long vdso;
++
++#ifdef CONFIG_X86_32
++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
++	unsigned long user_cs_base;
++	unsigned long user_cs_limit;
++
++#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
++	cpumask_t cpu_user_cs_mask;
++#endif
++
++#endif
++#endif
++
+ } mm_context_t;
+ 
+ #ifdef CONFIG_SMP
+diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
+index 4a2d4e0..a896757 100644
+--- a/arch/x86/include/asm/mmu_context.h
++++ b/arch/x86/include/asm/mmu_context.h
+@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *mm);
  
  static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
  {
@@ -7366,7 +8286,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu_context.h linux-2.6.32.13/ar
  #ifdef CONFIG_SMP
  	if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
  		percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
-@@ -34,27 +49,70 @@ static inline void switch_mm(struct mm_s
+@@ -34,27 +49,70 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
  			     struct task_struct *tsk)
  {
  	unsigned cpu = smp_processor_id();
@@ -7405,7 +8325,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu_context.h linux-2.6.32.13/ar
 -	}
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
-+		if (!nx_enabled) {
++		if (!(__supported_pte_mask & _PAGE_NX)) {
 +			smp_mb__before_clear_bit();
 +			cpu_clear(cpu, prev->context.cpu_user_cs_mask);
 +			smp_mb__after_clear_bit();
@@ -7438,7 +8358,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu_context.h linux-2.6.32.13/ar
  		percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
  		BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
  
-@@ -63,11 +121,28 @@ static inline void switch_mm(struct mm_s
+@@ -63,11 +121,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
  			 * tlb flush IPI delivery. We must reload CR3
  			 * to make sure to use no freed page tables.
  			 */
@@ -7450,13 +8370,13 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu_context.h linux-2.6.32.13/ar
  			load_LDT_nolock(&next->context);
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
-+			if (!nx_enabled)
++			if (!(__supported_pte_mask & _PAGE_NX))
 +				cpu_set(cpu, next->context.cpu_user_cs_mask);
 +#endif
 +
 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
 +#ifdef CONFIG_PAX_PAGEEXEC
-+			if (!((next->pax_flags & MF_PAX_PAGEEXEC) && nx_enabled))
++			if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
 +#endif
 +				set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
 +#endif
@@ -7468,38 +8388,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu_context.h linux-2.6.32.13/ar
  }
  
  #define activate_mm(prev, next)			\
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu.h linux-2.6.32.13/arch/x86/include/asm/mmu.h
---- linux-2.6.32.13/arch/x86/include/asm/mmu.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/mmu.h	2010-05-15 13:21:13.886644440 -0400
-@@ -9,10 +9,23 @@
-  * we put the segment information here.
-  */
- typedef struct {
--	void *ldt;
-+	struct desc_struct *ldt;
- 	int size;
- 	struct mutex lock;
--	void *vdso;
-+	unsigned long vdso;
-+
-+#ifdef CONFIG_X86_32
-+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
-+	unsigned long user_cs_base;
-+	unsigned long user_cs_limit;
-+
-+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
-+	cpumask_t cpu_user_cs_mask;
-+#endif
-+
-+#endif
-+#endif
-+
- } mm_context_t;
- 
- #ifdef CONFIG_SMP
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/module.h linux-2.6.32.13/arch/x86/include/asm/module.h
---- linux-2.6.32.13/arch/x86/include/asm/module.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/module.h	2010-05-15 13:21:13.886644440 -0400
+diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
+index 3e2ce58..51d8f7e 100644
+--- a/arch/x86/include/asm/module.h
++++ b/arch/x86/include/asm/module.h
 @@ -59,13 +59,31 @@
  #error unknown processor family
  #endif
@@ -7533,9 +8425,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/module.h linux-2.6.32.13/arch/x8
  #endif
  
  #endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_32_types.h linux-2.6.32.13/arch/x86/include/asm/page_32_types.h
---- linux-2.6.32.13/arch/x86/include/asm/page_32_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/page_32_types.h	2010-05-15 13:21:13.886644440 -0400
+diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
+index 6f1b733..fe54285 100644
+--- a/arch/x86/include/asm/page_32_types.h
++++ b/arch/x86/include/asm/page_32_types.h
 @@ -15,6 +15,10 @@
   */
  #define __PAGE_OFFSET		_AC(CONFIG_PAGE_OFFSET, UL)
@@ -7547,35 +8440,23 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_32_types.h linux-2.6.32.13/
  #ifdef CONFIG_4KSTACKS
  #define THREAD_ORDER	0
  #else
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_64_types.h linux-2.6.32.13/arch/x86/include/asm/page_64_types.h
---- linux-2.6.32.13/arch/x86/include/asm/page_64_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/page_64_types.h	2010-05-15 13:21:13.886644440 -0400
-@@ -39,6 +39,9 @@
- #define __START_KERNEL		(__START_KERNEL_map + __PHYSICAL_START)
- #define __START_KERNEL_map	_AC(0xffffffff80000000, UL)
- 
-+#define ktla_ktva(addr)		(addr)
-+#define ktva_ktla(addr)		(addr)
-+
- /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
- #define __PHYSICAL_MASK_SHIFT	46
- #define __VIRTUAL_MASK_SHIFT	47
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt.h linux-2.6.32.13/arch/x86/include/asm/paravirt.h
---- linux-2.6.32.13/arch/x86/include/asm/paravirt.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/paravirt.h	2010-05-15 13:21:13.886644440 -0400
-@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
+diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
+index 5653f43..122e562 100644
+--- a/arch/x86/include/asm/paravirt.h
++++ b/arch/x86/include/asm/paravirt.h
+@@ -720,6 +720,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
  	pv_mmu_ops.set_fixmap(idx, phys, flags);
  }
  
 +#ifdef CONFIG_PAX_KERNEXEC
 +static inline unsigned long pax_open_kernel(void)
 +{
-+	return pv_mmu_ops.pax_open_kernel();
++	return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
 +}
 +
 +static inline unsigned long pax_close_kernel(void)
 +{
-+	return pv_mmu_ops.pax_close_kernel();
++	return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
 +}
 +#else
 +static inline unsigned long pax_open_kernel(void) { return 0; }
@@ -7584,8 +8465,8 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt.h linux-2.6.32.13/arch/
 +
  #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
  
- static inline int __raw_spin_is_locked(struct raw_spinlock *lock)
-@@ -945,7 +960,7 @@ extern void default_banner(void);
+ static inline int arch_spin_is_locked(struct arch_spinlock *lock)
+@@ -936,7 +951,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)
@@ -7594,7 +8475,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt.h linux-2.6.32.13/arch/
  #endif
  
  #define INTERRUPT_RETURN						\
-@@ -1022,6 +1037,21 @@ extern void default_banner(void);
+@@ -1013,6 +1028,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))
@@ -7616,10 +8497,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt.h linux-2.6.32.13/arch/
  #endif	/* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h	2010-05-15 13:21:13.902905019 -0400
-@@ -316,6 +316,12 @@ struct pv_mmu_ops {
+diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
+index db9ef55..7578058 100644
+--- a/arch/x86/include/asm/paravirt_types.h
++++ b/arch/x86/include/asm/paravirt_types.h
+@@ -312,6 +312,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);
@@ -7631,11 +8513,12 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h linux-2.6.32.13
 +
  };
  
- struct raw_spinlock;
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/pci_x86.h linux-2.6.32.13/arch/x86/include/asm/pci_x86.h
---- linux-2.6.32.13/arch/x86/include/asm/pci_x86.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/pci_x86.h	2010-05-15 13:21:13.902905019 -0400
-@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct 
+ struct arch_spinlock;
+diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
+index cd2a31d..f199fa7 100644
+--- a/arch/x86/include/asm/pci_x86.h
++++ b/arch/x86/include/asm/pci_x86.h
+@@ -91,16 +91,16 @@ extern int (*pcibios_enable_irq)(struct pci_dev *dev);
  extern void (*pcibios_disable_irq)(struct pci_dev *dev);
  
  struct pci_raw_ops {
@@ -7657,10 +8540,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pci_x86.h linux-2.6.32.13/arch/x
  extern bool port_cf9_safe;
  
  /* arch_initcall level */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgalloc.h linux-2.6.32.13/arch/x86/include/asm/pgalloc.h
---- linux-2.6.32.13/arch/x86/include/asm/pgalloc.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/pgalloc.h	2010-05-15 13:21:13.902905019 -0400
-@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
+diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
+index 271de94..ef944d6 100644
+--- a/arch/x86/include/asm/pgalloc.h
++++ b/arch/x86/include/asm/pgalloc.h
+@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
  				       pmd_t *pmd, pte_t *pte)
  {
  	paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
@@ -7674,10 +8558,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgalloc.h linux-2.6.32.13/arch/x
  	set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h	2010-05-15 13:21:13.902905019 -0400
-@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 
+diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
+index 2334982..70bc412 100644
+--- a/arch/x86/include/asm/pgtable-2level.h
++++ b/arch/x86/include/asm/pgtable-2level.h
+@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
  {
@@ -7687,86 +8572,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.13
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h	2010-05-15 13:21:13.902905019 -0400
-@@ -26,8 +26,6 @@
- struct mm_struct;
- struct vm_area_struct;
- 
--extern pgd_t swapper_pg_dir[1024];
--
- static inline void pgtable_cache_init(void) { }
- static inline void check_pgt_cache(void) { }
- void paging_init(void);
-@@ -48,6 +46,11 @@ extern void set_pmd_pfn(unsigned long, u
- # include <asm/pgtable-2level.h>
- #endif
- 
-+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-+#ifdef CONFIG_X86_PAE
-+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
-+#endif
-+
- #if defined(CONFIG_HIGHPTE)
- #define __KM_PTE			\
- 	(in_nmi() ? KM_NMI_PTE : 	\
-@@ -72,7 +75,9 @@ extern void set_pmd_pfn(unsigned long, u
- /* Clear a kernel PTE and flush it from the TLB */
- #define kpte_clear_flush(ptep, vaddr)		\
- do {						\
-+	pax_open_kernel();			\
- 	pte_clear(&init_mm, (vaddr), (ptep));	\
-+	pax_close_kernel();			\
- 	__flush_tlb_one((vaddr));		\
- } while (0)
- 
-@@ -84,6 +89,9 @@ do {						\
- 
- #endif /* !__ASSEMBLY__ */
- 
-+#define HAVE_ARCH_UNMAPPED_AREA
-+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
-+
- /*
-  * kern_addr_valid() is (1) for FLATMEM and (0) for
-  * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h	2010-05-15 13:21:13.902905019 -0400
-@@ -8,7 +8,7 @@
-  */
- #ifdef CONFIG_X86_PAE
- # include <asm/pgtable-3level_types.h>
--# define PMD_SIZE	(1UL << PMD_SHIFT)
-+# define PMD_SIZE	(_AC(1, UL) << PMD_SHIFT)
- # define PMD_MASK	(~(PMD_SIZE - 1))
- #else
- # include <asm/pgtable-2level_types.h>
-@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set 
- # define VMALLOC_END	(FIXADDR_START - 2 * PAGE_SIZE)
- #endif
- 
-+#ifdef CONFIG_PAX_KERNEXEC
-+#ifndef __ASSEMBLY__
-+extern unsigned char MODULES_EXEC_VADDR[];
-+extern unsigned char MODULES_EXEC_END[];
-+#endif
-+#include <asm/boot.h>
-+#define ktla_ktva(addr)		(addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
-+#define ktva_ktla(addr)		(addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
-+#else
-+#define ktla_ktva(addr)		(addr)
-+#define ktva_ktla(addr)		(addr)
-+#endif
-+
- #define MODULES_VADDR	VMALLOC_START
- #define MODULES_END	VMALLOC_END
- #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h	2010-05-15 13:21:13.902905019 -0400
-@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
+diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
+index 177b016..a526e3c 100644
+--- a/arch/x86/include/asm/pgtable-3level.h
++++ b/arch/x86/include/asm/pgtable-3level.h
+@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
  {
@@ -7783,69 +8593,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.13
  }
  
  /*
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h	2010-05-15 13:21:13.906812769 -0400
-@@ -16,10 +16,13 @@
- 
- extern pud_t level3_kernel_pgt[512];
- extern pud_t level3_ident_pgt[512];
-+extern pud_t level3_vmalloc_pgt[512];
-+extern pud_t level3_vmemmap_pgt[512];
-+extern pud_t level2_vmemmap_pgt[512];
- extern pmd_t level2_kernel_pgt[512];
- extern pmd_t level2_fixmap_pgt[512];
--extern pmd_t level2_ident_pgt[512];
--extern pgd_t init_level4_pgt[];
-+extern pmd_t level2_ident_pgt[512*2];
-+extern pgd_t init_level4_pgt[512];
- 
- #define swapper_pg_dir init_level4_pgt
- 
-@@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_
- 
- static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
- {
-+	pax_open_kernel();
- 	*pmdp = pmd;
-+	pax_close_kernel();
- }
- 
- static inline void native_pmd_clear(pmd_t *pmd)
-@@ -94,12 +99,18 @@ static inline void native_pud_clear(pud_
- 
- static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
- {
-+	pax_open_kernel();
- 	*pgdp = pgd;
-+	pax_close_kernel();
- }
- 
- static inline void native_pgd_clear(pgd_t *pgd)
- {
-+
-+#ifndef CONFIG_PAX_PER_CPU_PGD
- 	native_set_pgd(pgd, native_make_pgd(0));
-+#endif
-+
- }
- 
- /*
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h	2010-05-15 13:23:38.946686210 -0400
-@@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t;
- #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
- #define MODULES_END      _AC(0xffffffffff000000, UL)
- #define MODULES_LEN   (MODULES_END - MODULES_VADDR)
-+#define MODULES_EXEC_VADDR MODULES_VADDR
-+#define MODULES_EXEC_END MODULES_END
- 
- #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x86/include/asm/pgtable.h
---- linux-2.6.32.13/arch/x86/include/asm/pgtable.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/pgtable.h	2010-05-15 13:21:13.906812769 -0400
-@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
+diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
+index a34c785..5df98f8 100644
+--- a/arch/x86/include/asm/pgtable.h
++++ b/arch/x86/include/asm/pgtable.h
+@@ -76,12 +76,51 @@ extern struct list_head pgd_list;
  
  #define arch_end_context_switch(prev)	do {} while(0)
  
@@ -7897,7 +8649,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x
  static inline int pte_dirty(pte_t pte)
  {
  	return pte_flags(pte) & _PAGE_DIRTY;
-@@ -167,9 +206,29 @@ static inline pte_t pte_wrprotect(pte_t 
+@@ -169,9 +208,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
  	return pte_clear_flags(pte, _PAGE_RW);
  }
  
@@ -7928,7 +8680,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x
  }
  
  static inline pte_t pte_mkdirty(pte_t pte)
-@@ -302,6 +361,15 @@ pte_t *populate_extra_pte(unsigned long 
+@@ -304,6 +363,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
  #endif
  
  #ifndef __ASSEMBLY__
@@ -7944,7 +8696,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x
  #include <linux/mm_types.h>
  
  static inline int pte_none(pte_t pte)
-@@ -472,7 +540,7 @@ static inline pud_t *pud_offset(pgd_t *p
+@@ -474,7 +542,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
  
  static inline int pgd_bad(pgd_t pgd)
  {
@@ -7953,7 +8705,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x
  }
  
  static inline int pgd_none(pgd_t pgd)
-@@ -495,7 +563,12 @@ static inline int pgd_none(pgd_t pgd)
+@@ -497,7 +565,12 @@ static inline int pgd_none(pgd_t pgd)
   * pgd_offset() returns a (pgd_t *)
   * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
   */
@@ -7967,7 +8719,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x
  /*
   * a shortcut which implies the use of the kernel's pgd, instead
   * of a process's
-@@ -506,6 +579,20 @@ static inline int pgd_none(pgd_t pgd)
+@@ -508,6 +581,20 @@ static inline int pgd_none(pgd_t pgd)
  #define KERNEL_PGD_BOUNDARY	pgd_index(PAGE_OFFSET)
  #define KERNEL_PGD_PTRS		(PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
  
@@ -7988,7 +8740,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x
  #ifndef __ASSEMBLY__
  
  extern int direct_gbpages;
-@@ -611,11 +698,18 @@ static inline void ptep_set_wrprotect(st
+@@ -613,11 +700,23 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm,
   * dst and src can be on the same page, but the range must not overlap,
   * and must not cross a page boundary.
   */
@@ -8004,14 +8756,155 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x
  
 +#ifdef CONFIG_PAX_PER_CPU_PGD
 +extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count);
++#endif
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count);
++#else
++static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) {}
 +#endif
  
  #include <asm-generic/pgtable.h>
  #endif	/* __ASSEMBLY__ */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h	2010-05-15 13:21:13.906812769 -0400
+diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
+index f686f49..e16ed74 100644
+--- a/arch/x86/include/asm/pgtable_32.h
++++ b/arch/x86/include/asm/pgtable_32.h
+@@ -25,9 +25,6 @@
+ struct mm_struct;
+ struct vm_area_struct;
+ 
+-extern pgd_t swapper_pg_dir[1024];
+-extern pgd_t trampoline_pg_dir[1024];
+-
+ static inline void pgtable_cache_init(void) { }
+ static inline void check_pgt_cache(void) { }
+ void paging_init(void);
+@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
+ # include <asm/pgtable-2level.h>
+ #endif
+ 
++extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
++extern pgd_t trampoline_pg_dir[PTRS_PER_PGD];
++#ifdef CONFIG_X86_PAE
++extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
++#endif
++
+ #if defined(CONFIG_HIGHPTE)
+ #define __KM_PTE			\
+ 	(in_nmi() ? KM_NMI_PTE : 	\
+@@ -72,7 +75,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
+ /* Clear a kernel PTE and flush it from the TLB */
+ #define kpte_clear_flush(ptep, vaddr)		\
+ do {						\
++	pax_open_kernel();			\
+ 	pte_clear(&init_mm, (vaddr), (ptep));	\
++	pax_close_kernel();			\
+ 	__flush_tlb_one((vaddr));		\
+ } while (0)
+ 
+@@ -84,6 +89,9 @@ do {						\
+ 
+ #endif /* !__ASSEMBLY__ */
+ 
++#define HAVE_ARCH_UNMAPPED_AREA
++#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
++
+ /*
+  * kern_addr_valid() is (1) for FLATMEM and (0) for
+  * SPARSEMEM and DISCONTIGMEM
+diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
+index ed5903b..c7fe163 100644
+--- a/arch/x86/include/asm/pgtable_32_types.h
++++ b/arch/x86/include/asm/pgtable_32_types.h
+@@ -8,7 +8,7 @@
+  */
+ #ifdef CONFIG_X86_PAE
+ # include <asm/pgtable-3level_types.h>
+-# define PMD_SIZE	(1UL << PMD_SHIFT)
++# define PMD_SIZE	(_AC(1, UL) << PMD_SHIFT)
+ # define PMD_MASK	(~(PMD_SIZE - 1))
+ #else
+ # include <asm/pgtable-2level_types.h>
+@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
+ # define VMALLOC_END	(FIXADDR_START - 2 * PAGE_SIZE)
+ #endif
+ 
++#ifdef CONFIG_PAX_KERNEXEC
++#ifndef __ASSEMBLY__
++extern unsigned char MODULES_EXEC_VADDR[];
++extern unsigned char MODULES_EXEC_END[];
++#endif
++#include <asm/boot.h>
++#define ktla_ktva(addr)		(addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
++#define ktva_ktla(addr)		(addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
++#else
++#define ktla_ktva(addr)		(addr)
++#define ktva_ktla(addr)		(addr)
++#endif
++
+ #define MODULES_VADDR	VMALLOC_START
+ #define MODULES_END	VMALLOC_END
+ #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
+diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
+index 181be52..7ab9c31 100644
+--- a/arch/x86/include/asm/pgtable_64.h
++++ b/arch/x86/include/asm/pgtable_64.h
+@@ -16,10 +16,13 @@
+ 
+ extern pud_t level3_kernel_pgt[512];
+ extern pud_t level3_ident_pgt[512];
++extern pud_t level3_vmalloc_pgt[512];
++extern pud_t level3_vmemmap_pgt[512];
++extern pud_t level2_vmemmap_pgt[512];
+ extern pmd_t level2_kernel_pgt[512];
+ extern pmd_t level2_fixmap_pgt[512];
+-extern pmd_t level2_ident_pgt[512];
+-extern pgd_t init_level4_pgt[];
++extern pmd_t level2_ident_pgt[512*2];
++extern pgd_t init_level4_pgt[512];
+ 
+ #define swapper_pg_dir init_level4_pgt
+ 
+@@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_clear(pte_t *xp)
+ 
+ static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
+ {
++	pax_open_kernel();
+ 	*pmdp = pmd;
++	pax_close_kernel();
+ }
+ 
+ static inline void native_pmd_clear(pmd_t *pmd)
+@@ -94,7 +99,9 @@ static inline void native_pud_clear(pud_t *pud)
+ 
+ static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
+ {
++	pax_open_kernel();
+ 	*pgdp = pgd;
++	pax_close_kernel();
+ }
+ 
+ static inline void native_pgd_clear(pgd_t *pgd)
+diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
+index 766ea16..5b96cb3 100644
+--- a/arch/x86/include/asm/pgtable_64_types.h
++++ b/arch/x86/include/asm/pgtable_64_types.h
+@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
+ #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
+ #define MODULES_END      _AC(0xffffffffff000000, UL)
+ #define MODULES_LEN   (MODULES_END - MODULES_VADDR)
++#define MODULES_EXEC_VADDR MODULES_VADDR
++#define MODULES_EXEC_END MODULES_END
++
++#define ktla_ktva(addr)		(addr)
++#define ktva_ktla(addr)		(addr)
+ 
+ #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
+diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
+index d1f4a76..e1f9b51 100644
+--- a/arch/x86/include/asm/pgtable_types.h
++++ b/arch/x86/include/asm/pgtable_types.h
 @@ -16,12 +16,11 @@
  #define _PAGE_BIT_PSE		7	/* 4 MB (or 2MB) page */
  #define _PAGE_BIT_PAT		7	/* on 4KB pages */
@@ -8079,27 +8972,55 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h linux-2.6.32.13/
  #define PGD_IDENT_ATTR	 0x001		/* PRESENT (no other attributes) */
  #endif
  
-@@ -278,7 +281,16 @@ typedef struct page *pgtable_t;
+@@ -202,7 +205,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
+ {
+ 	return native_pgd_val(pgd) & PTE_FLAGS_MASK;
+ }
++#endif
  
- extern pteval_t __supported_pte_mask;
- extern void set_nx(void);
-+
-+#ifdef CONFIG_X86_32
-+#ifdef CONFIG_X86_PAE
- extern int nx_enabled;
-+#else
-+#define nx_enabled (0)
++#if PAGETABLE_LEVELS == 3
++#include <asm-generic/pgtable-nopud.h>
 +#endif
-+#else
-+#define nx_enabled (1)
++
++#if PAGETABLE_LEVELS == 2
++#include <asm-generic/pgtable-nopmd.h>
 +#endif
++
++#ifndef __ASSEMBLY__
+ #if PAGETABLE_LEVELS > 3
+ typedef struct { pudval_t pud; } pud_t;
+ 
+@@ -216,8 +229,6 @@ static inline pudval_t native_pud_val(pud_t pud)
+ 	return pud.pud;
+ }
+ #else
+-#include <asm-generic/pgtable-nopud.h>
+-
+ static inline pudval_t native_pud_val(pud_t pud)
+ {
+ 	return native_pgd_val(pud.pgd);
+@@ -237,8 +248,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
+ 	return pmd.pmd;
+ }
+ #else
+-#include <asm-generic/pgtable-nopmd.h>
+-
+ static inline pmdval_t native_pmd_val(pmd_t pmd)
+ {
+ 	return native_pgd_val(pmd.pud.pgd);
+@@ -278,7 +287,6 @@ typedef struct page *pgtable_t;
+ 
+ extern pteval_t __supported_pte_mask;
+ extern void set_nx(void);
+-extern int nx_enabled;
  
  #define pgprot_writecombine	pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch/x86/include/asm/processor.h
---- linux-2.6.32.13/arch/x86/include/asm/processor.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/processor.h	2010-05-15 13:21:13.906812769 -0400
-@@ -272,7 +272,7 @@ struct tss_struct {
+diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
+index 7e5c6a6..7093da3 100644
+--- a/arch/x86/include/asm/processor.h
++++ b/arch/x86/include/asm/processor.h
+@@ -269,7 +269,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
  
@@ -8108,7 +9029,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch
  
  /*
   * Save the original ist values for checking stack pointers during debugging
-@@ -911,8 +911,15 @@ static inline void spin_lock_prefetch(co
+@@ -884,8 +884,15 @@ static inline void spin_lock_prefetch(const void *x)
   */
  #define TASK_SIZE		PAGE_OFFSET
  #define TASK_SIZE_MAX		TASK_SIZE
@@ -8125,7 +9046,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch
  
  #define INIT_THREAD  {							  \
  	.sp0			= sizeof(init_stack) + (long)&init_stack, \
-@@ -929,7 +936,7 @@ static inline void spin_lock_prefetch(co
+@@ -902,7 +909,7 @@ static inline void spin_lock_prefetch(const void *x)
   */
  #define INIT_TSS  {							  \
  	.x86_tss = {							  \
@@ -8134,7 +9055,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch
  		.ss0		= __KERNEL_DS,				  \
  		.ss1		= __KERNEL_CS,				  \
  		.io_bitmap_base	= INVALID_IO_BITMAP_OFFSET,		  \
-@@ -940,11 +947,7 @@ static inline void spin_lock_prefetch(co
+@@ -913,11 +920,7 @@ static inline void spin_lock_prefetch(const void *x)
  extern unsigned long thread_saved_pc(struct task_struct *tsk);
  
  #define THREAD_SIZE_LONGS      (THREAD_SIZE/sizeof(unsigned long))
@@ -8147,7 +9068,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch
  
  /*
   * The below -8 is to reserve 8 bytes on top of the ring0 stack.
-@@ -959,7 +962,7 @@ extern unsigned long thread_saved_pc(str
+@@ -932,7 +935,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
  #define task_pt_regs(task)                                             \
  ({                                                                     \
         struct pt_regs *__regs__;                                       \
@@ -8156,7 +9077,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch
         __regs__ - 1;                                                   \
  })
  
-@@ -969,13 +972,13 @@ extern unsigned long thread_saved_pc(str
+@@ -942,13 +945,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
  /*
   * User space process size. 47bits minus one guard page.
   */
@@ -8172,7 +9093,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch
  
  #define TASK_SIZE		(test_thread_flag(TIF_IA32) ? \
  					IA32_PAGE_OFFSET : TASK_SIZE_MAX)
-@@ -1012,6 +1015,10 @@ extern void start_thread(struct pt_regs 
+@@ -985,6 +988,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
   */
  #define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
  
@@ -8183,10 +9104,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch
  #define KSTK_EIP(task)		(task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/ptrace.h linux-2.6.32.13/arch/x86/include/asm/ptrace.h
---- linux-2.6.32.13/arch/x86/include/asm/ptrace.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/ptrace.h	2010-05-15 13:21:13.906812769 -0400
-@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
+diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
+index 78cd1ea..37bd171 100644
+--- a/arch/x86/include/asm/ptrace.h
++++ b/arch/x86/include/asm/ptrace.h
+@@ -152,28 +152,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
  }
  
  /*
@@ -8222,9 +9144,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/ptrace.h linux-2.6.32.13/arch/x8
  #endif
  }
  
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/reboot.h linux-2.6.32.13/arch/x86/include/asm/reboot.h
---- linux-2.6.32.13/arch/x86/include/asm/reboot.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/reboot.h	2010-05-15 13:21:13.906812769 -0400
+diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
+index 562d4fd..cb2d6ba 100644
+--- a/arch/x86/include/asm/reboot.h
++++ b/arch/x86/include/asm/reboot.h
 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
  
  void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -8234,10 +9157,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/reboot.h linux-2.6.32.13/arch/x8
  
  typedef void (*nmi_shootdown_cb)(int, struct die_args*);
  void nmi_shootdown_cpus(nmi_shootdown_cb callback);
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86/include/asm/rwsem.h
---- linux-2.6.32.13/arch/x86/include/asm/rwsem.h	2010-04-29 17:49:37.501451369 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/rwsem.h	2010-05-15 13:21:13.906812769 -0400
-@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
+diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
+index 606ede1..45b2044 100644
+--- a/arch/x86/include/asm/rwsem.h
++++ b/arch/x86/include/asm/rwsem.h
+@@ -118,10 +118,26 @@ static inline void __down_read(struct rw_semaphore *sem)
  {
  	asm volatile("# beginning down_read\n\t"
  		     LOCK_PREFIX _ASM_INC "(%1)\n\t"
@@ -8251,7 +9175,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86
 +#endif
 +		     ".pushsection .fixup,\"ax\"\n"
 +		     "1:\n"
-+		     LOCK_PREFIX _ASM_DEC "(%1)\n\t"
++		     LOCK_PREFIX _ASM_DEC "(%1)\n"
 +		     "jmp 0b\n"
 +		     ".popsection\n"
 +		     _ASM_EXTABLE(0b, 1b)
@@ -8266,7 +9190,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86
  		     "# ending down_read\n\t"
  		     : "+m" (sem->count)
  		     : "a" (sem)
-@@ -136,13 +152,29 @@ static inline int __down_read_trylock(st
+@@ -136,13 +152,29 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
  	rwsem_count_t result, tmp;
  	asm volatile("# beginning __down_read_trylock\n\t"
  		     "  mov          %0,%1\n\t"
@@ -8300,7 +9224,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86
  		     "# ending __down_read_trylock\n\t"
  		     : "+m" (sem->count), "=&a" (result), "=&r" (tmp)
  		     : "i" (RWSEM_ACTIVE_READ_BIAS)
-@@ -160,12 +192,28 @@ static inline void __down_write_nested(s
+@@ -160,12 +192,28 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
  	tmp = RWSEM_ACTIVE_WRITE_BIAS;
  	asm volatile("# beginning down_write\n\t"
  		     LOCK_PREFIX "  xadd      %1,(%2)\n\t"
@@ -8331,7 +9255,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86
  		     "# ending down_write"
  		     : "+m" (sem->count), "=d" (tmp)
  		     : "a" (sem), "1" (tmp)
-@@ -198,10 +246,26 @@ static inline void __up_read(struct rw_s
+@@ -198,10 +246,26 @@ static inline void __up_read(struct rw_semaphore *sem)
  	rwsem_count_t tmp = -RWSEM_ACTIVE_READ_BIAS;
  	asm volatile("# beginning __up_read\n\t"
  		     LOCK_PREFIX "  xadd      %1,(%2)\n\t"
@@ -8360,7 +9284,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86
  		     "# ending __up_read\n"
  		     : "+m" (sem->count), "=d" (tmp)
  		     : "a" (sem), "1" (tmp)
-@@ -216,11 +280,27 @@ static inline void __up_write(struct rw_
+@@ -216,11 +280,27 @@ static inline void __up_write(struct rw_semaphore *sem)
  	rwsem_count_t tmp;
  	asm volatile("# beginning __up_write\n\t"
  		     LOCK_PREFIX "  xadd      %1,(%2)\n\t"
@@ -8390,7 +9314,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86
  		     "# ending __up_write\n"
  		     : "+m" (sem->count), "=d" (tmp)
  		     : "a" (sem), "1" (-RWSEM_ACTIVE_WRITE_BIAS)
-@@ -234,13 +314,29 @@ static inline void __downgrade_write(str
+@@ -234,13 +314,29 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
  {
  	asm volatile("# beginning __downgrade_write\n\t"
  		     LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
@@ -8422,7 +9346,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86
  		     "# ending __downgrade_write\n"
  		     : "+m" (sem->count)
  		     : "a" (sem), "er" (-RWSEM_WAITING_BIAS)
-@@ -253,7 +349,23 @@ static inline void __downgrade_write(str
+@@ -253,7 +349,23 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
  static inline void rwsem_atomic_add(rwsem_count_t delta,
  				    struct rw_semaphore *sem)
  {
@@ -8447,7 +9371,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86
  		     : "+m" (sem->count)
  		     : "er" (delta));
  }
-@@ -266,7 +378,23 @@ static inline rwsem_count_t rwsem_atomic
+@@ -266,7 +378,23 @@ static inline rwsem_count_t rwsem_atomic_update(rwsem_count_t delta,
  {
  	rwsem_count_t tmp = delta;
  
@@ -8472,9 +9396,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86
  		     : "+r" (tmp), "+m" (sem->count)
  		     : : "memory");
  
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/segment.h linux-2.6.32.13/arch/x86/include/asm/segment.h
---- linux-2.6.32.13/arch/x86/include/asm/segment.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/segment.h	2010-05-15 13:21:13.906812769 -0400
+diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
+index 14e0ed8..7bad9b6 100644
+--- a/arch/x86/include/asm/segment.h
++++ b/arch/x86/include/asm/segment.h
 @@ -62,8 +62,8 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu			[ offset to per-cpu data area ]
@@ -8543,11 +9468,25 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/segment.h linux-2.6.32.13/arch/x
  #define __KERNEL_DS	(GDT_ENTRY_KERNEL_DS * 8)
  #define __USER_DS     (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
  #define __USER_CS     (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/spinlock.h linux-2.6.32.13/arch/x86/include/asm/spinlock.h
---- linux-2.6.32.13/arch/x86/include/asm/spinlock.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/spinlock.h	2010-05-15 13:21:13.906812769 -0400
-@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
- static inline void __raw_read_lock(raw_rwlock_t *rw)
+diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
+index 4c2f63c..06ded5b 100644
+--- a/arch/x86/include/asm/smp.h
++++ b/arch/x86/include/asm/smp.h
+@@ -24,7 +24,7 @@ extern unsigned int num_processors;
+ DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
+ DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
+ DECLARE_PER_CPU(u16, cpu_llc_id);
+-DECLARE_PER_CPU(int, cpu_number);
++DECLARE_PER_CPU(unsigned int, cpu_number);
+ 
+ static inline struct cpumask *cpu_sibling_mask(int cpu)
+ {
+diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
+index 3089f70..8a618b0 100644
+--- a/arch/x86/include/asm/spinlock.h
++++ b/arch/x86/include/asm/spinlock.h
+@@ -249,18 +249,50 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
+ static inline void arch_read_lock(arch_rwlock_t *rw)
  {
  	asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t"
 -		     "jns 1f\n"
@@ -8574,7 +9513,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/spinlock.h linux-2.6.32.13/arch/
  		     ::LOCK_PTR_REG (rw) : "memory");
  }
  
- static inline void __raw_write_lock(raw_rwlock_t *rw)
+ static inline void arch_write_lock(arch_rwlock_t *rw)
  {
  	asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t"
 -		     "jz 1f\n"
@@ -8601,9 +9540,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/spinlock.h linux-2.6.32.13/arch/
  		     ::LOCK_PTR_REG (rw), "i" (RW_LOCK_BIAS) : "memory");
  }
  
-@@ -286,12 +318,45 @@ static inline int __raw_write_trylock(ra
+@@ -286,12 +318,45 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
  
- static inline void __raw_read_unlock(raw_rwlock_t *rw)
+ 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"
@@ -8626,7 +9565,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/spinlock.h linux-2.6.32.13/arch/
 +		     :"+m" (rw->lock) : : "memory");
  }
  
- static inline void __raw_write_unlock(raw_rwlock_t *rw)
+ 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"
@@ -8649,10 +9588,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/spinlock.h linux-2.6.32.13/arch/
  		     : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/system.h linux-2.6.32.13/arch/x86/include/asm/system.h
---- linux-2.6.32.13/arch/x86/include/asm/system.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/system.h	2010-05-15 13:21:13.906812769 -0400
-@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
+diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
+index e7f4d33..0bef582 100644
+--- a/arch/x86/include/asm/system.h
++++ b/arch/x86/include/asm/system.h
+@@ -202,7 +202,7 @@ static inline unsigned long get_limit(unsigned long segment)
  {
  	unsigned long __limit;
  	asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
@@ -8661,7 +9601,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/system.h linux-2.6.32.13/arch/x8
  }
  
  static inline void native_clts(void)
-@@ -340,7 +340,7 @@ void enable_hlt(void);
+@@ -342,7 +342,7 @@ void enable_hlt(void);
  
  void cpu_idle_wait(void);
  
@@ -8670,10 +9610,239 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/system.h linux-2.6.32.13/arch/x8
  extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
  
  void default_idle(void);
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h	2010-05-15 13:21:13.906812769 -0400
-@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
+diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
+index abd3e0e..cbddafc 100644
+--- a/arch/x86/include/asm/uaccess.h
++++ b/arch/x86/include/asm/uaccess.h
+@@ -8,12 +8,15 @@
+ #include <linux/thread_info.h>
+ #include <linux/prefetch.h>
+ #include <linux/string.h>
++#include <linux/sched.h>
+ #include <asm/asm.h>
+ #include <asm/page.h>
+ 
+ #define VERIFY_READ 0
+ #define VERIFY_WRITE 1
+ 
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++
+ /*
+  * The fs value determines whether argument validity checking should be
+  * performed or not.  If get_fs() == USER_DS, checking is performed, with
+@@ -29,7 +32,12 @@
+ 
+ #define get_ds()	(KERNEL_DS)
+ #define get_fs()	(current_thread_info()->addr_limit)
++#ifdef CONFIG_X86_32
++void __set_fs(mm_segment_t x, int cpu);
++void set_fs(mm_segment_t x);
++#else
+ #define set_fs(x)	(current_thread_info()->addr_limit = (x))
++#endif
+ 
+ #define segment_eq(a, b)	((a).seg == (b).seg)
+ 
+@@ -77,7 +85,33 @@
+  * checks that the pointer is in the user space range - after calling
+  * this function, memory access functions may still return -EFAULT.
+  */
+-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
++#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
++#define access_ok(type, addr, size)					\
++({									\
++	long __size = size;						\
++	unsigned long __addr = (unsigned long)addr;			\
++	unsigned long __addr_ao = __addr & PAGE_MASK;			\
++	unsigned long __end_ao = __addr + __size - 1;			\
++	bool __ret_ao = __range_not_ok(__addr, __size) == 0;		\
++	if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) {	\
++		while(__addr_ao <= __end_ao) {				\
++			char __c_ao;					\
++			__addr_ao += PAGE_SIZE;				\
++			if (__size > PAGE_SIZE)				\
++				cond_resched();				\
++			if (__get_user(__c_ao, (char __user *)__addr))	\
++				break;					\
++			if (type != VERIFY_WRITE) {			\
++				__addr = __addr_ao;			\
++				continue;				\
++			}						\
++			if (__put_user(__c_ao, (char __user *)__addr))	\
++				break;					\
++			__addr = __addr_ao;				\
++		}							\
++	}								\
++	__ret_ao;							\
++})
+ 
+ /*
+  * The exception table consists of pairs of addresses: the first is the
+@@ -183,13 +217,21 @@ extern int __get_user_bad(void);
+ 	asm volatile("call __put_user_" #size : "=a" (__ret_pu)	\
+ 		     : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
+ 
+-
++#ifdef CONFIG_X86_32
++#define _ASM_LOAD_USER_DS(ds) "movw %w" #ds ",%%ds\n"
++#define _ASM_LOAD_KERNEL_DS "pushl %%ss; popl %%ds\n"
++#else
++#define _ASM_LOAD_USER_DS(ds)
++#define _ASM_LOAD_KERNEL_DS
++#endif
+ 
+ #ifdef CONFIG_X86_32
+ #define __put_user_asm_u64(x, addr, err, errret)			\
+-	asm volatile("1:	movl %%eax,0(%2)\n"			\
+-		     "2:	movl %%edx,4(%2)\n"			\
++	asm volatile(_ASM_LOAD_USER_DS(5)				\
++		     "1:	movl %%eax,%%ds:0(%2)\n"		\
++		     "2:	movl %%edx,%%ds:4(%2)\n"		\
+ 		     "3:\n"						\
++		     _ASM_LOAD_KERNEL_DS				\
+ 		     ".section .fixup,\"ax\"\n"				\
+ 		     "4:	movl %3,%0\n"				\
+ 		     "	jmp 3b\n"					\
+@@ -197,15 +239,18 @@ extern int __get_user_bad(void);
+ 		     _ASM_EXTABLE(1b, 4b)				\
+ 		     _ASM_EXTABLE(2b, 4b)				\
+ 		     : "=r" (err)					\
+-		     : "A" (x), "r" (addr), "i" (errret), "0" (err))
++		     : "A" (x), "r" (addr), "i" (errret), "0" (err),	\
++		       "r"(__USER_DS))
+ 
+ #define __put_user_asm_ex_u64(x, addr)					\
+-	asm volatile("1:	movl %%eax,0(%1)\n"			\
+-		     "2:	movl %%edx,4(%1)\n"			\
++	asm volatile(_ASM_LOAD_USER_DS(2)				\
++		     "1:	movl %%eax,%%ds:0(%1)\n"		\
++		     "2:	movl %%edx,%%ds:4(%1)\n"		\
+ 		     "3:\n"						\
++		     _ASM_LOAD_KERNEL_DS				\
+ 		     _ASM_EXTABLE(1b, 2b - 1b)				\
+ 		     _ASM_EXTABLE(2b, 3b - 2b)				\
+-		     : : "A" (x), "r" (addr))
++		     : : "A" (x), "r" (addr), "r"(__USER_DS))
+ 
+ #define __put_user_x8(x, ptr, __ret_pu)				\
+ 	asm volatile("call __put_user_8" : "=a" (__ret_pu)	\
+@@ -374,16 +419,18 @@ do {									\
+ } while (0)
+ 
+ #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret)	\
+-	asm volatile("1:	mov"itype" %2,%"rtype"1\n"		\
++	asm volatile(_ASM_LOAD_USER_DS(5)				\
++		     "1:	mov"itype" %%ds:%2,%"rtype"1\n"		\
+ 		     "2:\n"						\
++		     _ASM_LOAD_KERNEL_DS				\
+ 		     ".section .fixup,\"ax\"\n"				\
+ 		     "3:	mov %3,%0\n"				\
+ 		     "	xor"itype" %"rtype"1,%"rtype"1\n"		\
+ 		     "	jmp 2b\n"					\
+ 		     ".previous\n"					\
+ 		     _ASM_EXTABLE(1b, 3b)				\
+-		     : "=r" (err), ltype(x)				\
+-		     : "m" (__m(addr)), "i" (errret), "0" (err))
++		     : "=r" (err), ltype (x)				\
++		     : "m" (__m(addr)), "i" (errret), "0" (err), "r"(__USER_DS))
+ 
+ #define __get_user_size_ex(x, ptr, size)				\
+ do {									\
+@@ -407,10 +454,12 @@ do {									\
+ } while (0)
+ 
+ #define __get_user_asm_ex(x, addr, itype, rtype, ltype)			\
+-	asm volatile("1:	mov"itype" %1,%"rtype"0\n"		\
++	asm volatile(_ASM_LOAD_USER_DS(2)				\
++		     "1:	mov"itype" %%ds:%1,%"rtype"0\n"		\
+ 		     "2:\n"						\
++		     _ASM_LOAD_KERNEL_DS				\
+ 		     _ASM_EXTABLE(1b, 2b - 1b)				\
+-		     : ltype(x) : "m" (__m(addr)))
++		     : ltype(x) : "m" (__m(addr)), "r"(__USER_DS))
+ 
+ #define __put_user_nocheck(x, ptr, size)			\
+ ({								\
+@@ -424,13 +473,24 @@ do {									\
+ 	int __gu_err;							\
+ 	unsigned long __gu_val;						\
+ 	__get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT);	\
+-	(x) = (__force __typeof__(*(ptr)))__gu_val;			\
++	(x) = (__typeof__(*(ptr)))__gu_val;				\
+ 	__gu_err;							\
+ })
+ 
+ /* FIXME: this hack is definitely wrong -AK */
+ struct __large_struct { unsigned long buf[100]; };
+-#define __m(x) (*(struct __large_struct __user *)(x))
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define ____m(x)					\
++({							\
++	unsigned long ____x = (unsigned long)(x);	\
++	if (____x < PAX_USER_SHADOW_BASE)		\
++		____x += PAX_USER_SHADOW_BASE;		\
++	(void __user *)____x;				\
++})
++#else
++#define ____m(x) (x)
++#endif
++#define __m(x) (*(struct __large_struct __user *)____m(x))
+ 
+ /*
+  * Tell gcc we read from memory instead of writing: this is because
+@@ -438,21 +498,26 @@ struct __large_struct { unsigned long buf[100]; };
+  * aliasing issues.
+  */
+ #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret)	\
+-	asm volatile("1:	mov"itype" %"rtype"1,%2\n"		\
++	asm volatile(_ASM_LOAD_USER_DS(5)				\
++		     "1:	mov"itype" %"rtype"1,%%ds:%2\n"		\
+ 		     "2:\n"						\
++		     _ASM_LOAD_KERNEL_DS				\
+ 		     ".section .fixup,\"ax\"\n"				\
+ 		     "3:	mov %3,%0\n"				\
+ 		     "	jmp 2b\n"					\
+ 		     ".previous\n"					\
+ 		     _ASM_EXTABLE(1b, 3b)				\
+ 		     : "=r"(err)					\
+-		     : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
++		     : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err),\
++		       "r"(__USER_DS))
+ 
+ #define __put_user_asm_ex(x, addr, itype, rtype, ltype)			\
+-	asm volatile("1:	mov"itype" %"rtype"0,%1\n"		\
++	asm volatile(_ASM_LOAD_USER_DS(2)				\
++		     "1:	mov"itype" %"rtype"0,%%ds:%1\n"		\
+ 		     "2:\n"						\
++		     _ASM_LOAD_KERNEL_DS				\
+ 		     _ASM_EXTABLE(1b, 2b - 1b)				\
+-		     : : ltype(x), "m" (__m(addr)))
++		     : : ltype(x), "m" (__m(addr)), "r"(__USER_DS))
+ 
+ /*
+  * uaccess_try and catch
+@@ -530,7 +595,7 @@ struct __large_struct { unsigned long buf[100]; };
+ #define get_user_ex(x, ptr)	do {					\
+ 	unsigned long __gue_val;					\
+ 	__get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr))));	\
+-	(x) = (__force __typeof__(*(ptr)))__gue_val;			\
++	(x) = (__typeof__(*(ptr)))__gue_val;				\
+ } while (0)
+ 
+ #ifdef CONFIG_X86_WP_WORKS_OK
+@@ -567,6 +632,7 @@ extern struct movsl_mask {
+ 
+ #define ARCH_HAS_NOCACHE_UACCESS 1
+ 
++#define ARCH_HAS_SORT_EXTABLE
+ #ifdef CONFIG_X86_32
+ # include "uaccess_32.h"
+ #else
+diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
+index 088d09f..c719d0a 100644
+--- a/arch/x86/include/asm/uaccess_32.h
++++ b/arch/x86/include/asm/uaccess_32.h
+@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
  static __always_inline unsigned long __must_check
  __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
  {
@@ -8683,7 +9852,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arc
  	if (__builtin_constant_p(n)) {
  		unsigned long ret;
  
-@@ -62,6 +65,8 @@ __copy_to_user_inatomic(void __user *to,
+@@ -62,6 +65,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
  			return ret;
  		}
  	}
@@ -8692,7 +9861,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arc
  	return __copy_to_user_ll(to, from, n);
  }
  
-@@ -89,6 +94,9 @@ __copy_to_user(void __user *to, const vo
+@@ -89,6 +94,9 @@ __copy_to_user(void __user *to, const void *from, unsigned long n)
  static __always_inline unsigned long
  __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
  {
@@ -8713,7 +9882,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arc
  	if (__builtin_constant_p(n)) {
  		unsigned long ret;
  
-@@ -153,6 +165,8 @@ __copy_from_user(void *to, const void __
+@@ -153,6 +165,8 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
  			return ret;
  		}
  	}
@@ -8722,7 +9891,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arc
  	return __copy_from_user_ll(to, from, n);
  }
  
-@@ -160,6 +174,10 @@ static __always_inline unsigned long __c
+@@ -160,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
  				const void __user *from, unsigned long n)
  {
  	might_fault();
@@ -8733,17 +9902,40 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arc
  	if (__builtin_constant_p(n)) {
  		unsigned long ret;
  
-@@ -182,14 +200,62 @@ static __always_inline unsigned long
+@@ -182,15 +200,19 @@ static __always_inline unsigned long
  __copy_from_user_inatomic_nocache(void *to, const void __user *from,
  				  unsigned long n)
  {
 -       return __copy_from_user_ll_nocache_nozero(to, from, n);
+-}
 +	if ((long)n < 0)
 +		return n;
-+
+ 
+-unsigned long __must_check copy_to_user(void __user *to,
+-					const void *from, unsigned long n);
+-unsigned long __must_check _copy_from_user(void *to,
+-					  const void __user *from,
+-					  unsigned long n);
 +	return __copy_from_user_ll_nocache_nozero(to, from, n);
 +}
-+
+ 
++extern void copy_to_user_overflow(void)
++#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
++	__compiletime_error("copy_to_user() buffer size is not provably correct")
++#else
++	__compiletime_warning("copy_to_user() buffer size is not provably correct")
++#endif
++;
+ 
+ extern void copy_from_user_overflow(void)
+ #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
+@@ -200,17 +222,61 @@ extern void copy_from_user_overflow(void)
+ #endif
+ ;
+ 
+-static inline unsigned long __must_check copy_from_user(void *to,
+-					  const void __user *from,
+-					  unsigned long n)
 +/**
 + * copy_to_user: - Copy a block of data into user space.
 + * @to:   Destination address, in user space.
@@ -8757,10 +9949,14 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arc
 + * Returns number of bytes that could not be copied.
 + * On success, this will be zero.
 + */
-+static __always_inline unsigned long __must_check
++static inline unsigned long __must_check
 +copy_to_user(void __user *to, const void *from, unsigned long n)
 +{
-+	if (access_ok(VERIFY_WRITE, to, n))
++	int sz = __compiletime_object_size(from);
++
++	if (unlikely(sz != -1 && sz < n))
++		copy_to_user_overflow();
++	else if (access_ok(VERIFY_WRITE, to, n))
 +		n = __copy_to_user(to, from, n);
 +	return n;
 +}
@@ -8781,33 +9977,34 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arc
 + * If some data could not be copied, this function will pad the copied
 + * data to the requested size using zero bytes.
 + */
-+static __always_inline unsigned long __must_check
++static inline unsigned long __must_check
 +copy_from_user(void *to, const void __user *from, unsigned long n)
-+{
-+	if (access_ok(VERIFY_READ, from, n))
+ {
+ 	int sz = __compiletime_object_size(to);
+ 
+-	if (likely(sz == -1 || sz >= n))
+-		n = _copy_from_user(to, from, n);
+-	else
++	if (unlikely(sz != -1 && sz < n))
+ 		copy_from_user_overflow();
+-
++	else if (access_ok(VERIFY_READ, from, n))
 +		n = __copy_from_user(to, from, n);
 +	else if ((long)n > 0) {
 +		if (!__builtin_constant_p(n))
 +			check_object_size(to, n, false);
 +		memset(to, 0, n);
 +	}
-+	return n;
+ 	return n;
  }
  
--unsigned long __must_check copy_to_user(void __user *to,
--					const void *from, unsigned long n);
--unsigned long __must_check copy_from_user(void *to,
--					  const void __user *from,
--					  unsigned long n);
- long __must_check strncpy_from_user(char *dst, const char __user *src,
- 				    long count);
- long __must_check __strncpy_from_user(char *dst,
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h	2010-05-15 13:21:13.906812769 -0400
-@@ -9,6 +9,9 @@
- #include <linux/prefetch.h>
- #include <linux/lockdep.h>
+diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
+index 316708d..8e13510 100644
+--- a/arch/x86/include/asm/uaccess_64.h
++++ b/arch/x86/include/asm/uaccess_64.h
+@@ -11,6 +11,9 @@
+ #include <asm/alternative.h>
+ #include <asm/cpufeature.h>
  #include <asm/page.h>
 +#include <asm/pgtable.h>
 +
@@ -8815,21 +10012,62 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arc
  
  /*
   * Copy To/From Userspace
-@@ -19,20 +22,24 @@ __must_check unsigned long
- copy_user_generic(void *to, const void *from, unsigned len);
+@@ -37,26 +40,26 @@ copy_user_generic(void *to, const void *from, unsigned len)
+ 	return ret;
+ }
  
- __must_check unsigned long
--copy_to_user(void __user *to, const void *from, unsigned len);
 -__must_check unsigned long
--copy_from_user(void *to, const void __user *from, unsigned len);
+-_copy_to_user(void __user *to, const void *from, unsigned len);
 -__must_check unsigned long
+-_copy_from_user(void *to, const void __user *from, unsigned len);
++static __always_inline __must_check unsigned long
++__copy_to_user(void __user *to, const void *from, unsigned len);
++static __always_inline __must_check unsigned long
++__copy_from_user(void *to, const void __user *from, unsigned len);
+ __must_check unsigned long
  copy_in_user(void __user *to, const void __user *from, unsigned len);
  
+ static inline unsigned long __must_check copy_from_user(void *to,
+ 					  const void __user *from,
+-					  unsigned long n)
++					  unsigned n)
+ {
+-	int sz = __compiletime_object_size(to);
+-
+ 	might_fault();
+-	if (likely(sz == -1 || sz >= n))
+-		n = _copy_from_user(to, from, n);
+-#ifdef CONFIG_DEBUG_VM
+-	else
+-		WARN(1, "Buffer overflow detected!\n");
+-#endif
++
++	if (access_ok(VERIFY_READ, from, n))
++		n = __copy_from_user(to, from, n);
++	else if ((int)n > 0) {
++		if (!__builtin_constant_p(n))
++			check_object_size(to, n, false);
++		memset(to, 0, n);
++	}
+ 	return n;
+ }
+ 
+@@ -65,17 +68,35 @@ int copy_to_user(void __user *dst, const void *src, unsigned size)
+ {
+ 	might_fault();
+ 
+-	return _copy_to_user(dst, src, size);
++	if (access_ok(VERIFY_WRITE, dst, size))
++		size = __copy_to_user(dst, src, size);
++	return size;
+ }
+ 
  static __always_inline __must_check
 -int __copy_from_user(void *dst, const void __user *src, unsigned size)
 +unsigned long __copy_from_user(void *dst, const void __user *src, unsigned size)
  {
 -	int ret = 0;
++	int sz = __compiletime_object_size(dst);
 +	unsigned ret = 0;
  
  	might_fault();
@@ -8838,6 +10076,13 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arc
 +	if ((int)size < 0)
 +		return size;
 +
++	if (unlikely(sz != -1 && sz < size)) {
++#ifdef CONFIG_DEBUG_VM
++		WARN(1, "Buffer overflow detected!\n");
++#endif
++		return size;
++	}
++
 +	if (!__builtin_constant_p(size)) {
 +		check_object_size(dst, size, false);
 +		if ((unsigned long)src < PAX_USER_SHADOW_BASE)
@@ -8847,7 +10092,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arc
  	switch (size) {
  	case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
  			      ret, "b", "b", "=q", 1);
-@@ -65,18 +72,28 @@ int __copy_from_user(void *dst, const vo
+@@ -108,18 +129,36 @@ int __copy_from_user(void *dst, const void __user *src, unsigned size)
  			       ret, "q", "", "=r", 8);
  		return ret;
  	default:
@@ -8862,6 +10107,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arc
 +unsigned long __copy_to_user(void __user *dst, const void *src, unsigned size)
  {
 -	int ret = 0;
++	int sz = __compiletime_object_size(src);
 +	unsigned ret = 0;
  
  	might_fault();
@@ -8870,6 +10116,13 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arc
 +	if ((int)size < 0)
 +		return size;
 +
++	if (unlikely(sz != -1 && sz < size)) {
++#ifdef CONFIG_DEBUG_VM
++		WARN(1, "Buffer overflow detected!\n");
++#endif
++		return size;
++	}
++
 +	if (!__builtin_constant_p(size)) {
 +		check_object_size(src, size, true);
 +		if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
@@ -8879,7 +10132,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arc
  	switch (size) {
  	case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
  			      ret, "b", "b", "iq", 1);
-@@ -109,19 +126,54 @@ int __copy_to_user(void __user *dst, con
+@@ -152,19 +191,30 @@ int __copy_to_user(void __user *dst, const void *src, unsigned size)
  			       ret, "q", "", "er", 8);
  		return ret;
  	default:
@@ -8891,30 +10144,6 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arc
  
  static __always_inline __must_check
 -int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
-+unsigned long copy_to_user(void __user *to, const void *from, unsigned len)
-+{
-+	if (access_ok(VERIFY_WRITE, to, len))
-+		len = __copy_to_user(to, from, len);
-+	return len;
-+}
-+
-+static __always_inline __must_check
-+unsigned long copy_from_user(void *to, const void __user *from, unsigned len)
-+{
-+	if ((int)len < 0)
-+		return len;
-+
-+	if (access_ok(VERIFY_READ, from, len))
-+		len = __copy_from_user(to, from, len);
-+	else if ((int)len > 0) {
-+		if (!__builtin_constant_p(len))
-+			check_object_size(to, len, false);
-+		memset(to, 0, len);
-+	}
-+	return len;
-+}
-+
-+static __always_inline __must_check
 +unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
  {
 -	int ret = 0;
@@ -8937,7 +10166,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arc
  	switch (size) {
  	case 1: {
  		u8 tmp;
-@@ -161,6 +213,10 @@ int __copy_in_user(void __user *dst, con
+@@ -204,6 +254,10 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
  		return ret;
  	}
  	default:
@@ -8948,9 +10177,14 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arc
  		return copy_user_generic((__force void *)dst,
  					 (__force void *)src, size);
  	}
-@@ -179,30 +235,40 @@ __must_check unsigned long __clear_user(
- __must_check long __copy_from_user_inatomic(void *dst, const void __user *src,
- 					    unsigned size);
+@@ -222,33 +276,45 @@ __must_check unsigned long __clear_user(void __user *mem, unsigned long len);
+ static __must_check __always_inline int
+ __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
+ {
++	if ((unsigned long)src < PAX_USER_SHADOW_BASE)
++		src += PAX_USER_SHADOW_BASE;
+ 	return copy_user_generic(dst, (__force const void *)src, size);
+ }
  
 -static __must_check __always_inline int
 +static __must_check __always_inline unsigned long
@@ -8996,232 +10230,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arc
  copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x86/include/asm/uaccess.h
---- linux-2.6.32.13/arch/x86/include/asm/uaccess.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/uaccess.h	2010-05-15 13:21:13.906812769 -0400
-@@ -8,8 +8,11 @@
- #include <linux/thread_info.h>
- #include <linux/prefetch.h>
- #include <linux/string.h>
-+#include <linux/sched.h>
-+#include <linux/slab.h>
- #include <asm/asm.h>
- #include <asm/page.h>
-+#include <asm/segment.h>
- 
- #define VERIFY_READ 0
- #define VERIFY_WRITE 1
-@@ -29,7 +32,12 @@
- 
- #define get_ds()	(KERNEL_DS)
- #define get_fs()	(current_thread_info()->addr_limit)
-+#ifdef CONFIG_X86_32
-+void __set_fs(mm_segment_t x, int cpu);
-+void set_fs(mm_segment_t x);
-+#else
- #define set_fs(x)	(current_thread_info()->addr_limit = (x))
-+#endif
- 
- #define segment_eq(a, b)	((a).seg == (b).seg)
- 
-@@ -77,7 +85,33 @@
-  * checks that the pointer is in the user space range - after calling
-  * this function, memory access functions may still return -EFAULT.
-  */
--#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
-+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
-+#define access_ok(type, addr, size)					\
-+({									\
-+	long __size = size;						\
-+	unsigned long __addr = (unsigned long)addr;			\
-+	unsigned long __addr_ao = __addr & PAGE_MASK;			\
-+	unsigned long __end_ao = __addr + __size - 1;			\
-+	bool __ret_ao = __range_not_ok(__addr, __size) == 0;		\
-+	if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) {	\
-+		while(__addr_ao <= __end_ao) {				\
-+			char __c_ao;					\
-+			__addr_ao += PAGE_SIZE;				\
-+			if (__size > PAGE_SIZE)				\
-+				cond_resched();				\
-+			if (__get_user(__c_ao, (char __user *)__addr))	\
-+				break;					\
-+			if (type != VERIFY_WRITE) {			\
-+				__addr = __addr_ao;			\
-+				continue;				\
-+			}						\
-+			if (__put_user(__c_ao, (char __user *)__addr))	\
-+				break;					\
-+			__addr = __addr_ao;				\
-+		}							\
-+	}								\
-+	__ret_ao;							\
-+})
- 
- /*
-  * The exception table consists of pairs of addresses: the first is the
-@@ -183,13 +217,21 @@ extern int __get_user_bad(void);
- 	asm volatile("call __put_user_" #size : "=a" (__ret_pu)	\
- 		     : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
- 
--
-+#ifdef CONFIG_X86_32
-+#define _ASM_LOAD_USER_DS(ds) "movw %w" #ds ",%%ds\n"
-+#define _ASM_LOAD_KERNEL_DS "pushl %%ss; popl %%ds\n"
-+#else
-+#define _ASM_LOAD_USER_DS(ds)
-+#define _ASM_LOAD_KERNEL_DS
-+#endif
- 
- #ifdef CONFIG_X86_32
- #define __put_user_asm_u64(x, addr, err, errret)			\
--	asm volatile("1:	movl %%eax,0(%2)\n"			\
--		     "2:	movl %%edx,4(%2)\n"			\
-+	asm volatile(_ASM_LOAD_USER_DS(5)				\
-+		     "1:	movl %%eax,%%ds:0(%2)\n"		\
-+		     "2:	movl %%edx,%%ds:4(%2)\n"		\
- 		     "3:\n"						\
-+		     _ASM_LOAD_KERNEL_DS				\
- 		     ".section .fixup,\"ax\"\n"				\
- 		     "4:	movl %3,%0\n"				\
- 		     "	jmp 3b\n"					\
-@@ -197,15 +239,18 @@ extern int __get_user_bad(void);
- 		     _ASM_EXTABLE(1b, 4b)				\
- 		     _ASM_EXTABLE(2b, 4b)				\
- 		     : "=r" (err)					\
--		     : "A" (x), "r" (addr), "i" (errret), "0" (err))
-+		     : "A" (x), "r" (addr), "i" (errret), "0" (err),	\
-+		       "r"(__USER_DS))
- 
- #define __put_user_asm_ex_u64(x, addr)					\
--	asm volatile("1:	movl %%eax,0(%1)\n"			\
--		     "2:	movl %%edx,4(%1)\n"			\
-+	asm volatile(_ASM_LOAD_USER_DS(2)				\
-+		     "1:	movl %%eax,%%ds:0(%1)\n"		\
-+		     "2:	movl %%edx,%%ds:4(%1)\n"		\
- 		     "3:\n"						\
-+		     _ASM_LOAD_KERNEL_DS				\
- 		     _ASM_EXTABLE(1b, 2b - 1b)				\
- 		     _ASM_EXTABLE(2b, 3b - 2b)				\
--		     : : "A" (x), "r" (addr))
-+		     : : "A" (x), "r" (addr), "r"(__USER_DS))
- 
- #define __put_user_x8(x, ptr, __ret_pu)				\
- 	asm volatile("call __put_user_8" : "=a" (__ret_pu)	\
-@@ -374,16 +419,18 @@ do {									\
- } while (0)
- 
- #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret)	\
--	asm volatile("1:	mov"itype" %2,%"rtype"1\n"		\
-+	asm volatile(_ASM_LOAD_USER_DS(5)				\
-+		     "1:	mov"itype" %%ds:%2,%"rtype"1\n"		\
- 		     "2:\n"						\
-+		     _ASM_LOAD_KERNEL_DS				\
- 		     ".section .fixup,\"ax\"\n"				\
- 		     "3:	mov %3,%0\n"				\
- 		     "	xor"itype" %"rtype"1,%"rtype"1\n"		\
- 		     "	jmp 2b\n"					\
- 		     ".previous\n"					\
- 		     _ASM_EXTABLE(1b, 3b)				\
--		     : "=r" (err), ltype(x)				\
--		     : "m" (__m(addr)), "i" (errret), "0" (err))
-+		     : "=r" (err), ltype (x)				\
-+		     : "m" (__m(addr)), "i" (errret), "0" (err), "r"(__USER_DS))
- 
- #define __get_user_size_ex(x, ptr, size)				\
- do {									\
-@@ -407,10 +454,12 @@ do {									\
- } while (0)
- 
- #define __get_user_asm_ex(x, addr, itype, rtype, ltype)			\
--	asm volatile("1:	mov"itype" %1,%"rtype"0\n"		\
-+	asm volatile(_ASM_LOAD_USER_DS(2)				\
-+		     "1:	mov"itype" %%ds:%1,%"rtype"0\n"		\
- 		     "2:\n"						\
-+		     _ASM_LOAD_KERNEL_DS				\
- 		     _ASM_EXTABLE(1b, 2b - 1b)				\
--		     : ltype(x) : "m" (__m(addr)))
-+		     : ltype(x) : "m" (__m(addr)), "r"(__USER_DS))
- 
- #define __put_user_nocheck(x, ptr, size)			\
- ({								\
-@@ -424,13 +473,24 @@ do {									\
- 	int __gu_err;							\
- 	unsigned long __gu_val;						\
- 	__get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT);	\
--	(x) = (__force __typeof__(*(ptr)))__gu_val;			\
-+	(x) = (__typeof__(*(ptr)))__gu_val;				\
- 	__gu_err;							\
- })
- 
- /* FIXME: this hack is definitely wrong -AK */
- struct __large_struct { unsigned long buf[100]; };
--#define __m(x) (*(struct __large_struct __user *)(x))
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+#define ____m(x)					\
-+({							\
-+	unsigned long ____x = (unsigned long)(x);	\
-+	if (____x < PAX_USER_SHADOW_BASE)		\
-+		____x += PAX_USER_SHADOW_BASE;		\
-+	(void __user *)____x;				\
-+})
-+#else
-+#define ____m(x) (x)
-+#endif
-+#define __m(x) (*(struct __large_struct __user *)____m(x))
- 
- /*
-  * Tell gcc we read from memory instead of writing: this is because
-@@ -438,21 +498,26 @@ struct __large_struct { unsigned long bu
-  * aliasing issues.
-  */
- #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret)	\
--	asm volatile("1:	mov"itype" %"rtype"1,%2\n"		\
-+	asm volatile(_ASM_LOAD_USER_DS(5)				\
-+		     "1:	mov"itype" %"rtype"1,%%ds:%2\n"		\
- 		     "2:\n"						\
-+		     _ASM_LOAD_KERNEL_DS				\
- 		     ".section .fixup,\"ax\"\n"				\
- 		     "3:	mov %3,%0\n"				\
- 		     "	jmp 2b\n"					\
- 		     ".previous\n"					\
- 		     _ASM_EXTABLE(1b, 3b)				\
- 		     : "=r"(err)					\
--		     : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
-+		     : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err),\
-+		       "r"(__USER_DS))
- 
- #define __put_user_asm_ex(x, addr, itype, rtype, ltype)			\
--	asm volatile("1:	mov"itype" %"rtype"0,%1\n"		\
-+	asm volatile(_ASM_LOAD_USER_DS(2)				\
-+		     "1:	mov"itype" %"rtype"0,%%ds:%1\n"		\
- 		     "2:\n"						\
-+		     _ASM_LOAD_KERNEL_DS				\
- 		     _ASM_EXTABLE(1b, 2b - 1b)				\
--		     : : ltype(x), "m" (__m(addr)))
-+		     : : ltype(x), "m" (__m(addr)), "r"(__USER_DS))
- 
- /*
-  * uaccess_try and catch
-@@ -530,7 +595,7 @@ struct __large_struct { unsigned long bu
- #define get_user_ex(x, ptr)	do {					\
- 	unsigned long __gue_val;					\
- 	__get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr))));	\
--	(x) = (__force __typeof__(*(ptr)))__gue_val;			\
-+	(x) = (__typeof__(*(ptr)))__gue_val;				\
- } while (0)
- 
- #ifdef CONFIG_X86_WP_WORKS_OK
-@@ -567,6 +632,7 @@ extern struct movsl_mask {
- 
- #define ARCH_HAS_NOCACHE_UACCESS 1
- 
-+#define ARCH_HAS_SORT_EXTABLE
- #ifdef CONFIG_X86_32
- # include "uaccess_32.h"
- #else
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/vgtod.h linux-2.6.32.13/arch/x86/include/asm/vgtod.h
---- linux-2.6.32.13/arch/x86/include/asm/vgtod.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/vgtod.h	2010-05-15 13:21:13.906812769 -0400
+diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h
+index 3d61e20..9507180 100644
+--- a/arch/x86/include/asm/vgtod.h
++++ b/arch/x86/include/asm/vgtod.h
 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
  	int		sysctl_enabled;
  	struct timezone sys_tz;
@@ -9230,9 +10242,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/vgtod.h linux-2.6.32.13/arch/x86
  		cycle_t (*vread)(void);
  		cycle_t	cycle_last;
  		cycle_t	mask;
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/vmi.h linux-2.6.32.13/arch/x86/include/asm/vmi.h
---- linux-2.6.32.13/arch/x86/include/asm/vmi.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/vmi.h	2010-05-15 13:21:13.928275178 -0400
+diff --git a/arch/x86/include/asm/vmi.h b/arch/x86/include/asm/vmi.h
+index 61e08c0..b0da582 100644
+--- a/arch/x86/include/asm/vmi.h
++++ b/arch/x86/include/asm/vmi.h
 @@ -191,6 +191,7 @@ struct vrom_header {
  	u8      reserved[96];   /* Reserved for headers */
  	char    vmi_init[8];    /* VMI_Init jump point */
@@ -9241,9 +10254,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/vmi.h linux-2.6.32.13/arch/x86/i
  } __attribute__((packed));
  
  struct pnp_header {
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/vsyscall.h linux-2.6.32.13/arch/x86/include/asm/vsyscall.h
---- linux-2.6.32.13/arch/x86/include/asm/vsyscall.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/vsyscall.h	2010-05-15 13:21:13.928275178 -0400
+diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h
+index d0983d2..1f7c9e9 100644
+--- a/arch/x86/include/asm/vsyscall.h
++++ b/arch/x86/include/asm/vsyscall.h
 @@ -15,9 +15,10 @@ enum vsyscall_num {
  
  #ifdef __KERNEL__
@@ -9274,10 +10288,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/vsyscall.h linux-2.6.32.13/arch/
  #endif /* __KERNEL__ */
  
  #endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.32.13/arch/x86/include/asm/xsave.h linux-2.6.32.13/arch/x86/include/asm/xsave.h
---- linux-2.6.32.13/arch/x86/include/asm/xsave.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/include/asm/xsave.h	2010-05-15 13:21:13.928275178 -0400
-@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
+diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
+index 2c4390c..0dda6eb 100644
+--- a/arch/x86/include/asm/xsave.h
++++ b/arch/x86/include/asm/xsave.h
+@@ -59,6 +59,12 @@ static inline int fpu_xrstor_checking(struct fpu *fpu)
  static inline int xsave_user(struct xsave_struct __user *buf)
  {
  	int err;
@@ -9290,7 +10305,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/xsave.h linux-2.6.32.13/arch/x86
  	__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
  			     "2:\n"
  			     ".section .fixup,\"ax\"\n"
-@@ -82,6 +88,11 @@ static inline int xrestore_user(struct x
+@@ -85,6 +91,11 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
  	u32 lmask = mask;
  	u32 hmask = mask >> 32;
  
@@ -9302,109 +10317,11 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/xsave.h linux-2.6.32.13/arch/x86
  	__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
  			     "2:\n"
  			     ".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.32.13/arch/x86/Kconfig linux-2.6.32.13/arch/x86/Kconfig
---- linux-2.6.32.13/arch/x86/Kconfig	2010-05-15 13:20:18.407099662 -0400
-+++ linux-2.6.32.13/arch/x86/Kconfig	2010-05-15 13:40:23.896554812 -0400
-@@ -531,6 +531,7 @@ source "arch/x86/lguest/Kconfig"
- 
- config PARAVIRT
- 	bool "Enable paravirtualization code"
-+	depends on !PAX_PER_CPU_PGD
- 	---help---
- 	  This changes the kernel so it can modify itself when it is run
- 	  under a hypervisor, potentially improving performance significantly
-@@ -1083,7 +1084,7 @@ config PAGE_OFFSET
- 	hex
- 	default 0xB0000000 if VMSPLIT_3G_OPT
- 	default 0x80000000 if VMSPLIT_2G
--	default 0x78000000 if VMSPLIT_2G_OPT
-+	default 0x70000000 if VMSPLIT_2G_OPT
- 	default 0x40000000 if VMSPLIT_1G
- 	default 0xC0000000
- 	depends on X86_32
-@@ -1414,7 +1415,7 @@ config ARCH_USES_PG_UNCACHED
- 
- config EFI
- 	bool "EFI runtime service support"
--	depends on ACPI
-+	depends on ACPI && !PAX_KERNEXEC
- 	---help---
- 	  This enables the kernel to use EFI runtime services that are
- 	  available (such as the EFI variable services).
-@@ -1501,6 +1502,7 @@ config KEXEC_JUMP
- config PHYSICAL_START
- 	hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
- 	default "0x1000000"
-+	range 0x400000 0x40000000
- 	---help---
- 	  This gives the physical address where the kernel is loaded.
- 
-@@ -1565,6 +1567,7 @@ config PHYSICAL_ALIGN
- 	hex
- 	prompt "Alignment value to which kernel should be aligned" if X86_32
- 	default "0x1000000"
-+	range 0x400000 0x1000000 if PAX_KERNEXEC
- 	range 0x2000 0x1000000
- 	---help---
- 	  This value puts the alignment restrictions on physical address
-@@ -1596,9 +1599,10 @@ config HOTPLUG_CPU
- 	  Say N if you want to disable CPU hotplug.
- 
- config COMPAT_VDSO
--	def_bool y
-+	def_bool n
- 	prompt "Compat VDSO support"
- 	depends on X86_32 || IA32_EMULATION
-+	depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
- 	---help---
- 	  Map the 32-bit VDSO to the predictable old-style address too.
- 	---help---
-diff -urNp linux-2.6.32.13/arch/x86/Kconfig.cpu linux-2.6.32.13/arch/x86/Kconfig.cpu
---- linux-2.6.32.13/arch/x86/Kconfig.cpu	2010-04-29 17:49:37.481119841 -0400
-+++ linux-2.6.32.13/arch/x86/Kconfig.cpu	2010-05-15 13:21:13.930870481 -0400
-@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
- 
- config X86_F00F_BUG
- 	def_bool y
--	depends on M586MMX || M586TSC || M586 || M486 || M386
-+	depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
- 
- config X86_WP_WORKS_OK
- 	def_bool y
-@@ -360,7 +360,7 @@ config X86_POPAD_OK
- 
- config X86_ALIGNMENT_16
- 	def_bool y
--	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
-+	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
- 
- config X86_INTEL_USERCOPY
- 	def_bool y
-@@ -406,7 +406,7 @@ config X86_CMPXCHG64
- # generates cmov.
- config X86_CMOV
- 	def_bool y
--	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
-+	depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
- 
- config X86_MINIMUM_CPU_FAMILY
- 	int
-diff -urNp linux-2.6.32.13/arch/x86/Kconfig.debug linux-2.6.32.13/arch/x86/Kconfig.debug
---- linux-2.6.32.13/arch/x86/Kconfig.debug	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/Kconfig.debug	2010-05-15 13:21:13.942893840 -0400
-@@ -99,7 +99,7 @@ config X86_PTDUMP
- config DEBUG_RODATA
- 	bool "Write protect kernel read-only data structures"
- 	default y
--	depends on DEBUG_KERNEL
-+	depends on DEBUG_KERNEL && BROKEN
- 	---help---
- 	  Mark the kernel read-only data as write-protected in the pagetables,
- 	  in order to catch accidental (and incorrect) writes to such const
-diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/boot.c linux-2.6.32.13/arch/x86/kernel/acpi/boot.c
---- linux-2.6.32.13/arch/x86/kernel/acpi/boot.c	2010-04-04 20:41:49.916475305 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/acpi/boot.c	2010-05-15 13:21:13.954911113 -0400
-@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a
+diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
+index c05872a..eb10001 100644
+--- a/arch/x86/kernel/acpi/boot.c
++++ b/arch/x86/kernel/acpi/boot.c
+@@ -1472,7 +1472,7 @@ static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
  		     DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
  		     },
  	 },
@@ -9413,9 +10330,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/boot.c linux-2.6.32.13/arch/x86/
  };
  
  /*
-diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S	2010-05-15 13:21:13.954911113 -0400
+diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S
+index 580b4e2..e0a70ff 100644
+--- a/arch/x86/kernel/acpi/realmode/wakeup.S
++++ b/arch/x86/kernel/acpi/realmode/wakeup.S
 @@ -104,7 +104,7 @@ _start:
  	movl	%eax, %ecx
  	orl	%edx, %ecx
@@ -9425,9 +10343,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.1
  	wrmsr
  1:
  
-diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c	2010-05-15 13:20:18.407099662 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c	2010-05-15 13:21:13.954911113 -0400
+diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
+index fcc3c61..13001d3 100644
+--- a/arch/x86/kernel/acpi/sleep.c
++++ b/arch/x86/kernel/acpi/sleep.c
 @@ -11,11 +11,12 @@
  #include <linux/cpumask.h>
  #include <asm/segment.h>
@@ -9442,7 +10361,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c linux-2.6.32.13/arch/x86
  unsigned long acpi_realmode_flags;
  
  /* address in low memory of the wakeup routine. */
-@@ -99,8 +100,12 @@ int acpi_save_state_mem(void)
+@@ -96,8 +97,12 @@ int acpi_save_state_mem(void)
  	header->trampoline_segment = setup_trampoline() >> 4;
  #ifdef CONFIG_SMP
  	stack_start.sp = temp_stack + sizeof(temp_stack);
@@ -9455,26 +10374,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c linux-2.6.32.13/arch/x86
  	initial_gs = per_cpu_offset(smp_processor_id());
  #endif
  	initial_code = (unsigned long)wakeup_long64;
-@@ -134,14 +139,8 @@ void __init acpi_reserve_bootmem(void)
- 		return;
- 	}
- 
--	acpi_realmode = (unsigned long)alloc_bootmem_low(WAKEUP_SIZE);
--
--	if (!acpi_realmode) {
--		printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");
--		return;
--	}
--
--	acpi_wakeup_address = virt_to_phys((void *)acpi_realmode);
-+	reserve_early(acpi_wakeup_address, acpi_wakeup_address + WAKEUP_SIZE, "ACPI Wakeup Code");
-+	acpi_realmode = (unsigned long)__va(acpi_wakeup_address);;
- }
- 
- 
-diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S	2010-05-15 13:21:13.954911113 -0400
+diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
+index 13ab720..95d5442 100644
+--- a/arch/x86/kernel/acpi/wakeup_32.S
++++ b/arch/x86/kernel/acpi/wakeup_32.S
 @@ -30,13 +30,11 @@ wakeup_pmode_return:
  	# and restore the stack ... but you need gdt for this to work
  	movl	saved_context_esp, %esp
@@ -9491,10 +10394,29 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.13/arch
  
  bogus_magic:
  	jmp	bogus_magic
-diff -urNp linux-2.6.32.13/arch/x86/kernel/alternative.c linux-2.6.32.13/arch/x86/kernel/alternative.c
---- linux-2.6.32.13/arch/x86/kernel/alternative.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/alternative.c	2010-05-15 13:21:13.962912884 -0400
-@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
+diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
+index 7023773..a29b372 100644
+--- a/arch/x86/kernel/alternative.c
++++ b/arch/x86/kernel/alternative.c
+@@ -247,7 +247,7 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
+ 		if (!*poff || ptr < text || ptr >= text_end)
+ 			continue;
+ 		/* turn DS segment override prefix into lock prefix */
+-		if (*ptr == 0x3e)
++		if (*ktla_ktva(ptr) == 0x3e)
+ 			text_poke(ptr, ((unsigned char []){0xf0}), 1);
+ 	};
+ 	mutex_unlock(&text_mutex);
+@@ -268,7 +268,7 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
+ 		if (!*poff || ptr < text || ptr >= text_end)
+ 			continue;
+ 		/* turn lock prefix into DS segment override prefix */
+-		if (*ptr == 0xf0)
++		if (*ktla_ktva(ptr) == 0xf0)
+ 			text_poke(ptr, ((unsigned char []){0x3E}), 1);
+ 	};
+ 	mutex_unlock(&text_mutex);
+@@ -436,7 +436,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
  
  		BUG_ON(p->len > MAX_PATCH_LEN);
  		/* prep the buffer with the original instructions */
@@ -9503,7 +10425,16 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/alternative.c linux-2.6.32.13/arch/x8
  		used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
  					 (unsigned long)p->instr, p->len);
  
-@@ -492,12 +492,16 @@ void __init alternative_instructions(voi
+@@ -504,7 +504,7 @@ void __init alternative_instructions(void)
+ 	if (smp_alt_once)
+ 		free_init_pages("SMP alternatives",
+ 				(unsigned long)__smp_locks,
+-				(unsigned long)__smp_locks_end);
++				PAGE_ALIGN((unsigned long)__smp_locks_end));
+ 
+ 	restart_nmi();
+ }
+@@ -521,13 +521,17 @@ void __init alternative_instructions(void)
   * instructions. And on the local CPU you need to be protected again NMI or MCE
   * handlers seeing an inconsistent instruction while you patch.
   */
@@ -9517,12 +10448,13 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/alternative.c linux-2.6.32.13/arch/x8
 +
 +	pax_open_kernel();
 +	memcpy(ktla_ktva(addr), opcode, len);
+ 	sync_core();
 +	pax_close_kernel();
 +
- 	sync_core();
  	local_irq_restore(flags);
  	/* Could also do a CLFLUSH here to speed up CPU recovery; but
-@@ -520,35 +524,21 @@ static void *__init_or_module text_poke_
+ 	   that causes hangs on some VIA CPUs. */
+@@ -549,36 +553,22 @@ static void *__init_or_module text_poke_early(void *addr, const void *opcode,
   */
  void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
  {
@@ -9566,10 +10498,12 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/alternative.c linux-2.6.32.13/arch/x8
 +		BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
  	return addr;
  }
-diff -urNp linux-2.6.32.13/arch/x86/kernel/amd_iommu.c linux-2.6.32.13/arch/x86/kernel/amd_iommu.c
---- linux-2.6.32.13/arch/x86/kernel/amd_iommu.c	2010-04-29 17:49:37.521943068 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/amd_iommu.c	2010-05-15 13:21:13.968009761 -0400
-@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains(
+ 
+diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
+index 4424c73..e90c367 100644
+--- a/arch/x86/kernel/amd_iommu.c
++++ b/arch/x86/kernel/amd_iommu.c
+@@ -2286,7 +2286,7 @@ static void prealloc_protection_domains(void)
  	}
  }
  
@@ -9578,10 +10512,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/amd_iommu.c linux-2.6.32.13/arch/x86/
  	.alloc_coherent = alloc_coherent,
  	.free_coherent = free_coherent,
  	.map_page = map_page,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c	2010-05-15 13:21:13.979712258 -0400
-@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
+diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
+index ad1515d..96832b6 100644
+--- a/arch/x86/kernel/apic/io_apic.c
++++ b/arch/x86/kernel/apic/io_apic.c
+@@ -696,7 +696,7 @@ struct IO_APIC_route_entry **alloc_ioapic_entries(void)
  	ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
  				GFP_ATOMIC);
  	if (!ioapic_entries)
@@ -9590,7 +10525,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c linux-2.6.32.13/arch/x
  
  	for (apic = 0; apic < nr_ioapics; apic++) {
  		ioapic_entries[apic] =
-@@ -728,7 +728,7 @@ nomem:
+@@ -713,7 +713,7 @@ nomem:
  		kfree(ioapic_entries[apic]);
  	kfree(ioapic_entries);
  
@@ -9599,7 +10534,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c linux-2.6.32.13/arch/x
  }
  
  /*
-@@ -1145,7 +1145,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, 
+@@ -1123,7 +1123,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
  }
  EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
  
@@ -9608,19 +10543,20 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c linux-2.6.32.13/arch/x
  {
  	/* Used to the online set of cpus does not change
  	 * during assign_irq_vector.
-@@ -1153,7 +1153,7 @@ void lock_vector_lock(void)
- 	spin_lock(&vector_lock);
+@@ -1131,7 +1131,7 @@ void lock_vector_lock(void)
+ 	raw_spin_lock(&vector_lock);
  }
  
 -void unlock_vector_lock(void)
 +void unlock_vector_lock(void) __releases(vector_lock)
  {
- 	spin_unlock(&vector_lock);
+ 	raw_spin_unlock(&vector_lock);
  }
-diff -urNp linux-2.6.32.13/arch/x86/kernel/apm_32.c linux-2.6.32.13/arch/x86/kernel/apm_32.c
---- linux-2.6.32.13/arch/x86/kernel/apm_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/apm_32.c	2010-05-15 13:21:14.011066799 -0400
-@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
+diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
+index c4f9182..9e252a4 100644
+--- a/arch/x86/kernel/apm_32.c
++++ b/arch/x86/kernel/apm_32.c
+@@ -410,7 +410,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.
   */
@@ -9652,7 +10588,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apm_32.c linux-2.6.32.13/arch/x86/ker
  	put_cpu();
  
  	return call->eax & 0xff;
-@@ -664,7 +671,10 @@ static long __apm_bios_call_simple(void 
+@@ -664,7 +671,10 @@ static long __apm_bios_call_simple(void *_call)
  	BUG_ON(cpu != 0);
  	gdt = get_cpu_gdt_table(cpu);
  	save_desc_40 = gdt[0x40 / 8];
@@ -9663,7 +10599,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apm_32.c linux-2.6.32.13/arch/x86/ker
  
  	apm_irq_save(flags);
  	APM_DO_SAVE_SEGS;
-@@ -672,7 +682,11 @@ static long __apm_bios_call_simple(void 
+@@ -672,7 +682,11 @@ static long __apm_bios_call_simple(void *_call)
  					 &call->eax);
  	APM_DO_RESTORE_SEGS;
  	apm_irq_restore(flags);
@@ -9684,7 +10620,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apm_32.c linux-2.6.32.13/arch/x86/ker
  		0xb8, 0x00, 0x10,	/* movw  $0x1000,ax  */
  		0x8e, 0xd0,		/* movw  ax,ss       */
  		0xbc, 0x00, 0xf0,	/* movw  $0xf000,sp  */
-@@ -1933,7 +1947,10 @@ static const struct file_operations apm_
+@@ -1931,7 +1945,10 @@ static const struct file_operations apm_bios_fops = {
  static struct miscdevice apm_device = {
  	APM_MINOR_DEV,
  	"apm_bios",
@@ -9696,7 +10632,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apm_32.c linux-2.6.32.13/arch/x86/ker
  };
  
  
-@@ -2254,7 +2271,7 @@ static struct dmi_system_id __initdata a
+@@ -2252,7 +2269,7 @@ static struct dmi_system_id __initdata apm_dmi_table[] = {
  		{	DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
  	},
  
@@ -9705,7 +10641,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apm_32.c linux-2.6.32.13/arch/x86/ker
  };
  
  /*
-@@ -2357,12 +2374,15 @@ static int __init apm_init(void)
+@@ -2355,12 +2372,15 @@ static int __init apm_init(void)
  	 * code to that CPU.
  	 */
  	gdt = get_cpu_gdt_table(0);
@@ -9721,9 +10657,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apm_32.c linux-2.6.32.13/arch/x86/ker
  
  	proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c	2010-05-15 13:21:14.011066799 -0400
+diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
+index dfdbf64..5b9f997 100644
+--- a/arch/x86/kernel/asm-offsets_32.c
++++ b/arch/x86/kernel/asm-offsets_32.c
 @@ -115,6 +115,11 @@ void foo(void)
  	OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
  	OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -9736,9 +10673,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.13/arch
  #endif
  
  #ifdef CONFIG_XEN
-diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c	2010-05-15 13:21:14.011066799 -0400
+diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
+index 4a6aeed..31b7fb8 100644
+--- a/arch/x86/kernel/asm-offsets_64.c
++++ b/arch/x86/kernel/asm-offsets_64.c
 @@ -63,6 +63,18 @@ int main(void)
  	OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
  	OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -9766,10 +10704,26 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.13/arch
  	DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
  	BLANK();
  	DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/common.c linux-2.6.32.13/arch/x86/kernel/cpu/common.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/common.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/common.c	2010-05-15 13:21:14.011066799 -0400
-@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
+diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
+index 3a785da..68d7133 100644
+--- a/arch/x86/kernel/cpu/Makefile
++++ b/arch/x86/kernel/cpu/Makefile
+@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
+ CFLAGS_REMOVE_perf_event.o = -pg
+ endif
+ 
+-# Make sure load_percpu_segment has no stackprotector
+-nostackp := $(call cc-option, -fno-stack-protector)
+-CFLAGS_common.o		:= $(nostackp)
+-
+ obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
+ obj-y			+= proc.o capflags.o powerflags.o common.o
+ obj-y			+= vmware.o hypervisor.o sched.o mshyperv.o
+diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
+index d938871..1e97c91 100644
+--- a/arch/x86/kernel/cpu/common.c
++++ b/arch/x86/kernel/cpu/common.c
+@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
  
  static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
  
@@ -9839,7 +10793,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/common.c linux-2.6.32.13/arch/x86
  	gdt_descr.size = GDT_SIZE - 1;
  	load_gdt(&gdt_descr);
  	/* Reload the per-cpu base */
-@@ -798,6 +744,10 @@ static void __cpuinit identify_cpu(struc
+@@ -802,6 +748,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
  	/* Filter out anything that depends on CPUID levels we don't have */
  	filter_cpuid_features(c, true);
  
@@ -9850,16 +10804,16 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/common.c linux-2.6.32.13/arch/x86
  	/* If the model name is still unset, do table lookup. */
  	if (!c->x86_model_id[0]) {
  		const char *p;
-@@ -1101,7 +1051,7 @@ void __cpuinit cpu_init(void)
+@@ -1117,7 +1067,7 @@ void __cpuinit cpu_init(void)
  	int i;
  
  	cpu = stack_smp_processor_id();
 -	t = &per_cpu(init_tss, cpu);
 +	t = init_tss + cpu;
- 	orig_ist = &per_cpu(orig_ist, cpu);
+ 	oist = &per_cpu(orig_ist, cpu);
  
  #ifdef CONFIG_NUMA
-@@ -1127,7 +1077,7 @@ void __cpuinit cpu_init(void)
+@@ -1143,7 +1093,7 @@ void __cpuinit cpu_init(void)
  	switch_to_new_gdt(cpu);
  	loadsegment(fs, 0);
  
@@ -9868,7 +10822,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/common.c linux-2.6.32.13/arch/x86
  
  	memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
  	syscall_init();
-@@ -1199,7 +1149,7 @@ void __cpuinit cpu_init(void)
+@@ -1205,7 +1155,7 @@ void __cpuinit cpu_init(void)
  {
  	int cpu = smp_processor_id();
  	struct task_struct *curr = current;
@@ -9877,10 +10831,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/common.c linux-2.6.32.13/arch/x86
  	struct thread_struct *thread = &curr->thread;
  
  	if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c	2010-05-15 13:21:14.043267946 -0400
-@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
+diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+index 5384b04..0c28c59 100644
+--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
++++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+@@ -484,7 +484,7 @@ static const struct dmi_system_id sw_any_bug_dmi_table[] = {
  			DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
  		},
  	},
@@ -9889,10 +10844,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
  };
  
  static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c	2010-05-15 13:21:14.043267946 -0400
-@@ -225,7 +225,7 @@ static struct cpu_model models[] =
+diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+index 9b1ff37..3c1bac4 100644
+--- a/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
++++ b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+@@ -226,7 +226,7 @@ static struct cpu_model models[] =
  	{ &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
  	{ &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
  
@@ -9901,10 +10857,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
  };
  #undef _BANIAS
  #undef BANIAS
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel.c linux-2.6.32.13/arch/x86/kernel/cpu/intel.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/intel.c	2010-05-15 13:20:18.427075180 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/intel.c	2010-05-15 13:21:14.043267946 -0400
-@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
+diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
+index b438944..aa576fa 100644
+--- a/arch/x86/kernel/cpu/intel.c
++++ b/arch/x86/kernel/cpu/intel.c
+@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug(void)
  	 * Update the IDT descriptor and reload the IDT so that
  	 * it uses the read-only mapped virtual address.
  	 */
@@ -9913,48 +10870,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel.c linux-2.6.32.13/arch/x86/
  	load_idt(&idt_descr);
  }
  #endif
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c	2010-05-15 13:20:18.427075180 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c	2010-05-15 13:21:14.043267946 -0400
-@@ -917,7 +917,7 @@ static ssize_t store(struct kobject *kob
- 	return ret;
- }
- 
--static struct sysfs_ops sysfs_ops = {
-+static const struct sysfs_ops sysfs_ops = {
- 	.show   = show,
- 	.store  = store,
- };
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/Makefile linux-2.6.32.13/arch/x86/kernel/cpu/Makefile
---- linux-2.6.32.13/arch/x86/kernel/cpu/Makefile	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/Makefile	2010-05-15 13:21:14.043267946 -0400
-@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
- CFLAGS_REMOVE_common.o = -pg
- endif
- 
--# Make sure load_percpu_segment has no stackprotector
--nostackp := $(call cc-option, -fno-stack-protector)
--CFLAGS_common.o		:= $(nostackp)
--
- obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
- obj-y			+= proc.o capflags.o powerflags.o common.o
- obj-y			+= vmware.o hypervisor.o sched.o
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c	2010-05-15 13:21:14.043267946 -0400
-@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
- 	return ret;
- }
- 
--static struct sysfs_ops threshold_ops = {
-+static const struct sysfs_ops threshold_ops = {
- 	.show			= show,
- 	.store			= store,
- };
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c	2010-05-15 13:21:14.043267946 -0400
-@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
+diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
+index 18cc425..ebfbac1 100644
+--- a/arch/x86/kernel/cpu/mcheck/mce.c
++++ b/arch/x86/kernel/cpu/mcheck/mce.c
+@@ -219,7 +219,7 @@ static void print_mce(struct mce *m)
  			!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
  				m->cs, m->ip);
  
@@ -9963,7 +10883,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.13/arch
  			print_symbol("{%s}", m->ip);
  		pr_cont("\n");
  	}
-@@ -1429,14 +1429,14 @@ void __cpuinit mcheck_init(struct cpuinf
+@@ -1471,14 +1471,14 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
   */
  
  static DEFINE_SPINLOCK(mce_state_lock);
@@ -9980,7 +10900,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.13/arch
  		spin_unlock(&mce_state_lock);
  
  		return -EBUSY;
-@@ -1444,7 +1444,7 @@ static int mce_open(struct inode *inode,
+@@ -1486,7 +1486,7 @@ static int mce_open(struct inode *inode, struct file *file)
  
  	if (file->f_flags & O_EXCL)
  		open_exclu = 1;
@@ -9989,7 +10909,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.13/arch
  
  	spin_unlock(&mce_state_lock);
  
-@@ -1455,7 +1455,7 @@ static int mce_release(struct inode *ino
+@@ -1497,7 +1497,7 @@ static int mce_release(struct inode *inode, struct file *file)
  {
  	spin_lock(&mce_state_lock);
  
@@ -9998,7 +10918,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.13/arch
  	open_exclu = 0;
  
  	spin_unlock(&mce_state_lock);
-@@ -1595,6 +1595,7 @@ static struct miscdevice mce_log_device 
+@@ -1683,6 +1683,7 @@ static struct miscdevice mce_log_device = {
  	MISC_MCELOG_MINOR,
  	"mcelog",
  	&mce_chrdev_ops,
@@ -10006,46 +10926,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.13/arch
  };
  
  /*
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c	2010-05-15 13:21:14.043267946 -0400
-@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
- 	return 0;
- }
- 
--static struct mtrr_ops amd_mtrr_ops = {
-+static const struct mtrr_ops amd_mtrr_ops = {
- 	.vendor            = X86_VENDOR_AMD,
- 	.set               = amd_set_mtrr,
- 	.get               = amd_get_mtrr,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c	2010-05-15 13:21:14.043267946 -0400
-@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 
- 	return 0;
- }
- 
--static struct mtrr_ops centaur_mtrr_ops = {
-+static const struct mtrr_ops centaur_mtrr_ops = {
- 	.vendor            = X86_VENDOR_CENTAUR,
- 	.set               = centaur_set_mcr,
- 	.get               = centaur_get_mcr,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c	2010-05-15 13:21:14.043267946 -0400
-@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
- 	post_set();
- }
- 
--static struct mtrr_ops cyrix_mtrr_ops = {
-+static const struct mtrr_ops cyrix_mtrr_ops = {
- 	.vendor            = X86_VENDOR_CYRIX,
- 	.set_all	   = cyrix_set_all,
- 	.set               = cyrix_set_arr,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c	2010-05-15 13:21:14.043267946 -0400
-@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
+diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
+index fd31a44..e4817d8 100644
+--- a/arch/x86/kernel/cpu/mtrr/generic.c
++++ b/arch/x86/kernel/cpu/mtrr/generic.c
+@@ -28,7 +28,7 @@ static struct fixed_range_block fixed_range_blocks[] = {
  	{ MSR_MTRRfix64K_00000, 1 }, /* one   64k MTRR  */
  	{ MSR_MTRRfix16K_80000, 2 }, /* two   16k MTRRs */
  	{ MSR_MTRRfix4K_C0000,  8 }, /* eight  4k MTRRs */
@@ -10054,39 +10939,23 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.13/ar
  };
  
  static unsigned long smp_changes_mask;
-@@ -752,7 +752,7 @@ int positive_have_wrcomb(void)
- /*
-  * Generic structure...
-  */
--struct mtrr_ops generic_mtrr_ops = {
-+const struct mtrr_ops generic_mtrr_ops = {
- 	.use_intel_if		= 1,
- 	.set_all		= generic_set_all,
- 	.get			= generic_get_mtrr,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c	2010-05-15 13:21:14.043267946 -0400
-@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
+diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
+index 01c0f3e..0e18a24 100644
+--- a/arch/x86/kernel/cpu/mtrr/main.c
++++ b/arch/x86/kernel/cpu/mtrr/main.c
+@@ -61,7 +61,7 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
  
--static struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
+-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
 +static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
  
--struct mtrr_ops *mtrr_if;
-+const struct mtrr_ops *mtrr_if;
+ const struct mtrr_ops *mtrr_if;
  
- static void set_mtrr(unsigned int reg, unsigned long base,
- 		     unsigned long size, mtrr_type type);
- 
--void set_mtrr_ops(struct mtrr_ops *ops)
-+void set_mtrr_ops(const struct mtrr_ops *ops)
- {
- 	if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
- 		mtrr_ops[ops->vendor] = ops;
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h	2010-05-15 13:21:14.043267946 -0400
+diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
+index df5e41f..d94607c 100644
+--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
++++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
 @@ -12,19 +12,19 @@
  extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
  
@@ -10115,31 +10984,23 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.13/arch/
  };
  
  extern int generic_get_free_region(unsigned long base, unsigned long size,
-@@ -32,7 +32,7 @@ extern int generic_get_free_region(unsig
- extern int generic_validate_add_page(unsigned long base, unsigned long size,
- 				     unsigned int type);
- 
--extern struct mtrr_ops generic_mtrr_ops;
-+extern const struct mtrr_ops generic_mtrr_ops;
- 
- extern int positive_have_wrcomb(void);
- 
-@@ -53,10 +53,10 @@ void fill_mtrr_var_range(unsigned int in
- 		u32 base_lo, u32 base_hi, u32 mask_lo, u32 mask_hi);
- void get_mtrr_state(void);
- 
--extern void set_mtrr_ops(struct mtrr_ops *ops);
-+extern void set_mtrr_ops(const struct mtrr_ops *ops);
+diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
+index 5db5b7d..1e1f17e 100644
+--- a/arch/x86/kernel/cpu/perf_event.c
++++ b/arch/x86/kernel/cpu/perf_event.c
+@@ -1685,7 +1685,7 @@ perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
+ 			break;
  
- extern u64 size_or_mask, size_and_mask;
--extern struct mtrr_ops *mtrr_if;
-+extern const struct mtrr_ops *mtrr_if;
+ 		callchain_store(entry, frame.return_address);
+-		fp = frame.next_frame;
++		fp = (__force const void __user *)frame.next_frame;
+ 	}
+ }
  
- #define is_cpu(vnd)	(mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
- #define use_intel()	(mtrr_if && mtrr_if->use_intel_if == 1)
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c	2010-05-15 13:21:14.043267946 -0400
+diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
+index fb329e9..ab40f2d 100644
+--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
++++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
  
  /* Interface defining a CPU specific perfctr watchdog */
@@ -10157,15 +11018,15 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.1
  	unsigned perfctr;
  	unsigned evntsel;
  	u64 checkbit;
-@@ -645,6 +645,7 @@ static const struct wd_ops p4_wd_ops = {
+@@ -634,6 +634,7 @@ static const struct wd_ops p4_wd_ops = {
  #define ARCH_PERFMON_NMI_EVENT_SEL	ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL
  #define ARCH_PERFMON_NMI_EVENT_UMASK	ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK
  
-+/* cannot be const */
++/* cannot be const, see probe_nmi_watchdog */
  static struct wd_ops intel_arch_wd_ops;
  
  static int setup_intel_arch_watchdog(unsigned nmi_hz)
-@@ -697,6 +698,7 @@ static int setup_intel_arch_watchdog(uns
+@@ -686,6 +687,7 @@ static int setup_intel_arch_watchdog(unsigned nmi_hz)
  	return 1;
  }
  
@@ -10173,22 +11034,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.1
  static struct wd_ops intel_arch_wd_ops __read_mostly = {
  	.reserve	= single_msr_reserve,
  	.unreserve	= single_msr_unreserve,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c	2010-04-29 17:49:37.537108997 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c	2010-05-15 13:21:14.046723916 -0400
-@@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs
- 			break;
- 
- 		callchain_store(entry, frame.return_address);
--		fp = frame.next_frame;
-+		fp = (__force const void __user *)frame.next_frame;
- 	}
- }
- 
-diff -urNp linux-2.6.32.13/arch/x86/kernel/crash.c linux-2.6.32.13/arch/x86/kernel/crash.c
---- linux-2.6.32.13/arch/x86/kernel/crash.c	2010-04-29 17:49:37.537108997 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/crash.c	2010-05-15 13:21:14.046723916 -0400
-@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, 
+diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
+index ebd4c51..a345a28 100644
+--- a/arch/x86/kernel/crash.c
++++ b/arch/x86/kernel/crash.c
+@@ -40,7 +40,7 @@ static void kdump_nmi_callback(int cpu, struct die_args *args)
  	regs = args->regs;
  
  #ifdef CONFIG_X86_32
@@ -10197,9 +11047,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/crash.c linux-2.6.32.13/arch/x86/kern
  		crash_fixup_ss_esp(&fixed_regs, regs);
  		regs = &fixed_regs;
  	}
-diff -urNp linux-2.6.32.13/arch/x86/kernel/doublefault_32.c linux-2.6.32.13/arch/x86/kernel/doublefault_32.c
---- linux-2.6.32.13/arch/x86/kernel/doublefault_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/doublefault_32.c	2010-05-15 13:21:14.046723916 -0400
+diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
+index 37250fe..bf2ec74 100644
+--- a/arch/x86/kernel/doublefault_32.c
++++ b/arch/x86/kernel/doublefault_32.c
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -10218,7 +11069,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/doublefault_32.c linux-2.6.32.13/arch
  
  	printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
  
-@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cach
+@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
  		/* 0x2 bit is always set */
  		.flags		= X86_EFLAGS_SF | 0x2,
  		.sp		= STACK_START,
@@ -10231,10 +11082,51 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/doublefault_32.c linux-2.6.32.13/arch
  		.fs		= __KERNEL_PERCPU,
  
  		.__cr3		= __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c	2010-05-15 13:21:14.068544431 -0400
-@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
+diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
+index c89a386..10eb36b 100644
+--- a/arch/x86/kernel/dumpstack.c
++++ b/arch/x86/kernel/dumpstack.c
+@@ -207,7 +207,7 @@ void dump_stack(void)
+ #endif
+ 
+ 	printk("Pid: %d, comm: %.20s %s %s %.*s\n",
+-		current->pid, current->comm, print_tainted(),
++		task_pid_nr(current), current->comm, print_tainted(),
+ 		init_utsname()->release,
+ 		(int)strcspn(init_utsname()->version, " "),
+ 		init_utsname()->version);
+@@ -263,7 +263,7 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
+ 		panic("Fatal exception in interrupt");
+ 	if (panic_on_oops)
+ 		panic("Fatal exception");
+-	do_exit(signr);
++	do_group_exit(signr);
+ }
+ 
+ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
+@@ -290,7 +290,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
+ 
+ 	show_registers(regs);
+ #ifdef CONFIG_X86_32
+-	if (user_mode_vm(regs)) {
++	if (user_mode(regs)) {
+ 		sp = regs->sp;
+ 		ss = regs->ss & 0xffff;
+ 	} else {
+@@ -318,7 +318,7 @@ void die(const char *str, struct pt_regs *regs, long err)
+ 	unsigned long flags = oops_begin();
+ 	int sig = SIGSEGV;
+ 
+-	if (!user_mode_vm(regs))
++	if (!user_mode(regs))
+ 		report_bug(regs->ip, regs);
+ 
+ 	if (__die(str, regs, err))
+diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
+index 11540a1..285b0ef 100644
+--- a/arch/x86/kernel/dumpstack_32.c
++++ b/arch/x86/kernel/dumpstack_32.c
+@@ -107,11 +107,12 @@ void show_registers(struct pt_regs *regs)
  	 * When in-kernel, we also print out the stack and code at the
  	 * time of the fault..
  	 */
@@ -10248,7 +11140,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c linux-2.6.32.13/arch/x
  
  		printk(KERN_EMERG "Stack:\n");
  		show_stack_log_lvl(NULL, regs, &regs->sp,
-@@ -124,10 +125,10 @@ void show_registers(struct pt_regs *regs
+@@ -119,10 +120,10 @@ void show_registers(struct pt_regs *regs)
  
  		printk(KERN_EMERG "Code: ");
  
@@ -10261,7 +11153,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c linux-2.6.32.13/arch/x
  			code_len = code_len - code_prologue + 1;
  		}
  		for (i = 0; i < code_len; i++, ip++) {
-@@ -136,7 +137,7 @@ void show_registers(struct pt_regs *regs
+@@ -131,7 +132,7 @@ void show_registers(struct pt_regs *regs)
  				printk(" Bad EIP value.");
  				break;
  			}
@@ -10270,7 +11162,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c linux-2.6.32.13/arch/x
  				printk("<%02x> ", c);
  			else
  				printk("%02x ", c);
-@@ -149,6 +150,7 @@ int is_valid_bugaddr(unsigned long ip)
+@@ -144,6 +145,7 @@ int is_valid_bugaddr(unsigned long ip)
  {
  	unsigned short ud2;
  
@@ -10278,51 +11170,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c linux-2.6.32.13/arch/x
  	if (ip < PAGE_OFFSET)
  		return 0;
  	if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack.c linux-2.6.32.13/arch/x86/kernel/dumpstack.c
---- linux-2.6.32.13/arch/x86/kernel/dumpstack.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/dumpstack.c	2010-05-15 13:21:14.068544431 -0400
-@@ -180,7 +180,7 @@ void dump_stack(void)
- #endif
- 
- 	printk("Pid: %d, comm: %.20s %s %s %.*s\n",
--		current->pid, current->comm, print_tainted(),
-+		task_pid_nr(current), current->comm, print_tainted(),
- 		init_utsname()->release,
- 		(int)strcspn(init_utsname()->version, " "),
- 		init_utsname()->version);
-@@ -241,7 +241,7 @@ void __kprobes oops_end(unsigned long fl
- 		panic("Fatal exception in interrupt");
- 	if (panic_on_oops)
- 		panic("Fatal exception");
--	do_exit(signr);
-+	do_group_exit(signr);
- }
- 
- int __kprobes __die(const char *str, struct pt_regs *regs, long err)
-@@ -295,7 +295,7 @@ void die(const char *str, struct pt_regs
- 	unsigned long flags = oops_begin();
- 	int sig = SIGSEGV;
- 
--	if (!user_mode_vm(regs))
-+	if (!user_mode(regs))
- 		report_bug(regs->ip, regs);
- 
- 	if (__die(str, regs, err))
-diff -urNp linux-2.6.32.13/arch/x86/kernel/e820.c linux-2.6.32.13/arch/x86/kernel/e820.c
---- linux-2.6.32.13/arch/x86/kernel/e820.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/e820.c	2010-05-15 13:21:14.068544431 -0400
-@@ -733,7 +733,7 @@ struct early_res {
- };
- static struct early_res early_res[MAX_EARLY_RES] __initdata = {
- 	{ 0, PAGE_SIZE, "BIOS data page" },	/* BIOS data page */
--	{}
-+	{ 0, 0, {0}, 0 }
- };
- 
- static int __init find_overlapped_early(u64 start, u64 end)
-diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_32.c linux-2.6.32.13/arch/x86/kernel/efi_32.c
---- linux-2.6.32.13/arch/x86/kernel/efi_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/efi_32.c	2010-05-15 13:21:14.068544431 -0400
+diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/kernel/efi_32.c
+index 5cab48e..abf8ca2 100644
+--- a/arch/x86/kernel/efi_32.c
++++ b/arch/x86/kernel/efi_32.c
 @@ -38,70 +38,38 @@
   */
  
@@ -10403,9 +11254,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_32.c linux-2.6.32.13/arch/x86/ker
  
  	/*
  	 * After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S	2010-05-15 13:21:14.068544431 -0400
+diff --git a/arch/x86/kernel/efi_stub_32.S b/arch/x86/kernel/efi_stub_32.S
+index fbe66e6..1f61a01 100644
+--- a/arch/x86/kernel/efi_stub_32.S
++++ b/arch/x86/kernel/efi_stub_32.S
 @@ -6,6 +6,7 @@
   */
  
@@ -10504,10 +11356,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S linux-2.6.32.13/arch/x8
  saved_return_addr:
  	.long 0
  efi_rt_function_ptr:
-diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/kernel/entry_32.S
---- linux-2.6.32.13/arch/x86/kernel/entry_32.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/entry_32.S	2010-05-15 13:21:14.068544431 -0400
-@@ -191,7 +191,67 @@
+diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
+index cd49141..cc0b142 100644
+--- a/arch/x86/kernel/entry_32.S
++++ b/arch/x86/kernel/entry_32.S
+@@ -192,7 +192,67 @@
  
  #endif	/* CONFIG_X86_32_LAZY_GS */
  
@@ -10576,7 +11429,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  	cld
  	PUSH_GS
  	pushl %fs
-@@ -224,7 +284,7 @@
+@@ -225,7 +285,7 @@
  	pushl %ebx
  	CFI_ADJUST_CFA_OFFSET 4
  	CFI_REL_OFFSET ebx, 0
@@ -10585,7 +11438,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  	movl %edx, %ds
  	movl %edx, %es
  	movl $(__KERNEL_PERCPU), %edx
-@@ -232,6 +292,15 @@
+@@ -233,6 +293,15 @@
  	SET_KERNEL_GS %edx
  .endm
  
@@ -10601,7 +11454,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  .macro RESTORE_INT_REGS
  	popl %ebx
  	CFI_ADJUST_CFA_OFFSET -4
-@@ -352,7 +421,15 @@ check_userspace:
+@@ -357,7 +426,15 @@ check_userspace:
  	movb PT_CS(%esp), %al
  	andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
  	cmpl $USER_RPL, %eax
@@ -10617,7 +11470,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  
  ENTRY(resume_userspace)
  	LOCKDEP_SYS_EXIT
-@@ -414,10 +491,9 @@ sysenter_past_esp:
+@@ -423,10 +500,9 @@ sysenter_past_esp:
  	/*CFI_REL_OFFSET cs, 0*/
  	/*
  	 * Push current_thread_info()->sysenter_return to the stack.
@@ -10630,7 +11483,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  	CFI_ADJUST_CFA_OFFSET 4
  	CFI_REL_OFFSET eip, 0
  
-@@ -430,9 +506,19 @@ sysenter_past_esp:
+@@ -439,9 +515,19 @@ sysenter_past_esp:
   * Load the potential sixth argument from user stack.
   * Careful about security.
   */
@@ -10650,7 +11503,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  	movl %ebp,PT_EBP(%esp)
  .section __ex_table,"a"
  	.align 4
-@@ -455,12 +541,23 @@ sysenter_do_call:
+@@ -464,12 +550,23 @@ sysenter_do_call:
  	testl $_TIF_ALLWORK_MASK, %ecx
  	jne sysexit_audit
  sysenter_exit:
@@ -10674,7 +11527,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  	PTGS_TO_GS
  	ENABLE_INTERRUPTS_SYSEXIT
  
-@@ -504,11 +601,17 @@ sysexit_audit:
+@@ -513,11 +610,17 @@ sysexit_audit:
  
  	CFI_ENDPROC
  .pushsection .fixup,"ax"
@@ -10694,7 +11547,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  .popsection
  	PTGS_TO_GS_EX
  ENDPROC(ia32_sysenter_target)
-@@ -538,6 +641,10 @@ syscall_exit:
+@@ -551,6 +654,10 @@ syscall_exit:
  	testl $_TIF_ALLWORK_MASK, %ecx	# current->work
  	jne syscall_exit_work
  
@@ -10705,7 +11558,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  restore_all:
  	TRACE_IRQS_IRET
  restore_all_notrace:
-@@ -602,7 +709,13 @@ ldt_ss:
+@@ -615,7 +722,13 @@ ldt_ss:
  	mov PT_OLDESP(%esp), %eax	/* load userspace esp */
  	mov %dx, %ax			/* eax: new kernel esp */
  	sub %eax, %edx			/* offset (low word is 0) */
@@ -10720,7 +11573,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  	shr $16, %edx
  	mov %dl, GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx) /* bits 16..23 */
  	mov %dh, GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx) /* bits 24..31 */
-@@ -642,25 +755,19 @@ work_resched:
+@@ -655,25 +768,19 @@ work_resched:
  
  work_notifysig:				# deal with pending signals and
  					# notify-resume requests
@@ -10749,7 +11602,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  #endif
  	xorl %edx, %edx
  	call do_notify_resume
-@@ -695,6 +802,10 @@ END(syscall_exit_work)
+@@ -708,6 +815,10 @@ END(syscall_exit_work)
  
  	RING0_INT_FRAME			# can't unwind into user space anyway
  syscall_fault:
@@ -10760,7 +11613,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  	GET_THREAD_INFO(%ebp)
  	movl $-EFAULT,PT_EAX(%esp)
  	jmp resume_userspace
-@@ -735,7 +846,13 @@ PTREGSCALL(vm86old)
+@@ -791,7 +902,13 @@ ptregs_clone:
   * normal stack and adjusts ESP with the matching offset.
   */
  	/* fixup the stack */
@@ -10775,23 +11628,15 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  	mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */
  	mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */
  	shl $16, %eax
-@@ -1198,7 +1315,6 @@ return_to_handler:
- 	ret
+@@ -1273,7 +1390,6 @@ return_to_handler:
+ 	jmp *%ecx
  #endif
  
 -.section .rodata,"a"
  #include "syscall_table_32.S"
  
  syscall_table_size=(.-sys_call_table)
-@@ -1250,12 +1366,15 @@ error_code:
- 	movl %ecx, %fs
- 	UNWIND_ESPFIX_STACK
- 	GS_TO_REG %ecx
-+
-+	PAX_ENTER_KERNEL
-+
- 	movl PT_GS(%esp), %edi		# get the function address
- 	movl PT_ORIG_EAX(%esp), %edx	# get the error code
+@@ -1330,9 +1446,12 @@ error_code:
  	movl $-1, PT_ORIG_EAX(%esp)	# no syscall to restart
  	REG_TO_PTGS %ecx
  	SET_KERNEL_GS %ecx
@@ -10799,8 +11644,13 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
 +	movl $(__KERNEL_DS), %ecx
  	movl %ecx, %ds
  	movl %ecx, %es
++
++	PAX_ENTER_KERNEL
++
  	TRACE_IRQS_OFF
-@@ -1351,6 +1470,9 @@ nmi_stack_correct:
+ 	movl %esp,%eax			# pt_regs pointer
+ 	call *%edi
+@@ -1426,6 +1545,9 @@ nmi_stack_correct:
  	xorl %edx,%edx		# zero error code
  	movl %esp,%eax		# pt_regs pointer
  	call do_nmi
@@ -10810,7 +11660,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  	jmp restore_all_notrace
  	CFI_ENDPROC
  
-@@ -1391,6 +1513,9 @@ nmi_espfix_stack:
+@@ -1466,6 +1588,9 @@ nmi_espfix_stack:
  	FIXUP_ESPFIX_STACK		# %eax == %esp
  	xorl %edx,%edx			# zero error code
  	call do_nmi
@@ -10820,9 +11670,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k
  	RESTORE_REGS
  	lss 12+4(%esp), %esp		# back to espfix stack
  	CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/kernel/entry_64.S
---- linux-2.6.32.13/arch/x86/kernel/entry_64.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/entry_64.S	2010-05-15 13:23:38.934774262 -0400
+diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
+index 4db7c4d..1f56a44 100644
+--- a/arch/x86/kernel/entry_64.S
++++ b/arch/x86/kernel/entry_64.S
 @@ -53,6 +53,7 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
@@ -11089,7 +11940,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k
  	call \func
  	.endm
  
-@@ -822,7 +1026,7 @@ ret_from_intr:
+@@ -826,7 +1030,7 @@ ret_from_intr:
  	CFI_ADJUST_CFA_OFFSET	-8
  exit_intr:
  	GET_THREAD_INFO(%rcx)
@@ -11098,7 +11949,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k
  	je retint_kernel
  
  	/* Interrupt came from user space */
-@@ -844,12 +1048,18 @@ retint_swapgs:		/* return to user-space 
+@@ -848,12 +1052,18 @@ retint_swapgs:		/* return to user-space */
  	 * The iretq could re-enable interrupts:
  	 */
  	DISABLE_INTERRUPTS(CLBR_ANY)
@@ -11117,7 +11968,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k
  	/*
  	 * The iretq could re-enable interrupts:
  	 */
-@@ -1032,6 +1242,16 @@ ENTRY(\sym)
+@@ -1040,6 +1250,16 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET 15*8
  	call error_entry
  	DEFAULT_FRAME 0
@@ -11134,7 +11985,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k
  	movq %rsp,%rdi		/* pt_regs pointer */
  	xorl %esi,%esi		/* no error code */
  	call \do_sym
-@@ -1049,6 +1269,16 @@ ENTRY(\sym)
+@@ -1057,6 +1277,16 @@ ENTRY(\sym)
  	subq $15*8, %rsp
  	call save_paranoid
  	TRACE_IRQS_OFF
@@ -11151,7 +12002,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k
  	movq %rsp,%rdi		/* pt_regs pointer */
  	xorl %esi,%esi		/* no error code */
  	call \do_sym
-@@ -1066,9 +1296,24 @@ ENTRY(\sym)
+@@ -1074,9 +1304,24 @@ ENTRY(\sym)
  	subq $15*8, %rsp
  	call save_paranoid
  	TRACE_IRQS_OFF
@@ -11167,17 +12018,17 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k
 +#endif
  	movq %rsp,%rdi		/* pt_regs pointer */
  	xorl %esi,%esi		/* no error code */
--	PER_CPU(init_tss, %rbp)
+-	PER_CPU(init_tss, %r12)
 +#ifdef CONFIG_SMP
-+	imul $TSS_size, PER_CPU_VAR(cpu_number), %ebp
-+	lea init_tss(%rbp), %rbp
++	imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d
++	lea init_tss(%r12), %r12
 +#else
-+	lea init_tss(%rip), %rbp
++	lea init_tss(%rip), %r12
 +#endif
- 	subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
+ 	subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%r12)
  	call \do_sym
- 	addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
-@@ -1085,6 +1330,16 @@ ENTRY(\sym)
+ 	addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%r12)
+@@ -1093,6 +1338,16 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET 15*8
  	call error_entry
  	DEFAULT_FRAME 0
@@ -11194,7 +12045,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k
  	movq %rsp,%rdi			/* pt_regs pointer */
  	movq ORIG_RAX(%rsp),%rsi	/* get error code */
  	movq $-1,ORIG_RAX(%rsp)		/* no syscall to restart */
-@@ -1104,6 +1359,16 @@ ENTRY(\sym)
+@@ -1112,6 +1367,16 @@ ENTRY(\sym)
  	call save_paranoid
  	DEFAULT_FRAME 0
  	TRACE_IRQS_OFF
@@ -11211,7 +12062,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k
  	movq %rsp,%rdi			/* pt_regs pointer */
  	movq ORIG_RAX(%rsp),%rsi	/* get error code */
  	movq $-1,ORIG_RAX(%rsp)		/* no syscall to restart */
-@@ -1405,14 +1670,27 @@ ENTRY(paranoid_exit)
+@@ -1370,14 +1635,27 @@ ENTRY(paranoid_exit)
  	TRACE_IRQS_OFF
  	testl %ebx,%ebx				/* swapgs needed? */
  	jnz paranoid_restore
@@ -11240,7 +12091,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k
  	TRACE_IRQS_IRETQ 0
  	RESTORE_ALL 8
  	jmp irq_return
-@@ -1470,7 +1748,7 @@ ENTRY(error_entry)
+@@ -1435,7 +1713,7 @@ ENTRY(error_entry)
  	movq_cfi r14, R14+8
  	movq_cfi r15, R15+8
  	xorl %ebx,%ebx
@@ -11249,7 +12100,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k
  	je error_kernelspace
  error_swapgs:
  	SWAPGS
-@@ -1529,6 +1807,16 @@ ENTRY(nmi)
+@@ -1499,6 +1777,16 @@ ENTRY(nmi)
  	CFI_ADJUST_CFA_OFFSET 15*8
  	call save_paranoid
  	DEFAULT_FRAME 0
@@ -11266,7 +12117,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k
  	/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
  	movq %rsp,%rdi
  	movq $-1,%rsi
-@@ -1539,11 +1827,12 @@ ENTRY(nmi)
+@@ -1509,11 +1797,12 @@ ENTRY(nmi)
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	testl %ebx,%ebx				/* swapgs needed? */
  	jnz nmi_restore
@@ -11280,11 +12131,12 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k
  	RESTORE_ALL 8
  	jmp irq_return
  nmi_userspace:
-diff -urNp linux-2.6.32.13/arch/x86/kernel/ftrace.c linux-2.6.32.13/arch/x86/kernel/ftrace.c
---- linux-2.6.32.13/arch/x86/kernel/ftrace.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/ftrace.c	2010-05-15 13:21:14.070771689 -0400
-@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
- {
+diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
+index cd37469..1a535d2 100644
+--- a/arch/x86/kernel/ftrace.c
++++ b/arch/x86/kernel/ftrace.c
+@@ -174,7 +174,9 @@ void ftrace_nmi_enter(void)
+ 
  	if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
  		smp_rmb();
 +		pax_open_kernel();
@@ -11293,7 +12145,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ftrace.c linux-2.6.32.13/arch/x86/ker
  		atomic_inc(&nmi_update_count);
  	}
  	/* Must have previous changes seen before executions */
-@@ -215,7 +217,7 @@ do_ftrace_mod_code(unsigned long ip, voi
+@@ -260,7 +262,7 @@ do_ftrace_mod_code(unsigned long ip, void *new_code)
  
  
  
@@ -11302,7 +12154,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ftrace.c linux-2.6.32.13/arch/x86/ker
  
  static unsigned char *ftrace_nop_replace(void)
  {
-@@ -228,6 +230,8 @@ ftrace_modify_code(unsigned long ip, uns
+@@ -273,6 +275,8 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
  {
  	unsigned char replaced[MCOUNT_INSN_SIZE];
  
@@ -11311,7 +12163,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ftrace.c linux-2.6.32.13/arch/x86/ker
  	/*
  	 * Note: Due to modules and __init, code can
  	 *  disappear and change, we need to protect against faulting
-@@ -284,7 +288,7 @@ int ftrace_update_ftrace_func(ftrace_fun
+@@ -329,7 +333,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
  	unsigned char old[MCOUNT_INSN_SIZE], *new;
  	int ret;
  
@@ -11320,26 +12172,26 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ftrace.c linux-2.6.32.13/arch/x86/ker
  	new = ftrace_call_replace(ip, (unsigned long)func);
  	ret = ftrace_modify_code(ip, old, new);
  
-@@ -337,15 +341,15 @@ int __init ftrace_dyn_arch_init(void *da
+@@ -382,15 +386,15 @@ int __init ftrace_dyn_arch_init(void *data)
  	switch (faulted) {
  	case 0:
- 		pr_info("ftrace: converting mcount calls to 0f 1f 44 00 00\n");
+ 		pr_info("converting mcount calls to 0f 1f 44 00 00\n");
 -		memcpy(ftrace_nop, ftrace_test_p6nop, MCOUNT_INSN_SIZE);
 +		memcpy(ftrace_nop, ktla_ktva(ftrace_test_p6nop), MCOUNT_INSN_SIZE);
  		break;
  	case 1:
- 		pr_info("ftrace: converting mcount calls to 66 66 66 66 90\n");
+ 		pr_info("converting mcount calls to 66 66 66 66 90\n");
 -		memcpy(ftrace_nop, ftrace_test_nop5, MCOUNT_INSN_SIZE);
 +		memcpy(ftrace_nop, ktla_ktva(ftrace_test_nop5), MCOUNT_INSN_SIZE);
  		break;
  	case 2:
- 		pr_info("ftrace: converting mcount calls to jmp . + 5\n");
+ 		pr_info("converting mcount calls to jmp . + 5\n");
 -		memcpy(ftrace_nop, ftrace_test_jmp, MCOUNT_INSN_SIZE);
 +		memcpy(ftrace_nop, ktla_ktva(ftrace_test_jmp), MCOUNT_INSN_SIZE);
  		break;
  	}
  
-@@ -366,6 +370,8 @@ static int ftrace_mod_jmp(unsigned long 
+@@ -411,6 +415,8 @@ static int ftrace_mod_jmp(unsigned long ip,
  {
  	unsigned char code[MCOUNT_INSN_SIZE];
  
@@ -11348,10 +12200,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ftrace.c linux-2.6.32.13/arch/x86/ker
  	if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
  		return -EFAULT;
  
-diff -urNp linux-2.6.32.13/arch/x86/kernel/head32.c linux-2.6.32.13/arch/x86/kernel/head32.c
---- linux-2.6.32.13/arch/x86/kernel/head32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/head32.c	2010-05-15 13:21:14.070771689 -0400
-@@ -16,6 +16,7 @@
+diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
+index b2e2460..cd2698e 100644
+--- a/arch/x86/kernel/head32.c
++++ b/arch/x86/kernel/head32.c
+@@ -17,6 +17,7 @@
  #include <asm/apic.h>
  #include <asm/io_apic.h>
  #include <asm/bios_ebda.h>
@@ -11359,24 +12212,20 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head32.c linux-2.6.32.13/arch/x86/ker
  
  static void __init i386_default_early_setup(void)
  {
-@@ -31,7 +32,7 @@ void __init i386_start_kernel(void)
- {
- 	reserve_trampoline_memory();
+@@ -40,7 +41,7 @@ void __init i386_start_kernel(void)
+ 					 "EX TRAMPOLINE");
+ #endif
  
 -	reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
 +	reserve_early(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
  
  #ifdef CONFIG_BLK_DEV_INITRD
  	/* Reserve INITRD */
-diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/kernel/head_32.S
---- linux-2.6.32.13/arch/x86/kernel/head_32.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/head_32.S	2010-05-15 13:21:14.070771689 -0400
-@@ -19,10 +19,17 @@
- #include <asm/setup.h>
- #include <asm/processor-flags.h>
- #include <asm/percpu.h>
-+#include <asm/msr-index.h>
- 
+diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
+index 75e3981..5674277 100644
+--- a/arch/x86/kernel/head_32.S
++++ b/arch/x86/kernel/head_32.S
+@@ -25,6 +25,12 @@
  /* Physical address */
  #define pa(X) ((X) - __PAGE_OFFSET)
  
@@ -11389,7 +12238,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  /*
   * References to members of the new_cpu_data structure.
   */
-@@ -52,11 +59,7 @@
+@@ -54,11 +60,7 @@
   * and small than max_low_pfn, otherwise will waste some page table entries
   */
  
@@ -11402,7 +12251,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  
  /* Enough space to fit pagetables for the low memory linear map */
  MAPPING_BEYOND_END = \
-@@ -73,6 +76,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_P
+@@ -75,6 +77,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE_asm
  RESERVE_BRK(pagetables, INIT_MAP_SIZE)
  
  /*
@@ -11415,7 +12264,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
   * 32-bit kernel entrypoint; only used by the boot CPU.  On entry,
   * %esi points to the real-mode code as a 32-bit pointer.
   * CS and DS must be 4 GB flat segments, but we don't depend on
-@@ -80,6 +89,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
+@@ -82,6 +90,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
   * can.
   */
  __HEAD
@@ -11429,7 +12278,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  ENTRY(startup_32)
  	/* test KEEP_SEGMENTS flag to see if the bootloader is asking
  		us to not reload segments */
-@@ -97,6 +113,55 @@ ENTRY(startup_32)
+@@ -99,6 +114,55 @@ ENTRY(startup_32)
  	movl %eax,%gs
  2:
  
@@ -11485,7 +12334,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  /*
   * Clear BSS first so that there are no surprises...
   */
-@@ -140,9 +205,7 @@ ENTRY(startup_32)
+@@ -142,9 +206,7 @@ ENTRY(startup_32)
  	cmpl $num_subarch_entries, %eax
  	jae bad_subarch
  
@@ -11496,7 +12345,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  
  bad_subarch:
  WEAK(lguest_entry)
-@@ -154,10 +217,10 @@ WEAK(xen_entry)
+@@ -156,10 +218,10 @@ WEAK(xen_entry)
  	__INITDATA
  
  subarch_entries:
@@ -11511,7 +12360,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  num_subarch_entries = (. - subarch_entries) / 4
  .previous
  #endif /* CONFIG_PARAVIRT */
-@@ -218,8 +281,11 @@ default_entry:
+@@ -220,8 +282,11 @@ default_entry:
  	movl %eax, pa(max_pfn_mapped)
  
  	/* Do early initialization of the fixmap area */
@@ -11525,7 +12374,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  #else	/* Not PAE */
  
  page_pde_offset = (__PAGE_OFFSET >> 20);
-@@ -249,8 +315,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
+@@ -251,8 +316,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
  	movl %eax, pa(max_pfn_mapped)
  
  	/* Do early initialization of the fixmap area */
@@ -11539,34 +12388,25 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  #endif
  	jmp 3f
  /*
-@@ -297,6 +366,7 @@ ENTRY(startup_32_smp)
+@@ -299,6 +367,7 @@ ENTRY(startup_32_smp)
  	orl %edx,%eax
  	movl %eax,%cr4
  
 +#ifdef CONFIG_X86_PAE
- 	btl $5, %eax		# check if PAE is enabled
- 	jnc 6f
- 
-@@ -312,13 +382,17 @@ ENTRY(startup_32_smp)
- 	jnc 6f
- 
- 	/* Setup EFER (Extended Feature Enable Register) */
--	movl $0xc0000080, %ecx
-+	movl $MSR_EFER, %ecx
- 	rdmsr
+ 	testb $X86_CR4_PAE, %al		# check if PAE is enabled
+ 	jz 6f
  
- 	btsl $11, %eax
+@@ -323,6 +392,9 @@ ENTRY(startup_32_smp)
  	/* Make changes effective */
  	wrmsr
  
 +	btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
-+	movl $1,pa(nx_enabled)
 +#endif
 +
  6:
  
  /*
-@@ -344,9 +418,7 @@ ENTRY(startup_32_smp)
+@@ -348,9 +420,7 @@ ENTRY(startup_32_smp)
  
  #ifdef CONFIG_SMP
  	cmpb $0, ready
@@ -11577,7 +12417,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  #endif /* CONFIG_SMP */
  
  /*
-@@ -424,7 +496,7 @@ is386:	movl $2,%ecx		# set MP
+@@ -428,7 +498,7 @@ is386:	movl $2,%ecx		# set MP
  1:	movl $(__KERNEL_DS),%eax	# reload all the segment registers
  	movl %eax,%ss			# after changing gdt.
  
@@ -11586,20 +12426,20 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  	movl %eax,%ds
  	movl %eax,%es
  
-@@ -438,8 +510,11 @@ is386:	movl $2,%ecx		# set MP
+@@ -442,8 +512,11 @@ is386:	movl $2,%ecx		# set MP
  	 */
  	cmpb $0,ready
  	jne 1f
--	movl $per_cpu__gdt_page,%eax
+-	movl $gdt_page,%eax
 +	movl $cpu_gdt_table,%eax
- 	movl $per_cpu__stack_canary,%ecx
+ 	movl $stack_canary,%ecx
 +#ifdef CONFIG_SMP
 +	addl $__per_cpu_load,%ecx
 +#endif
  	movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
  	shrl $16, %ecx
  	movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
-@@ -457,10 +532,6 @@ is386:	movl $2,%ecx		# set MP
+@@ -461,10 +534,6 @@ is386:	movl $2,%ecx		# set MP
  #ifdef CONFIG_SMP
  	movb ready, %cl
  	movb $1, ready
@@ -11610,7 +12450,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  #endif /* CONFIG_SMP */
  	jmp *(initial_code)
  
-@@ -546,22 +617,22 @@ early_page_fault:
+@@ -550,22 +619,22 @@ early_page_fault:
  	jmp early_fault
  
  early_fault:
@@ -11638,7 +12478,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  hlt_loop:
  	hlt
  	jmp hlt_loop
-@@ -569,8 +640,11 @@ hlt_loop:
+@@ -573,8 +642,11 @@ hlt_loop:
  /* This is the default interrupt "handler" :-) */
  	ALIGN
  ignore_int:
@@ -11651,7 +12491,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  	pushl %eax
  	pushl %ecx
  	pushl %edx
-@@ -579,9 +653,6 @@ ignore_int:
+@@ -583,9 +655,6 @@ ignore_int:
  	movl $(__KERNEL_DS),%eax
  	movl %eax,%ds
  	movl %eax,%es
@@ -11661,7 +12501,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  	pushl 16(%esp)
  	pushl 24(%esp)
  	pushl 32(%esp)
-@@ -608,27 +679,45 @@ ENTRY(initial_code)
+@@ -614,31 +683,47 @@ ENTRY(initial_page_table)
  /*
   * BSS section
   */
@@ -11676,9 +12516,18 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  ENTRY(swapper_pg_dir)
  	.fill 1024,4,0
  #endif
-+
++.section .swapper_pg_fixmap,"a",@progbits
  swapper_pg_fixmap:
  	.fill 1024,4,0
+ #ifdef CONFIG_X86_TRAMPOLINE
++.section .trampoline_pg_dir,"a",@progbits
+ ENTRY(trampoline_pg_dir)
++#ifdef CONFIG_X86_PAE
++	.fill 4,8,0
++#else
+ 	.fill 1024,4,0
+ #endif
++#endif
 +
 +.section .empty_zero_page,"a",@progbits
  ENTRY(empty_zero_page)
@@ -11702,17 +12551,22 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
 -	.align PAGE_SIZE_asm
 +.section .swapper_pg_dir,"a",@progbits
 +
+ ENTRY(swapper_pg_dir)
+ 	.long	pa(swapper_pg_pmd+PGD_IDENT_ATTR),0	/* low identity map */
+ # if KPMDS == 3
+@@ -657,15 +742,24 @@ ENTRY(swapper_pg_dir)
+ #  error "Kernel PMDs should be 1, 2 or 3"
+ # endif
+ 	.align PAGE_SIZE_asm		/* needs to be page-sized too */
++
 +#ifdef CONFIG_PAX_PER_CPU_PGD
 +ENTRY(cpu_pgd)
 +	.rept NR_CPUS
-+	.fill	512,8,0
++	.fill	4,8,0
 +	.endr
 +#endif
 +
- ENTRY(swapper_pg_dir)
- 	.long	pa(swapper_pg_pmd+PGD_IDENT_ATTR),0	/* low identity map */
- # if KPMDS == 3
-@@ -651,11 +740,12 @@ ENTRY(swapper_pg_dir)
+ #endif
  
  .data
  ENTRY(stack_start)
@@ -11726,7 +12580,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  early_recursion_flag:
  	.long 0
  
-@@ -691,7 +781,7 @@ fault_msg:
+@@ -701,7 +795,7 @@ fault_msg:
  	.word 0				# 32 bit align gdt_desc.address
  boot_gdt_descr:
  	.word __BOOT_DS+7
@@ -11735,16 +12589,16 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
  
  	.word 0				# 32-bit align idt_desc.address
  idt_descr:
-@@ -702,7 +792,7 @@ idt_descr:
+@@ -712,7 +806,7 @@ idt_descr:
  	.word 0				# 32 bit align gdt_desc.address
  ENTRY(early_gdt_descr)
  	.word GDT_ENTRIES*8-1
--	.long per_cpu__gdt_page		/* Overwritten for secondary CPUs */
+-	.long gdt_page			/* Overwritten for secondary CPUs */
 +	.long cpu_gdt_table		/* Overwritten for secondary CPUs */
  
  /*
   * The boot_gdt must mirror the equivalent in setup.S and is
-@@ -711,5 +801,65 @@ ENTRY(early_gdt_descr)
+@@ -721,5 +815,65 @@ ENTRY(early_gdt_descr)
  	.align L1_CACHE_BYTES
  ENTRY(boot_gdt)
  	.fill GDT_ENTRY_BOOT_CS,8,0
@@ -11812,26 +12666,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke
 +	/* Be sure this is zeroed to avoid false validations in Xen */
 +	.fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +	.endr
-diff -urNp linux-2.6.32.13/arch/x86/kernel/head64.c linux-2.6.32.13/arch/x86/kernel/head64.c
---- linux-2.6.32.13/arch/x86/kernel/head64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/head64.c	2010-05-15 13:21:14.070771689 -0400
-@@ -29,7 +29,13 @@
- static void __init zap_identity_mappings(void)
- {
- 	pgd_t *pgd = pgd_offset_k(0UL);
-+
-+#ifdef CONFIG_PAX_PER_CPU_PGD
-+	set_pgd(pgd, native_make_pgd(0));
-+#else
- 	pgd_clear(pgd);
-+#endif
-+
- 	__flush_tlb_all();
- }
- 
-diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/kernel/head_64.S
---- linux-2.6.32.13/arch/x86/kernel/head_64.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/head_64.S	2010-05-15 13:21:14.070771689 -0400
+diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
+index 3d1e6f1..708f920 100644
+--- a/arch/x86/kernel/head_64.S
++++ b/arch/x86/kernel/head_64.S
 @@ -19,6 +19,7 @@
  #include <asm/cache.h>
  #include <asm/processor-flags.h>
@@ -11840,7 +12678,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/ke
  
  #ifdef CONFIG_PARAVIRT
  #include <asm/asm-offsets.h>
-@@ -38,6 +39,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET
+@@ -38,6 +39,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
  L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
  L4_START_KERNEL = pgd_index(__START_KERNEL_map)
  L3_START_KERNEL = pud_index(__START_KERNEL_map)
@@ -11866,12 +12704,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/ke
  
 -	addq	%rbp, level3_kernel_pgt + (510*8)(%rip)
 -	addq	%rbp, level3_kernel_pgt + (511*8)(%rip)
-+	addq	%rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
- 
+-
 -	addq	%rbp, level2_fixmap_pgt + (506*8)(%rip)
-+	addq	%rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
-+	addq	%rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
- 
+-
 -	/* Add an Identity mapping if I am above 1G */
 -	leaq	_text(%rip), %rdi
 -	andq	$PMD_PAGE_MASK, %rdi
@@ -11880,11 +12715,14 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/ke
 -	shrq	$PUD_SHIFT, %rax
 -	andq	$(PTRS_PER_PUD - 1), %rax
 -	jz	ident_complete
--
++	addq	%rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
+ 
 -	leaq	(level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
 -	leaq	level3_ident_pgt(%rip), %rbx
 -	movq	%rdx, 0(%rbx, %rax, 8)
--
++	addq	%rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
++	addq	%rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
+ 
 -	movq	%rdi, %rax
 -	shrq	$PMD_SHIFT, %rax
 -	andq	$(PTRS_PER_PMD - 1), %rax
@@ -11908,7 +12746,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/ke
  	movq	%rax, %cr4
  
  	/* Setup early boot stage 4 level pagetables. */
-@@ -184,9 +176,13 @@ ENTRY(secondary_startup_64)
+@@ -184,9 +176,14 @@ ENTRY(secondary_startup_64)
  	movl	$MSR_EFER, %ecx
  	rdmsr
  	btsl	$_EFER_SCE, %eax	/* Enable System Call */
@@ -11920,20 +12758,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/ke
 +	btsq	$_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
 +	btsq	$_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
 +	btsq	$_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
++	btsq	$_PAGE_BIT_NX, __supported_pte_mask(%rip)
  1:	wrmsr				/* Make changes effective */
  
  	/* Setup cr0 */
-@@ -262,16 +258,16 @@ ENTRY(secondary_startup_64)
- 	.quad	x86_64_start_kernel
- 	ENTRY(initial_gs)
- 	.quad	INIT_PER_CPU_VAR(irq_stack_union)
--	__FINITDATA
- 
- 	ENTRY(stack_start)
- 	.quad  init_thread_union+THREAD_SIZE-8
- 	.word  0
-+	__FINITDATA
- 
+@@ -271,7 +268,7 @@ ENTRY(secondary_startup_64)
  bad_address:
  	jmp bad_address
  
@@ -11942,7 +12771,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/ke
  #ifdef CONFIG_EARLY_PRINTK
  	.globl early_idt_handlers
  early_idt_handlers:
-@@ -316,18 +312,23 @@ ENTRY(early_idt_handler)
+@@ -316,18 +313,23 @@ ENTRY(early_idt_handler)
  #endif /* EARLY_PRINTK */
  1:	hlt
  	jmp 1b
@@ -11967,7 +12796,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/ke
  #define NEXT_PAGE(name) \
  	.balign	PAGE_SIZE; \
  ENTRY(name)
-@@ -350,13 +351,36 @@ NEXT_PAGE(init_level4_pgt)
+@@ -351,13 +353,36 @@ NEXT_PAGE(init_level4_pgt)
  	.quad	level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
  	.org	init_level4_pgt + L4_PAGE_OFFSET*8, 0
  	.quad	level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
@@ -12004,7 +12833,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/ke
  
  NEXT_PAGE(level3_kernel_pgt)
  	.fill	L3_START_KERNEL,8,0
-@@ -364,20 +388,23 @@ NEXT_PAGE(level3_kernel_pgt)
+@@ -365,20 +390,23 @@ NEXT_PAGE(level3_kernel_pgt)
  	.quad	level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
  	.quad	level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
  
@@ -12036,7 +12865,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/ke
  
  NEXT_PAGE(level2_kernel_pgt)
  	/*
-@@ -390,33 +417,55 @@ NEXT_PAGE(level2_kernel_pgt)
+@@ -391,33 +419,55 @@ NEXT_PAGE(level2_kernel_pgt)
  	 *  If you want to increase this then increase MODULES_VADDR
  	 *  too.)
  	 */
@@ -12102,9 +12931,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/ke
  
  	__PAGE_ALIGNED_BSS
  	.align PAGE_SIZE
-diff -urNp linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c	2010-05-15 13:21:14.070771689 -0400
+diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
+index 9c3bd4a..e1d9b35 100644
+--- a/arch/x86/kernel/i386_ksyms_32.c
++++ b/arch/x86/kernel/i386_ksyms_32.c
 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
  EXPORT_SYMBOL(cmpxchg8b_emu);
  #endif
@@ -12126,9 +12956,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.13/arch/
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff -urNp linux-2.6.32.13/arch/x86/kernel/init_task.c linux-2.6.32.13/arch/x86/kernel/init_task.c
---- linux-2.6.32.13/arch/x86/kernel/init_task.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/init_task.c	2010-05-15 13:21:14.070771689 -0400
+diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
+index 43e9ccf..c40716b 100644
+--- a/arch/x86/kernel/init_task.c
++++ b/arch/x86/kernel/init_task.c
 @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
   * section. Since TSS's are completely CPU-local, we want them
   * on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -12137,9 +12968,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/init_task.c linux-2.6.32.13/arch/x86/
 -
 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
-diff -urNp linux-2.6.32.13/arch/x86/kernel/ioport.c linux-2.6.32.13/arch/x86/kernel/ioport.c
---- linux-2.6.32.13/arch/x86/kernel/ioport.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/ioport.c	2010-05-15 13:21:14.070771689 -0400
+diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
+index 8eec0ec..ef34e2d 100644
+--- a/arch/x86/kernel/ioport.c
++++ b/arch/x86/kernel/ioport.c
 @@ -6,6 +6,7 @@
  #include <linux/sched.h>
  #include <linux/kernel.h>
@@ -12148,12 +12980,12 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ioport.c linux-2.6.32.13/arch/x86/ker
  #include <linux/errno.h>
  #include <linux/types.h>
  #include <linux/ioport.h>
-@@ -41,6 +42,12 @@ asmlinkage long sys_ioperm(unsigned long
+@@ -41,6 +42,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
  
  	if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
  		return -EINVAL;
 +#ifdef CONFIG_GRKERNSEC_IO
-+	if (turn_on) {
++	if (turn_on && grsec_disable_privio) {
 +		gr_handle_ioperm();
 +		return -EPERM;
 +	}
@@ -12161,7 +12993,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ioport.c linux-2.6.32.13/arch/x86/ker
  	if (turn_on && !capable(CAP_SYS_RAWIO))
  		return -EPERM;
  
-@@ -67,7 +74,7 @@ asmlinkage long sys_ioperm(unsigned long
+@@ -67,7 +74,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
  	 * because the ->io_bitmap_max value must match the bitmap
  	 * contents:
  	 */
@@ -12170,24 +13002,24 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ioport.c linux-2.6.32.13/arch/x86/ker
  
  	set_bitmap(t->io_bitmap_ptr, from, num, !turn_on);
  
-@@ -111,8 +118,13 @@ static int do_iopl(unsigned int level, s
+@@ -112,6 +119,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
  		return -EINVAL;
  	/* Trying to gain more privileges? */
  	if (level > old) {
 +#ifdef CONFIG_GRKERNSEC_IO
-+		gr_handle_iopl();
-+		return -EPERM;
-+#else
++		if (grsec_disable_privio) {
++			gr_handle_iopl();
++			return -EPERM;
++		}
++#endif
  		if (!capable(CAP_SYS_RAWIO))
  			return -EPERM;
-+#endif
  	}
- 	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
- 
-diff -urNp linux-2.6.32.13/arch/x86/kernel/irq_32.c linux-2.6.32.13/arch/x86/kernel/irq_32.c
---- linux-2.6.32.13/arch/x86/kernel/irq_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/irq_32.c	2010-05-15 13:21:14.070771689 -0400
-@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
+diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
+index 10709f2..eff1abb 100644
+--- a/arch/x86/kernel/irq_32.c
++++ b/arch/x86/kernel/irq_32.c
+@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
  		return 0;
  
  	/* build the stack frame on the IRQ stack */
@@ -12205,11 +13037,21 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/irq_32.c linux-2.6.32.13/arch/x86/ker
  
  		call_on_stack(__do_softirq, isp);
  		/*
-diff -urNp linux-2.6.32.13/arch/x86/kernel/kgdb.c linux-2.6.32.13/arch/x86/kernel/kgdb.c
---- linux-2.6.32.13/arch/x86/kernel/kgdb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/kgdb.c	2010-05-15 13:21:14.070771689 -0400
-@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
- 	return instruction_pointer(regs);
+diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
+index 01ab17a..5512ff4 100644
+--- a/arch/x86/kernel/kgdb.c
++++ b/arch/x86/kernel/kgdb.c
+@@ -77,7 +77,7 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
+ 	gdb_regs[GDB_CS]	= regs->cs;
+ 	gdb_regs[GDB_FS]	= 0xFFFF;
+ 	gdb_regs[GDB_GS]	= 0xFFFF;
+-	if (user_mode_vm(regs)) {
++	if (user_mode(regs)) {
+ 		gdb_regs[GDB_SS] = regs->ss;
+ 		gdb_regs[GDB_SP] = regs->sp;
+ 	} else {
+@@ -720,7 +720,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)
+ 	regs->ip = ip;
  }
  
 -struct kgdb_arch arch_kgdb_ops = {
@@ -12217,44 +13059,47 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/kgdb.c linux-2.6.32.13/arch/x86/kerne
  	/* Breakpoint instruction: */
  	.gdb_bpt_instr		= { 0xcc },
  	.flags			= KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/kprobes.c linux-2.6.32.13/arch/x86/kernel/kprobes.c
---- linux-2.6.32.13/arch/x86/kernel/kprobes.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/kprobes.c	2010-05-15 13:23:38.934774262 -0400
-@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
- 		char op;
+diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
+index 675879b..8c44581 100644
+--- a/arch/x86/kernel/kprobes.c
++++ b/arch/x86/kernel/kprobes.c
+@@ -114,9 +114,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
  		s32 raddr;
- 	} __attribute__((packed)) * jop;
--	jop = (struct __arch_jmp_op *)from;
-+
-+	jop = (struct __arch_jmp_op *)(ktla_ktva(from));
+ 	} __attribute__((packed)) *insn;
+ 
+-	insn = (struct __arch_relative_insn *)from;
++	insn = (struct __arch_relative_insn *)(ktla_ktva(from));
 +
 +	pax_open_kernel();
- 	jop->raddr = (s32)((long)(to) - ((long)(from) + 5));
- 	jop->op = RELATIVEJUMP_INSTRUCTION;
+ 	insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
+ 	insn->op = op;
 +	pax_close_kernel();
  }
  
- /*
-@@ -337,7 +341,9 @@ static void __kprobes fix_riprel(struct 
- 			disp = (u8 *) p->addr + *((s32 *) insn) -
- 			       (u8 *) p->ainsn.insn;
- 			BUG_ON((s64) (s32) disp != disp); /* Sanity check.  */
-+			pax_open_kernel();
- 			*(s32 *)insn = (s32) disp;
-+			pax_close_kernel();
+ /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
+@@ -315,7 +318,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
  		}
  	}
- #endif
-@@ -345,16 +351,18 @@ static void __kprobes fix_riprel(struct 
- 
- static void __kprobes arch_copy_kprobe(struct kprobe *p)
- {
--	memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
+ 	insn_get_length(&insn);
 +	pax_open_kernel();
-+	memcpy(p->ainsn.insn, ktla_ktva(p->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
+ 	memcpy(dest, insn.kaddr, insn.length);
 +	pax_close_kernel();
  
- 	fix_riprel(p);
+ #ifdef CONFIG_X86_64
+ 	if (insn_rip_relative(&insn)) {
+@@ -339,7 +344,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
+ 			  (u8 *) dest;
+ 		BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check.  */
+ 		disp = (u8 *) dest + insn_offset_displacement(&insn);
++		pax_open_kernel();
+ 		*(s32 *) disp = (s32) newdisp;
++		pax_close_kernel();
+ 	}
+ #endif
+ 	return insn.length;
+@@ -353,12 +360,12 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p)
+ 	 */
+ 	__copy_instruction(p->ainsn.insn, p->addr, 0);
  
 -	if (can_boost(p->addr))
 +	if (can_boost(ktla_ktva(p->addr)))
@@ -12267,7 +13112,16 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/kprobes.c linux-2.6.32.13/arch/x86/ke
  }
  
  int __kprobes arch_prepare_kprobe(struct kprobe *p)
-@@ -432,7 +440,7 @@ static void __kprobes prepare_singlestep
+@@ -475,7 +482,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
+ 		 * nor set current_kprobe, because it doesn't use single
+ 		 * stepping.
+ 		 */
+-		regs->ip = (unsigned long)p->ainsn.insn;
++		regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
+ 		preempt_enable_no_resched();
+ 		return;
+ 	}
+@@ -494,7 +501,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
  	if (p->opcode == BREAKPOINT_INSTRUCTION)
  		regs->ip = (unsigned long)p->addr;
  	else
@@ -12275,26 +13129,17 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/kprobes.c linux-2.6.32.13/arch/x86/ke
 +		regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
  }
  
- void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
-@@ -453,7 +461,7 @@ static void __kprobes setup_singlestep(s
- 	if (p->ainsn.boostable == 1 && !p->post_handler) {
- 		/* Boost up -- we can execute copied instructions directly */
- 		reset_current_kprobe();
--		regs->ip = (unsigned long)p->ainsn.insn;
-+		regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
- 		preempt_enable_no_resched();
- 		return;
- 	}
-@@ -523,7 +531,7 @@ static int __kprobes kprobe_handler(stru
- 	struct kprobe_ctlblk *kcb;
- 
- 	addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
--	if (*addr != BREAKPOINT_INSTRUCTION) {
-+	if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
+ /*
+@@ -573,7 +580,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
+ 				setup_singlestep(p, regs, kcb, 0);
+ 			return 1;
+ 		}
+-	} else if (*addr != BREAKPOINT_INSTRUCTION) {
++	} else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
  		/*
  		 * The breakpoint instruction was removed right
  		 * after we hit it.  Another cpu has removed
-@@ -775,7 +783,7 @@ static void __kprobes resume_execution(s
+@@ -799,7 +806,7 @@ static void __kprobes resume_execution(struct kprobe *p,
  		struct pt_regs *regs, struct kprobe_ctlblk *kcb)
  {
  	unsigned long *tos = stack_addr(regs);
@@ -12303,7 +13148,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/kprobes.c linux-2.6.32.13/arch/x86/ke
  	unsigned long orig_ip = (unsigned long)p->addr;
  	kprobe_opcode_t *insn = p->ainsn.insn;
  
-@@ -958,7 +966,7 @@ int __kprobes kprobe_exceptions_notify(s
+@@ -982,7 +989,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
  	struct die_args *args = data;
  	int ret = NOTIFY_DONE;
  
@@ -12312,10 +13157,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/kprobes.c linux-2.6.32.13/arch/x86/ke
  		return ret;
  
  	switch (val) {
-diff -urNp linux-2.6.32.13/arch/x86/kernel/ldt.c linux-2.6.32.13/arch/x86/kernel/ldt.c
---- linux-2.6.32.13/arch/x86/kernel/ldt.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/ldt.c	2010-05-15 13:21:14.074681352 -0400
-@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
+diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
+index ea69726..604d066 100644
+--- a/arch/x86/kernel/ldt.c
++++ b/arch/x86/kernel/ldt.c
+@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
  	if (reload) {
  #ifdef CONFIG_SMP
  		preempt_disable();
@@ -12331,7 +13177,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ldt.c linux-2.6.32.13/arch/x86/kernel
  #endif
  	}
  	if (oldsize) {
-@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t 
+@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
  		return err;
  
  	for (i = 0; i < old->size; i++)
@@ -12340,13 +13186,13 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ldt.c linux-2.6.32.13/arch/x86/kernel
  	return 0;
  }
  
-@@ -115,6 +115,24 @@ int init_new_context(struct task_struct 
+@@ -116,6 +116,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
  		retval = copy_ldt(&mm->context, &old_mm->context);
  		mutex_unlock(&old_mm->context.lock);
  	}
 +
 +	if (tsk == current) {
-+		mm->context.vdso = ~0UL;
++		mm->context.vdso = 0;
 +
 +#ifdef CONFIG_X86_32
 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
@@ -12365,7 +13211,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ldt.c linux-2.6.32.13/arch/x86/kernel
  	return retval;
  }
  
-@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, u
+@@ -230,6 +248,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
  		}
  	}
  
@@ -12379,19 +13225,20 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ldt.c linux-2.6.32.13/arch/x86/kernel
  	fill_ldt(&ldt, &ldt_info);
  	if (oldmode)
  		ldt.avl = 0;
-diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c	2010-05-15 13:21:14.082777933 -0400
-@@ -26,7 +26,7 @@
- #include <asm/system.h>
+diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
+index a3fa43b..8966f4c 100644
+--- a/arch/x86/kernel/machine_kexec_32.c
++++ b/arch/x86/kernel/machine_kexec_32.c
+@@ -27,7 +27,7 @@
  #include <asm/cacheflush.h>
+ #include <asm/debugreg.h>
  
 -static void set_idt(void *newidt, __u16 limit)
 +static void set_idt(struct desc_struct *newidt, __u16 limit)
  {
  	struct desc_ptr curidt;
  
-@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 
+@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit)
  }
  
  
@@ -12409,27 +13256,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.13/ar
  
  	relocate_kernel_ptr = control_page;
  	page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c
---- linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c	2010-05-15 13:21:14.082777933 -0400
-@@ -126,7 +126,13 @@ static int init_level4_page(struct kimag
- 	}
- 	/* clear the unused entries */
- 	while (addr < end_addr) {
-+
-+#ifdef CONFIG_PAX_PER_CPU_PGD
-+		set_pgd(level4p++, native_make_pgd(0));
-+#else
- 		pgd_clear(level4p++);
-+#endif
-+
- 		addr += PGDIR_SIZE;
- 	}
- out:
-diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_amd.c linux-2.6.32.13/arch/x86/kernel/microcode_amd.c
---- linux-2.6.32.13/arch/x86/kernel/microcode_amd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/microcode_amd.c	2010-05-15 13:21:14.082777933 -0400
-@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
+diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
+index e1af7c0..db0032e 100644
+--- a/arch/x86/kernel/microcode_amd.c
++++ b/arch/x86/kernel/microcode_amd.c
+@@ -331,7 +331,7 @@ static void microcode_fini_cpu_amd(int cpu)
  	uci->mc = NULL;
  }
  
@@ -12438,7 +13269,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_amd.c linux-2.6.32.13/arch/
  	.request_microcode_user           = request_microcode_user,
  	.request_microcode_fw             = request_microcode_fw,
  	.collect_cpu_info                 = collect_cpu_info_amd,
-@@ -354,7 +354,7 @@ static struct microcode_ops microcode_am
+@@ -339,7 +339,7 @@ static struct microcode_ops microcode_amd_ops = {
  	.microcode_fini_cpu               = microcode_fini_cpu_amd,
  };
  
@@ -12447,10 +13278,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_amd.c linux-2.6.32.13/arch/
  {
  	return &microcode_amd_ops;
  }
-diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_core.c linux-2.6.32.13/arch/x86/kernel/microcode_core.c
---- linux-2.6.32.13/arch/x86/kernel/microcode_core.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/microcode_core.c	2010-05-15 13:21:14.082777933 -0400
-@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
+diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
+index fa6551d..43662ff 100644
+--- a/arch/x86/kernel/microcode_core.c
++++ b/arch/x86/kernel/microcode_core.c
+@@ -92,7 +92,7 @@ MODULE_LICENSE("GPL");
  
  #define MICROCODE_VERSION	"2.00"
  
@@ -12459,10 +13291,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_core.c linux-2.6.32.13/arch
  
  /*
   * Synchronization.
-diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_intel.c linux-2.6.32.13/arch/x86/kernel/microcode_intel.c
---- linux-2.6.32.13/arch/x86/kernel/microcode_intel.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/microcode_intel.c	2010-05-15 13:21:14.082777933 -0400
-@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
+diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
+index 3561702..f4807b7 100644
+--- a/arch/x86/kernel/microcode_intel.c
++++ b/arch/x86/kernel/microcode_intel.c
+@@ -446,13 +446,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
  
  static int get_ucode_user(void *to, const void *from, size_t n)
  {
@@ -12478,7 +13311,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_intel.c linux-2.6.32.13/arc
  }
  
  static void microcode_fini_cpu(int cpu)
-@@ -460,7 +460,7 @@ static void microcode_fini_cpu(int cpu)
+@@ -463,7 +463,7 @@ static void microcode_fini_cpu(int cpu)
  	uci->mc = NULL;
  }
  
@@ -12487,7 +13320,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_intel.c linux-2.6.32.13/arc
  	.request_microcode_user		  = request_microcode_user,
  	.request_microcode_fw             = request_microcode_fw,
  	.collect_cpu_info                 = collect_cpu_info,
-@@ -468,7 +468,7 @@ static struct microcode_ops microcode_in
+@@ -471,7 +471,7 @@ static struct microcode_ops microcode_intel_ops = {
  	.microcode_fini_cpu               = microcode_fini_cpu,
  };
  
@@ -12496,10 +13329,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_intel.c linux-2.6.32.13/arc
  {
  	return &microcode_intel_ops;
  }
-diff -urNp linux-2.6.32.13/arch/x86/kernel/module.c linux-2.6.32.13/arch/x86/kernel/module.c
---- linux-2.6.32.13/arch/x86/kernel/module.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/module.c	2010-05-15 13:21:14.082777933 -0400
-@@ -34,7 +34,7 @@
+diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
+index e0bc186..0c3f714 100644
+--- a/arch/x86/kernel/module.c
++++ b/arch/x86/kernel/module.c
+@@ -35,7 +35,7 @@
  #define DEBUGP(fmt...)
  #endif
  
@@ -12508,7 +13342,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/module.c linux-2.6.32.13/arch/x86/ker
  {
  	struct vm_struct *area;
  
-@@ -48,8 +48,18 @@ void *module_alloc(unsigned long size)
+@@ -49,8 +49,18 @@ void *module_alloc(unsigned long size)
  	if (!area)
  		return NULL;
  
@@ -12529,7 +13363,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/module.c linux-2.6.32.13/arch/x86/ker
  }
  
  /* Free memory returned from module_alloc */
-@@ -58,6 +68,40 @@ void module_free(struct module *mod, voi
+@@ -59,6 +69,40 @@ void module_free(struct module *mod, void *module_region)
  	vfree(module_region);
  }
  
@@ -12570,7 +13404,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/module.c linux-2.6.32.13/arch/x86/ker
  /* We don't need anything special. */
  int module_frob_arch_sections(Elf_Ehdr *hdr,
  			      Elf_Shdr *sechdrs,
-@@ -77,14 +121,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -78,14 +122,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
  	unsigned int i;
  	Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
  	Elf32_Sym *sym;
@@ -12590,7 +13424,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/module.c linux-2.6.32.13/arch/x86/ker
  		/* This is the symbol it is referring to.  Note that all
  		   undefined symbols have been resolved.  */
  		sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
-@@ -93,11 +139,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -94,11 +140,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 */
@@ -12608,7 +13442,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/module.c linux-2.6.32.13/arch/x86/ker
  			break;
  		default:
  			printk(KERN_ERR "module %s: Unknown relocation: %u\n",
-@@ -153,21 +203,30 @@ int apply_relocate_add(Elf64_Shdr *sechd
+@@ -154,21 +204,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
  		case R_X86_64_NONE:
  			break;
  		case R_X86_64_64:
@@ -12639,10 +13473,24 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/module.c linux-2.6.32.13/arch/x86/ker
  #if 0
  			if ((s64)val != *(s32 *)loc)
  				goto overflow;
-diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt.c linux-2.6.32.13/arch/x86/kernel/paravirt.c
---- linux-2.6.32.13/arch/x86/kernel/paravirt.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/paravirt.c	2010-05-15 13:21:14.088032889 -0400
-@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
+diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
+index 676b8c7..870ba04 100644
+--- a/arch/x86/kernel/paravirt-spinlocks.c
++++ b/arch/x86/kernel/paravirt-spinlocks.c
+@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
+ 	arch_spin_lock(lock);
+ }
+ 
+-struct pv_lock_ops pv_lock_ops = {
++struct pv_lock_ops pv_lock_ops __read_only = {
+ #ifdef CONFIG_SMP
+ 	.spin_is_locked = __ticket_spin_is_locked,
+ 	.spin_is_contended = __ticket_spin_is_contended,
+diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
+index 1db183e..d5174a5 100644
+--- a/arch/x86/kernel/paravirt.c
++++ b/arch/x86/kernel/paravirt.c
+@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbuf, const void *target,
   * corresponding structure. */
  static void *get_call_destination(u8 type)
  {
@@ -12651,7 +13499,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt.c linux-2.6.32.13/arch/x86/k
  		.pv_init_ops = pv_init_ops,
  		.pv_time_ops = pv_time_ops,
  		.pv_cpu_ops = pv_cpu_ops,
-@@ -145,14 +145,14 @@ unsigned paravirt_patch_default(u8 type,
+@@ -145,14 +145,14 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
  	if (opfunc == NULL)
  		/* If there's no function, patch it with a ud2a (BUG) */
  		ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
@@ -12669,7 +13517,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt.c linux-2.6.32.13/arch/x86/k
  		ret = paravirt_patch_ident_64(insnbuf, len);
  
  	else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
-@@ -178,7 +178,7 @@ unsigned paravirt_patch_insns(void *insn
+@@ -178,7 +178,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
  	if (insn_len > len || start == NULL)
  		insn_len = len;
  	else
@@ -12732,7 +13580,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt.c linux-2.6.32.13/arch/x86/k
  
  	.read_cr2 = native_read_cr2,
  	.write_cr2 = native_write_cr2,
-@@ -467,6 +467,12 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -463,6 +463,12 @@ struct pv_mmu_ops pv_mmu_ops = {
  	},
  
  	.set_fixmap = native_set_fixmap,
@@ -12745,22 +13593,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt.c linux-2.6.32.13/arch/x86/k
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c	2010-05-15 13:21:14.088032889 -0400
-@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
- 	__raw_spin_lock(lock);
- }
- 
--struct pv_lock_ops pv_lock_ops = {
-+struct pv_lock_ops pv_lock_ops __read_only = {
- #ifdef CONFIG_SMP
- 	.spin_is_locked = __ticket_spin_is_locked,
- 	.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c	2010-05-15 13:21:14.095776197 -0400
-@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct
+diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
+index 078d4ec..f4b9b3c 100644
+--- a/arch/x86/kernel/pci-calgary_64.c
++++ b/arch/x86/kernel/pci-calgary_64.c
+@@ -475,7 +475,7 @@ static void calgary_free_coherent(struct device *dev, size_t size,
  	free_pages((unsigned long)vaddr, get_order(size));
  }
  
@@ -12769,19 +13606,20 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.13/arch
  	.alloc_coherent = calgary_alloc_coherent,
  	.free_coherent = calgary_free_coherent,
  	.map_sg = calgary_map_sg,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-dma.c linux-2.6.32.13/arch/x86/kernel/pci-dma.c
---- linux-2.6.32.13/arch/x86/kernel/pci-dma.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/pci-dma.c	2010-05-15 13:21:14.095776197 -0400
-@@ -14,7 +14,7 @@
+diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
+index 4b7e3d8..0f9c3e9 100644
+--- a/arch/x86/kernel/pci-dma.c
++++ b/arch/x86/kernel/pci-dma.c
+@@ -16,7 +16,7 @@
  
  static int forbid_dac __read_mostly;
  
--struct dma_map_ops *dma_ops;
-+const struct dma_map_ops *dma_ops;
+-struct dma_map_ops *dma_ops = &nommu_dma_ops;
++const struct dma_map_ops *dma_ops = &nommu_dma_ops;
  EXPORT_SYMBOL(dma_ops);
  
  static int iommu_sac_force __read_mostly;
-@@ -243,7 +243,7 @@ early_param("iommu", iommu_setup);
+@@ -248,7 +248,7 @@ early_param("iommu", iommu_setup);
  
  int dma_supported(struct device *dev, u64 mask)
  {
@@ -12790,10 +13628,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-dma.c linux-2.6.32.13/arch/x86/ke
  
  #ifdef CONFIG_PCI
  	if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c	2010-05-15 13:20:18.438563899 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c	2010-05-15 13:21:14.095776197 -0400
-@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
+diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
+index 0f7f130..ab480fd 100644
+--- a/arch/x86/kernel/pci-gart_64.c
++++ b/arch/x86/kernel/pci-gart_64.c
+@@ -699,7 +699,7 @@ static __init int init_k8_gatt(struct agp_kern_info *info)
  	return -1;
  }
  
@@ -12802,10 +13641,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c linux-2.6.32.13/arch/x8
  	.map_sg				= gart_map_sg,
  	.unmap_sg			= gart_unmap_sg,
  	.map_page			= gart_map_page,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-nommu.c linux-2.6.32.13/arch/x86/kernel/pci-nommu.c
---- linux-2.6.32.13/arch/x86/kernel/pci-nommu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/pci-nommu.c	2010-05-15 13:21:14.095776197 -0400
-@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
+diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
+index 3af4af8..7950f48 100644
+--- a/arch/x86/kernel/pci-nommu.c
++++ b/arch/x86/kernel/pci-nommu.c
+@@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(struct device *dev,
  	flush_write_buffers();
  }
  
@@ -12814,10 +13654,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-nommu.c linux-2.6.32.13/arch/x86/
  	.alloc_coherent		= dma_generic_alloc_coherent,
  	.free_coherent		= nommu_free_coherent,
  	.map_sg			= nommu_map_sg,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c	2010-05-15 13:21:14.095776197 -0400
-@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
+diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
+index a5bc528..29def6f 100644
+--- a/arch/x86/kernel/pci-swiotlb.c
++++ b/arch/x86/kernel/pci-swiotlb.c
+@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
  	return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
  }
  
@@ -12826,10 +13667,72 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.13/arch/x8
  	.mapping_error = swiotlb_dma_mapping_error,
  	.alloc_coherent = x86_swiotlb_alloc_coherent,
  	.free_coherent = swiotlb_free_coherent,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/process_32.c linux-2.6.32.13/arch/x86/kernel/process_32.c
---- linux-2.6.32.13/arch/x86/kernel/process_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/process_32.c	2010-05-15 13:21:14.095776197 -0400
-@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
+diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
+index e7e3521..c8f0251 100644
+--- a/arch/x86/kernel/process.c
++++ b/arch/x86/kernel/process.c
+@@ -73,7 +73,7 @@ void exit_thread(void)
+ 	unsigned long *bp = t->io_bitmap_ptr;
+ 
+ 	if (bp) {
+-		struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
++		struct tss_struct *tss = init_tss + get_cpu();
+ 
+ 		t->io_bitmap_ptr = NULL;
+ 		clear_thread_flag(TIF_IO_BITMAP);
+@@ -107,7 +107,7 @@ void show_regs_common(void)
+ 
+ 	printk(KERN_CONT "\n");
+ 	printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n",
+-		current->pid, current->comm, print_tainted(),
++		task_pid_nr(current), current->comm, print_tainted(),
+ 		init_utsname()->release,
+ 		(int)strcspn(init_utsname()->version, " "),
+ 		init_utsname()->version, board, product);
+@@ -117,6 +117,9 @@ void flush_thread(void)
+ {
+ 	struct task_struct *tsk = current;
+ 
++#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR)
++	loadsegment(gs, 0);
++#endif
+ 	flush_ptrace_hw_breakpoint(tsk);
+ 	memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
+ 	/*
+@@ -279,8 +282,8 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
+ 	regs.di = (unsigned long) arg;
+ 
+ #ifdef CONFIG_X86_32
+-	regs.ds = __USER_DS;
+-	regs.es = __USER_DS;
++	regs.ds = __KERNEL_DS;
++	regs.es = __KERNEL_DS;
+ 	regs.fs = __KERNEL_PERCPU;
+ 	regs.gs = __KERNEL_STACK_CANARY;
+ #else
+@@ -689,17 +692,3 @@ static int __init idle_setup(char *str)
+ 	return 0;
+ }
+ early_param("idle", idle_setup);
+-
+-unsigned long arch_align_stack(unsigned long sp)
+-{
+-	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
+-		sp -= get_random_int() % 8192;
+-	return sp & ~0xf;
+-}
+-
+-unsigned long arch_randomize_brk(struct mm_struct *mm)
+-{
+-	unsigned long range_end = mm->brk + 0x02000000;
+-	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+-}
+-
+diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
+index 8d12878..350b125 100644
+--- a/arch/x86/kernel/process_32.c
++++ b/arch/x86/kernel/process_32.c
+@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
  unsigned long thread_saved_pc(struct task_struct *tsk)
  {
  	return ((unsigned long *)tsk->thread.sp)[3];
@@ -12837,27 +13740,16 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_32.c linux-2.6.32.13/arch/x86
  }
  
  #ifndef CONFIG_SMP
-@@ -129,7 +130,7 @@ void __show_regs(struct pt_regs *regs, i
+@@ -126,7 +127,7 @@ void __show_regs(struct pt_regs *regs, int all)
+ 	unsigned long sp;
  	unsigned short ss, gs;
- 	const char *board;
  
 -	if (user_mode_vm(regs)) {
 +	if (user_mode(regs)) {
  		sp = regs->sp;
  		ss = regs->ss & 0xffff;
  		gs = get_user_gs(regs);
-@@ -210,8 +211,8 @@ int kernel_thread(int (*fn)(void *), voi
- 	regs.bx = (unsigned long) fn;
- 	regs.dx = (unsigned long) arg;
- 
--	regs.ds = __USER_DS;
--	regs.es = __USER_DS;
-+	regs.ds = __KERNEL_DS;
-+	regs.es = __KERNEL_DS;
- 	regs.fs = __KERNEL_PERCPU;
- 	regs.gs = __KERNEL_STACK_CANARY;
- 	regs.orig_ax = -1;
-@@ -247,7 +248,7 @@ int copy_thread(unsigned long clone_flag
+@@ -196,7 +197,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
  	struct task_struct *tsk;
  	int err;
  
@@ -12866,7 +13758,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_32.c linux-2.6.32.13/arch/x86
  	*childregs = *regs;
  	childregs->ax = 0;
  	childregs->sp = sp;
-@@ -276,6 +277,7 @@ int copy_thread(unsigned long clone_flag
+@@ -230,6 +231,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
  	 * Set a new TLS for the child thread?
  	 */
  	if (clone_flags & CLONE_SETTLS)
@@ -12874,7 +13766,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_32.c linux-2.6.32.13/arch/x86
  		err = do_set_thread_area(p, -1,
  			(struct user_desc __user *)childregs->si, 0);
  
-@@ -346,7 +348,7 @@ __switch_to(struct task_struct *prev_p, 
+@@ -293,7 +295,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	struct thread_struct *prev = &prev_p->thread,
  				 *next = &next_p->thread;
  	int cpu = smp_processor_id();
@@ -12883,7 +13775,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_32.c linux-2.6.32.13/arch/x86
  	bool preload_fpu;
  
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
-@@ -381,6 +383,11 @@ __switch_to(struct task_struct *prev_p, 
+@@ -328,6 +330,11 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	 */
  	lazy_save_gs(prev->gs);
  
@@ -12895,7 +13787,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_32.c linux-2.6.32.13/arch/x86
  	/*
  	 * Load the per-thread Thread-Local Storage descriptor.
  	 */
-@@ -497,3 +504,27 @@ unsigned long get_wchan(struct task_stru
+@@ -404,3 +411,27 @@ unsigned long get_wchan(struct task_struct *p)
  	return 0;
  }
  
@@ -12923,10 +13815,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_32.c linux-2.6.32.13/arch/x86
 +	load_sp0(init_tss + smp_processor_id(), thread);
 +}
 +#endif
-diff -urNp linux-2.6.32.13/arch/x86/kernel/process_64.c linux-2.6.32.13/arch/x86/kernel/process_64.c
---- linux-2.6.32.13/arch/x86/kernel/process_64.c	2010-05-15 13:20:18.438563899 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/process_64.c	2010-05-15 13:21:14.095776197 -0400
-@@ -91,7 +91,7 @@ static void __exit_idle(void)
+diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
+index 3c2422a..2904e2d 100644
+--- a/arch/x86/kernel/process_64.c
++++ b/arch/x86/kernel/process_64.c
+@@ -87,7 +87,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
  	/* idle loop has pid 0 */
@@ -12935,16 +13828,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_64.c linux-2.6.32.13/arch/x86
  		return;
  	__exit_idle();
  }
-@@ -170,7 +170,7 @@ void __show_regs(struct pt_regs *regs, i
- 	if (!board)
- 		board = "";
- 	printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",
--		current->pid, current->comm, print_tainted(),
-+		task_pid_nr(current), current->comm, print_tainted(),
- 		init_utsname()->release,
- 		(int)strcspn(init_utsname()->version, " "),
- 		init_utsname()->version, board);
-@@ -380,7 +380,7 @@ __switch_to(struct task_struct *prev_p, 
+@@ -375,7 +375,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	struct thread_struct *prev = &prev_p->thread;
  	struct thread_struct *next = &next_p->thread;
  	int cpu = smp_processor_id();
@@ -12953,7 +13837,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_64.c linux-2.6.32.13/arch/x86
  	unsigned fsindex, gsindex;
  	bool preload_fpu;
  
-@@ -560,12 +560,11 @@ unsigned long get_wchan(struct task_stru
+@@ -528,12 +528,11 @@ unsigned long get_wchan(struct task_struct *p)
  	if (!p || p == current || p->state == TASK_RUNNING)
  		return 0;
  	stack = (unsigned long)task_stack_page(p);
@@ -12968,50 +13852,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_64.c linux-2.6.32.13/arch/x86
  			return 0;
  		ip = *(u64 *)(fp+8);
  		if (!in_sched_functions(ip))
-diff -urNp linux-2.6.32.13/arch/x86/kernel/process.c linux-2.6.32.13/arch/x86/kernel/process.c
---- linux-2.6.32.13/arch/x86/kernel/process.c	2010-04-04 20:41:49.920655481 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/process.c	2010-05-15 13:21:14.095776197 -0400
-@@ -73,7 +73,7 @@ void exit_thread(void)
- 	unsigned long *bp = t->io_bitmap_ptr;
- 
- 	if (bp) {
--		struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
-+		struct tss_struct *tss = init_tss + get_cpu();
- 
- 		t->io_bitmap_ptr = NULL;
- 		clear_thread_flag(TIF_IO_BITMAP);
-@@ -93,6 +93,9 @@ void flush_thread(void)
- 
- 	clear_tsk_thread_flag(tsk, TIF_DEBUG);
- 
-+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR)
-+	loadsegment(gs, 0);
-+#endif
- 	tsk->thread.debugreg0 = 0;
- 	tsk->thread.debugreg1 = 0;
- 	tsk->thread.debugreg2 = 0;
-@@ -600,17 +603,3 @@ static int __init idle_setup(char *str)
- 	return 0;
- }
- early_param("idle", idle_setup);
--
--unsigned long arch_align_stack(unsigned long sp)
--{
--	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
--		sp -= get_random_int() % 8192;
--	return sp & ~0xf;
--}
--
--unsigned long arch_randomize_brk(struct mm_struct *mm)
--{
--	unsigned long range_end = mm->brk + 0x02000000;
--	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
--}
--
-diff -urNp linux-2.6.32.13/arch/x86/kernel/ptrace.c linux-2.6.32.13/arch/x86/kernel/ptrace.c
---- linux-2.6.32.13/arch/x86/kernel/ptrace.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/ptrace.c	2010-05-15 13:21:14.110913724 -0400
-@@ -925,7 +925,7 @@ static const struct user_regset_view use
+diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
+index 70c4872..25fb80f 100644
+--- a/arch/x86/kernel/ptrace.c
++++ b/arch/x86/kernel/ptrace.c
+@@ -804,7 +804,7 @@ static const struct user_regset_view user_x86_32_view; /* Initialized below. */
  long arch_ptrace(struct task_struct *child, long request, long addr, long data)
  {
  	int ret;
@@ -13020,7 +13865,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ptrace.c linux-2.6.32.13/arch/x86/ker
  
  	switch (request) {
  	/* read the word at location addr in the USER area. */
-@@ -1012,14 +1012,14 @@ long arch_ptrace(struct task_struct *chi
+@@ -891,14 +891,14 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
  		if (addr < 0)
  			return -EIO;
  		ret = do_get_thread_area(child, addr,
@@ -13037,51 +13882,19 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ptrace.c linux-2.6.32.13/arch/x86/ker
  		break;
  #endif
  
-@@ -1038,12 +1038,12 @@ long arch_ptrace(struct task_struct *chi
- #ifdef CONFIG_X86_PTRACE_BTS
- 	case PTRACE_BTS_CONFIG:
- 		ret = ptrace_bts_config
--			(child, data, (struct ptrace_bts_config __user *)addr);
-+			(child, data, (__force struct ptrace_bts_config __user *)addr);
- 		break;
- 
- 	case PTRACE_BTS_STATUS:
- 		ret = ptrace_bts_status
--			(child, data, (struct ptrace_bts_config __user *)addr);
-+			(child, data, (__force struct ptrace_bts_config __user *)addr);
- 		break;
- 
- 	case PTRACE_BTS_SIZE:
-@@ -1052,7 +1052,7 @@ long arch_ptrace(struct task_struct *chi
- 
- 	case PTRACE_BTS_GET:
- 		ret = ptrace_bts_read_record
--			(child, data, (struct bts_struct __user *) addr);
-+			(child, data, (__force struct bts_struct __user *) addr);
- 		break;
- 
- 	case PTRACE_BTS_CLEAR:
-@@ -1061,7 +1061,7 @@ long arch_ptrace(struct task_struct *chi
- 
- 	case PTRACE_BTS_DRAIN:
- 		ret = ptrace_bts_drain
--			(child, data, (struct bts_struct __user *) addr);
-+			(child, data, (__force struct bts_struct __user *) addr);
- 		break;
- #endif /* CONFIG_X86_PTRACE_BTS */
- 
-@@ -1450,7 +1450,7 @@ void send_sigtrap(struct task_struct *ts
- 	info.si_code = si_code;
- 
- 	/* User-mode ip? */
--	info.si_addr = user_mode_vm(regs) ? (void __user *) regs->ip : NULL;
-+	info.si_addr = user_mode(regs) ? (__force void __user *) regs->ip : NULL;
+@@ -1315,7 +1315,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
+ 	memset(info, 0, sizeof(*info));
+ 	info->si_signo = SIGTRAP;
+ 	info->si_code = si_code;
+-	info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
++	info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
+ }
  
- 	/* Send us the fake SIGTRAP */
- 	force_sig_info(SIGTRAP, &info, tsk);
-diff -urNp linux-2.6.32.13/arch/x86/kernel/reboot.c linux-2.6.32.13/arch/x86/kernel/reboot.c
---- linux-2.6.32.13/arch/x86/kernel/reboot.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/reboot.c	2010-05-15 13:21:14.110913724 -0400
+ void user_single_step_siginfo(struct task_struct *tsk,
+diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
+index 76a0d71..0df1a0c 100644
+--- a/arch/x86/kernel/reboot.c
++++ b/arch/x86/kernel/reboot.c
 @@ -33,7 +33,7 @@ void (*pm_power_off)(void);
  EXPORT_SYMBOL(pm_power_off);
  
@@ -13091,7 +13904,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/reboot.c linux-2.6.32.13/arch/x86/ker
  enum reboot_type reboot_type = BOOT_KBD;
  int reboot_force;
  
-@@ -276,7 +276,7 @@ static struct dmi_system_id __initdata r
+@@ -284,7 +284,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
  			DMI_MATCH(DMI_BOARD_NAME, "P4S800"),
  		},
  	},
@@ -13100,7 +13913,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/reboot.c linux-2.6.32.13/arch/x86/ker
  };
  
  static int __init reboot_init(void)
-@@ -292,12 +292,12 @@ core_initcall(reboot_init);
+@@ -300,12 +300,12 @@ core_initcall(reboot_init);
     controller to pulse the CPU reset line, which is more thorough, but
     doesn't work with at least one type of 486 motherboard.  It is easy
     to stop this code working; hence the copious comments. */
@@ -13118,7 +13931,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/reboot.c linux-2.6.32.13/arch/x86/ker
  };
  
  static const struct desc_ptr
-@@ -346,7 +346,7 @@ static const unsigned char jump_to_bios 
+@@ -354,7 +354,7 @@ static const unsigned char jump_to_bios [] =
   * specified by the code and length parameters.
   * We assume that length will aways be less that 100!
   */
@@ -13127,7 +13940,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/reboot.c linux-2.6.32.13/arch/x86/ker
  {
  	local_irq_disable();
  
-@@ -366,8 +366,8 @@ void machine_real_restart(const unsigned
+@@ -374,8 +374,8 @@ void machine_real_restart(const unsigned char *code, int length)
  	/* Remap the kernel at virtual address zero, as well as offset zero
  	   from the kernel segment.  This assumes the kernel segment starts at
  	   virtual address PAGE_OFFSET. */
@@ -13138,7 +13951,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/reboot.c linux-2.6.32.13/arch/x86/ker
  
  	/*
  	 * Use `swapper_pg_dir' as our page directory.
-@@ -379,16 +379,15 @@ void machine_real_restart(const unsigned
+@@ -387,16 +387,15 @@ void machine_real_restart(const unsigned char *code, int length)
  	   boot)".  This seems like a fairly standard thing that gets set by
  	   REBOOT.COM programs, and the previous reset routine did this
  	   too. */
@@ -13158,10 +13971,20 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/reboot.c linux-2.6.32.13/arch/x86/ker
  
  	/* Set up the IDT for real mode. */
  	load_idt(&real_mode_idt);
-diff -urNp linux-2.6.32.13/arch/x86/kernel/setup.c linux-2.6.32.13/arch/x86/kernel/setup.c
---- linux-2.6.32.13/arch/x86/kernel/setup.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/setup.c	2010-05-15 13:21:14.110913724 -0400
-@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p)
+diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
+index 6600cfd..46a5ea3 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -704,7 +704,7 @@ static void __init trim_bios_range(void)
+ 	 * area (640->1Mb) as ram even though it is not.
+ 	 * take them out.
+ 	 */
+-	e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
++	e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
+ 	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
+ }
+ 
+@@ -791,14 +791,14 @@ void __init setup_arch(char **cmdline_p)
  
  	if (!boot_params.hdr.root_flags)
  		root_mountflags &= ~MS_RDONLY;
@@ -13181,15 +14004,17 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/setup.c linux-2.6.32.13/arch/x86/kern
  	data_resource.end = virt_to_phys(_edata)-1;
  	bss_resource.start = virt_to_phys(&__bss_start);
  	bss_resource.end = virt_to_phys(&__bss_stop)-1;
-diff -urNp linux-2.6.32.13/arch/x86/kernel/setup_percpu.c linux-2.6.32.13/arch/x86/kernel/setup_percpu.c
---- linux-2.6.32.13/arch/x86/kernel/setup_percpu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/setup_percpu.c	2010-05-15 13:21:14.119542394 -0400
-@@ -25,19 +25,17 @@
- # define DBG(x...)
- #endif
- 
+diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
+index a60df9a..0083b50 100644
+--- a/arch/x86/kernel/setup_percpu.c
++++ b/arch/x86/kernel/setup_percpu.c
+@@ -21,19 +21,17 @@
+ #include <asm/cpu.h>
+ #include <asm/stackprotector.h>
+ 
+-DEFINE_PER_CPU(int, cpu_number);
 +#ifdef CONFIG_SMP
- DEFINE_PER_CPU(int, cpu_number);
++DEFINE_PER_CPU(unsigned int, cpu_number);
  EXPORT_PER_CPU_SYMBOL(cpu_number);
 +#endif
  
@@ -13207,7 +14032,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/setup_percpu.c linux-2.6.32.13/arch/x
  	[0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
  };
  EXPORT_SYMBOL(__per_cpu_offset);
-@@ -159,10 +157,10 @@ static inline void setup_percpu_segment(
+@@ -161,10 +159,10 @@ static inline void setup_percpu_segment(int cpu)
  {
  #ifdef CONFIG_X86_32
  	struct desc_struct gdt;
@@ -13221,7 +14046,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/setup_percpu.c linux-2.6.32.13/arch/x
  	write_gdt_entry(get_cpu_gdt_table(cpu),
  			GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
  #endif
-@@ -212,6 +210,11 @@ void __init setup_per_cpu_areas(void)
+@@ -213,6 +211,11 @@ void __init setup_per_cpu_areas(void)
  	/* alrighty, percpu areas up and running */
  	delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
  	for_each_possible_cpu(cpu) {
@@ -13233,8 +14058,8 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/setup_percpu.c linux-2.6.32.13/arch/x
  		per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
  		per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
  		per_cpu(cpu_number, cpu) = cpu;
-@@ -239,6 +242,12 @@ void __init setup_per_cpu_areas(void)
- 			early_per_cpu_map(x86_cpu_to_node_map, cpu);
+@@ -249,6 +252,12 @@ void __init setup_per_cpu_areas(void)
+ 		set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
  #endif
  #endif
 +#ifdef CONFIG_CC_STACKPROTECTOR
@@ -13244,12 +14069,13 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/setup_percpu.c linux-2.6.32.13/arch/x
 +#endif
 +#endif
  		/*
- 		 * Up to this point, the boot CPU has been using .data.init
+ 		 * Up to this point, the boot CPU has been using .init.data
  		 * area.  Reload any changed state for the boot CPU.
-diff -urNp linux-2.6.32.13/arch/x86/kernel/signal.c linux-2.6.32.13/arch/x86/kernel/signal.c
---- linux-2.6.32.13/arch/x86/kernel/signal.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/signal.c	2010-05-15 13:21:14.119542394 -0400
-@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
+diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
+index 4fd173c..9dc1de7 100644
+--- a/arch/x86/kernel/signal.c
++++ b/arch/x86/kernel/signal.c
+@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsigned long sp)
  	 * Align the stack pointer according to the i386 ABI,
  	 * i.e. so that on function entry ((sp + 4) & 15) == 0.
  	 */
@@ -13258,7 +14084,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/signal.c linux-2.6.32.13/arch/x86/ker
  #else /* !CONFIG_X86_32 */
  	sp = round_down(sp, 16) - 8;
  #endif
-@@ -248,11 +248,11 @@ get_sigframe(struct k_sigaction *ka, str
+@@ -249,11 +249,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
  	 * Return an always-bogus address instead so we will die with SIGSEGV.
  	 */
  	if (onsigstack && !likely(on_sig_stack(sp)))
@@ -13272,7 +14098,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/signal.c linux-2.6.32.13/arch/x86/ker
  
  	return (void __user *)sp;
  }
-@@ -307,9 +307,9 @@ __setup_frame(int sig, struct k_sigactio
+@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
  	}
  
  	if (current->mm->context.vdso)
@@ -13284,7 +14110,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/signal.c linux-2.6.32.13/arch/x86/ker
  	if (ka->sa.sa_flags & SA_RESTORER)
  		restorer = ka->sa.sa_restorer;
  
-@@ -323,7 +323,7 @@ __setup_frame(int sig, struct k_sigactio
+@@ -324,7 +324,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
  	 * reasons and because gdb uses it as a signature to notice
  	 * signal handler stack frames.
  	 */
@@ -13293,16 +14119,19 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/signal.c linux-2.6.32.13/arch/x86/ker
  
  	if (err)
  		return -EFAULT;
-@@ -377,7 +377,7 @@ static int __setup_rt_frame(int sig, str
+@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
  		err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
  
  		/* Set up to return from userspace.  */
 -		restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
-+		restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
++		if (current->mm->context.vdso)
++			restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
++		else
++			restorer = (void __user *)&frame->retcode;
  		if (ka->sa.sa_flags & SA_RESTORER)
  			restorer = ka->sa.sa_restorer;
  		put_user_ex(restorer, &frame->pretcode);
-@@ -389,7 +389,7 @@ static int __setup_rt_frame(int sig, str
+@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
  		 * reasons and because gdb uses it as a signature to notice
  		 * signal handler stack frames.
  		 */
@@ -13311,7 +14140,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/signal.c linux-2.6.32.13/arch/x86/ker
  	} put_user_catch(err);
  
  	if (err)
-@@ -789,7 +789,7 @@ static void do_signal(struct pt_regs *re
+@@ -780,7 +783,7 @@ static void do_signal(struct pt_regs *regs)
  	 * X86_32: vm86 regs switched out by assembly code before reaching
  	 * here, so testing against kernel CS suffices.
  	 */
@@ -13320,10 +14149,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/signal.c linux-2.6.32.13/arch/x86/ker
  		return;
  
  	if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.32.13/arch/x86/kernel/smpboot.c linux-2.6.32.13/arch/x86/kernel/smpboot.c
---- linux-2.6.32.13/arch/x86/kernel/smpboot.c	2010-04-04 20:41:49.920655481 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/smpboot.c	2010-05-15 13:21:14.130650342 -0400
-@@ -729,7 +729,11 @@ do_rest:
+diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
+index 821ee1b..e29b497 100644
+--- a/arch/x86/kernel/smpboot.c
++++ b/arch/x86/kernel/smpboot.c
+@@ -786,7 +786,11 @@ do_rest:
  		(unsigned long)task_stack_page(c_idle.idle) -
  		KERNEL_STACK_OFFSET + THREAD_SIZE;
  #endif
@@ -13335,7 +14165,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/smpboot.c linux-2.6.32.13/arch/x86/ke
  	initial_code = (unsigned long)start_secondary;
  	stack_start.sp = (void *) c_idle.idle->thread.sp;
  
-@@ -866,6 +870,12 @@ int __cpuinit native_cpu_up(unsigned int
+@@ -926,6 +930,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
  
  	per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
  
@@ -13345,13 +14175,14 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/smpboot.c linux-2.6.32.13/arch/x86/ke
 +			KERNEL_PGD_PTRS);
 +#endif
 +
- #ifdef CONFIG_X86_32
- 	/* init low mem mapping */
- 	clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
-diff -urNp linux-2.6.32.13/arch/x86/kernel/step.c linux-2.6.32.13/arch/x86/kernel/step.c
---- linux-2.6.32.13/arch/x86/kernel/step.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/step.c	2010-05-15 13:21:14.130650342 -0400
-@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
+ 	err = do_boot_cpu(apicid, cpu);
+ 
+ 	if (err) {
+diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
+index 58de45e..43bc689 100644
+--- a/arch/x86/kernel/step.c
++++ b/arch/x86/kernel/step.c
+@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
  		struct desc_struct *desc;
  		unsigned long base;
  
@@ -13364,7 +14195,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/step.c linux-2.6.32.13/arch/x86/kerne
  			addr = -1L; /* bogus selector, access would fault */
  		else {
  			desc = child->mm->context.ldt + seg;
-@@ -53,6 +53,9 @@ static int is_setting_trap_flag(struct t
+@@ -53,6 +53,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
  	unsigned char opcode[15];
  	unsigned long addr = convert_ip_to_linear(child, regs);
  
@@ -13374,7 +14205,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/step.c linux-2.6.32.13/arch/x86/kerne
  	copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
  	for (i = 0; i < copied; i++) {
  		switch (opcode[i]) {
-@@ -74,7 +77,7 @@ static int is_setting_trap_flag(struct t
+@@ -74,7 +77,7 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
  
  #ifdef CONFIG_X86_64
  		case 0x40 ... 0x4f:
@@ -13383,18 +14214,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/step.c linux-2.6.32.13/arch/x86/kerne
  				/* 32-bit mode: register increment */
  				return 0;
  			/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S	2010-05-15 13:21:14.130650342 -0400
-@@ -1,3 +1,4 @@
-+.section .rodata,"a",@progbits
- ENTRY(sys_call_table)
- 	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
- 	.long sys_exit
-diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c	2010-05-15 13:21:14.130650342 -0400
-@@ -24,6 +24,21 @@
+diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
+index 196552b..90850f1 100644
+--- a/arch/x86/kernel/sys_i386_32.c
++++ b/arch/x86/kernel/sys_i386_32.c
+@@ -24,6 +24,228 @@
  
  #include <asm/syscalls.h>
  
@@ -13413,13 +14237,6 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8
 +	return 0;
 +}
 +
- /*
-  * Perform the select(nd, in, out, ex, tv) and mmap() system
-  * calls. Linux/i386 didn't use to be able to handle more than
-@@ -58,6 +73,205 @@ out:
- 	return err;
- }
- 
 +unsigned long
 +arch_get_unmapped_area(struct file *filp, unsigned long addr,
 +		unsigned long len, unsigned long pgoff, unsigned long flags)
@@ -13433,6 +14250,8 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8
 +		pax_task_size = SEGMEXEC_TASK_SIZE;
 +#endif
 +
++	pax_task_size -= PAGE_SIZE;
++
 +	if (len > pax_task_size)
 +		return -ENOMEM;
 +
@@ -13445,10 +14264,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8
 +
 +	if (addr) {
 +		addr = PAGE_ALIGN(addr);
-+		vma = find_vma(mm, addr);
-+		if (pax_task_size - len >= addr &&
-+		    (!vma || addr + len <= vma->vm_start))
-+			return addr;
++		if (pax_task_size - len >= addr) {
++			vma = find_vma(mm, addr);
++			if (check_heap_stack_gap(vma, addr, len))
++				return addr;
++		}
 +	}
 +	if (len > mm->cached_hole_size) {
 +		start_addr = addr = mm->free_area_cache;
@@ -13458,7 +14278,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8
 +	}
 +
 +#ifdef CONFIG_PAX_PAGEEXEC
-+	if (!nx_enabled && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
++	if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
 +		start_addr = 0x00110000UL;
 +
 +#ifdef CONFIG_PAX_RANDMMAP
@@ -13488,13 +14308,8 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8
 +			}
 +			return -ENOMEM;
 +		}
-+		if (!vma || addr + len <= vma->vm_start) {
-+			/*
-+			 * Remember the place where we stopped the search:
-+			 */
-+			mm->free_area_cache = addr + len;
-+			return addr;
-+		}
++		if (check_heap_stack_gap(vma, addr, len))
++			break;
 +		if (addr + mm->cached_hole_size < vma->vm_start)
 +			mm->cached_hole_size = vma->vm_start - addr;
 +		addr = vma->vm_end;
@@ -13504,6 +14319,12 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8
 +			goto full_search;
 +		}
 +	}
++
++	/*
++	 * Remember the place where we stopped the search:
++	 */
++	mm->free_area_cache = addr + len;
++	return addr;
 +}
 +
 +unsigned long
@@ -13520,6 +14341,8 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8
 +		pax_task_size = SEGMEXEC_TASK_SIZE;
 +#endif
 +
++	pax_task_size -= PAGE_SIZE;
++
 +	/* requested length too big for entire address space */
 +	if (len > pax_task_size)
 +		return -ENOMEM;
@@ -13528,7 +14351,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8
 +		return addr;
 +
 +#ifdef CONFIG_PAX_PAGEEXEC
-+	if (!nx_enabled && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
++	if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
 +		goto bottomup;
 +#endif
 +
@@ -13539,10 +14362,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8
 +	/* requesting a specific address */
 +	if (addr) {
 +		addr = PAGE_ALIGN(addr);
-+		vma = find_vma(mm, addr);
-+		if (pax_task_size - len >= addr &&
-+				(!vma || addr + len <= vma->vm_start))
-+			return addr;
++		if (pax_task_size - len >= addr) {
++			vma = find_vma(mm, addr);
++			if (check_heap_stack_gap(vma, addr, len))
++				return addr;
++		}
 +	}
 +
 +	/* check if free_area_cache is useful for us */
@@ -13557,7 +14381,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8
 +	/* make sure it can fit in the remaining address space */
 +	if (addr > len) {
 +		vma = find_vma(mm, addr-len);
-+		if (!vma || addr <= vma->vm_start)
++		if (check_heap_stack_gap(vma, addr - len, len))
 +			/* remember the address as a hint for next time */
 +			return (mm->free_area_cache = addr-len);
 +	}
@@ -13574,7 +14398,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8
 +		 * return with success:
 +		 */
 +		vma = find_vma(mm, addr);
-+		if (!vma || addr+len <= vma->vm_start)
++		if (check_heap_stack_gap(vma, addr, len))
 +			/* remember the address as a hint for next time */
 +			return (mm->free_area_cache = addr);
 +
@@ -13619,30 +14443,14 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8
 +
 +	return addr;
 +}
- 
- struct sel_arg_struct {
- 	unsigned long n;
-@@ -93,7 +307,7 @@ asmlinkage int sys_ipc(uint call, int fi
- 		return sys_semtimedop(first, (struct sembuf __user *)ptr, second, NULL);
- 	case SEMTIMEDOP:
- 		return sys_semtimedop(first, (struct sembuf __user *)ptr, second,
--					(const struct timespec __user *)fifth);
-+					(__force const struct timespec __user *)fifth);
- 
- 	case SEMGET:
- 		return sys_semget(first, second, third);
-@@ -140,7 +354,7 @@ asmlinkage int sys_ipc(uint call, int fi
- 			ret = do_shmat(first, (char __user *) ptr, second, &raddr);
- 			if (ret)
- 				return ret;
--			return put_user(raddr, (ulong __user *) third);
-+			return put_user(raddr, (__force ulong __user *) third);
- 		}
- 		case 1:	/* iBCS2 emulator entry point */
- 			if (!segment_eq(get_fs(), get_ds()))
-diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c	2010-05-15 13:21:14.130650342 -0400
++
+ /*
+  * Do a system call from kernel instead of calling sys_execve so we
+  * end up with proper pt_regs.
+diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
+index ff14a50..a00edfd 100644
+--- a/arch/x86/kernel/sys_x86_64.c
++++ b/arch/x86/kernel/sys_x86_64.c
 @@ -32,8 +32,8 @@ out:
  	return error;
  }
@@ -13654,7 +14462,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c linux-2.6.32.13/arch/x86
  {
  	if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
  		unsigned long new_begin;
-@@ -52,7 +52,7 @@ static void find_start_end(unsigned long
+@@ -52,7 +52,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
  				*begin = new_begin;
  		}
  	} else {
@@ -13663,7 +14471,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c linux-2.6.32.13/arch/x86
  		*end = TASK_SIZE;
  	}
  }
-@@ -69,11 +69,15 @@ arch_get_unmapped_area(struct file *filp
+@@ -69,16 +69,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
  	if (flags & MAP_FIXED)
  		return addr;
  
@@ -13680,7 +14488,22 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c linux-2.6.32.13/arch/x86
  	if (addr) {
  		addr = PAGE_ALIGN(addr);
  		vma = find_vma(mm, addr);
-@@ -128,7 +132,7 @@ arch_get_unmapped_area_topdown(struct fi
+-		if (end - len >= addr &&
+-		    (!vma || addr + len <= vma->vm_start))
++		if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
+ 			return addr;
+ 	}
+ 	if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
+@@ -106,7 +109,7 @@ full_search:
+ 			}
+ 			return -ENOMEM;
+ 		}
+-		if (!vma || addr + len <= vma->vm_start) {
++		if (check_heap_stack_gap(vma, addr, len)) {
+ 			/*
+ 			 * Remember the place where we stopped the search:
+ 			 */
+@@ -128,7 +131,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
  {
  	struct vm_area_struct *vma;
  	struct mm_struct *mm = current->mm;
@@ -13689,7 +14512,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c linux-2.6.32.13/arch/x86
  
  	/* requested length too big for entire address space */
  	if (len > TASK_SIZE)
-@@ -141,6 +145,10 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -141,12 +144,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
  	if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
  		goto bottomup;
  
@@ -13700,7 +14523,32 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c linux-2.6.32.13/arch/x86
  	/* requesting a specific address */
  	if (addr) {
  		addr = PAGE_ALIGN(addr);
-@@ -198,13 +206,21 @@ bottomup:
+ 		vma = find_vma(mm, addr);
+-		if (TASK_SIZE - len >= addr &&
+-				(!vma || addr + len <= vma->vm_start))
++		if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
+ 			return addr;
+ 	}
+ 
+@@ -162,7 +168,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ 	/* make sure it can fit in the remaining address space */
+ 	if (addr > len) {
+ 		vma = find_vma(mm, addr-len);
+-		if (!vma || addr <= vma->vm_start)
++		if (check_heap_stack_gap(vma, addr - len, len))
+ 			/* remember the address as a hint for next time */
+ 			return mm->free_area_cache = addr-len;
+ 	}
+@@ -179,7 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ 		 * return with success:
+ 		 */
+ 		vma = find_vma(mm, addr);
+-		if (!vma || addr+len <= vma->vm_start)
++		if (check_heap_stack_gap(vma, addr, len))
+ 			/* remember the address as a hint for next time */
+ 			return mm->free_area_cache = addr;
+ 
+@@ -198,13 +204,21 @@ bottomup:
  	 * can happen with large stack limits and large mmap()
  	 * allocations.
  	 */
@@ -13724,9 +14572,19 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c linux-2.6.32.13/arch/x86
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
-diff -urNp linux-2.6.32.13/arch/x86/kernel/time.c linux-2.6.32.13/arch/x86/kernel/time.c
---- linux-2.6.32.13/arch/x86/kernel/time.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/time.c	2010-05-15 13:21:14.130650342 -0400
+diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
+index 8b37293..520368b 100644
+--- a/arch/x86/kernel/syscall_table_32.S
++++ b/arch/x86/kernel/syscall_table_32.S
+@@ -1,3 +1,4 @@
++.section .rodata,"a",@progbits
+ ENTRY(sys_call_table)
+ 	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
+ 	.long sys_exit
+diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
+index fb5cc5e1..b457784 100644
+--- a/arch/x86/kernel/time.c
++++ b/arch/x86/kernel/time.c
 @@ -26,17 +26,13 @@
  int timer_ack;
  #endif
@@ -13747,7 +14605,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/time.c linux-2.6.32.13/arch/x86/kerne
  #else
  		unsigned long *sp =
  			(unsigned long *)kernel_stack_pointer(regs);
-@@ -45,11 +41,17 @@ unsigned long profile_pc(struct pt_regs 
+@@ -45,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
  		 * or above a saved flags. Eflags has bits 22-31 zero,
  		 * kernel addresses don't.
  		 */
@@ -13765,10 +14623,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/time.c linux-2.6.32.13/arch/x86/kerne
  	}
  	return pc;
  }
-diff -urNp linux-2.6.32.13/arch/x86/kernel/tls.c linux-2.6.32.13/arch/x86/kernel/tls.c
---- linux-2.6.32.13/arch/x86/kernel/tls.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/tls.c	2010-05-15 13:21:14.130650342 -0400
-@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
+diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
+index 6bb7b85..dd853e1 100644
+--- a/arch/x86/kernel/tls.c
++++ b/arch/x86/kernel/tls.c
+@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
  	if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
  		return -EINVAL;
  
@@ -13780,9 +14639,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/tls.c linux-2.6.32.13/arch/x86/kernel
  	set_tls_desc(p, idx, &info, 1);
  
  	return 0;
-diff -urNp linux-2.6.32.13/arch/x86/kernel/trampoline_32.S linux-2.6.32.13/arch/x86/kernel/trampoline_32.S
---- linux-2.6.32.13/arch/x86/kernel/trampoline_32.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/trampoline_32.S	2010-05-15 13:21:14.130650342 -0400
+diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
+index 8508237..229b664 100644
+--- a/arch/x86/kernel/trampoline_32.S
++++ b/arch/x86/kernel/trampoline_32.S
 @@ -32,6 +32,12 @@
  #include <asm/segment.h>
  #include <asm/page_types.h>
@@ -13805,10 +14665,33 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/trampoline_32.S linux-2.6.32.13/arch/
  
  	# These need to be in the same 64K segment as the above;
  	# hence we don't use the boot_gdt_descr defined in head.S
-diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kernel/traps.c
---- linux-2.6.32.13/arch/x86/kernel/traps.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/traps.c	2010-05-15 13:21:14.130650342 -0400
-@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
+diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
+index 3af2dff..3b2d3ad 100644
+--- a/arch/x86/kernel/trampoline_64.S
++++ b/arch/x86/kernel/trampoline_64.S
+@@ -91,7 +91,7 @@ startup_32:
+ 	movl	$__KERNEL_DS, %eax	# Initialize the %ds segment register
+ 	movl	%eax, %ds
+ 
+-	movl	$X86_CR4_PAE, %eax
++	movl	$(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
+ 	movl	%eax, %cr4		# Enable PAE mode
+ 
+ 					# Setup trampoline 4 level pagetables
+@@ -138,7 +138,7 @@ tidt:
+ 	# so the kernel can live anywhere
+ 	.balign 4
+ tgdt:
+-	.short	tgdt_end - tgdt		# gdt limit
++	.short	tgdt_end - tgdt - 1	# gdt limit
+ 	.long	tgdt - r_base
+ 	.short 0
+ 	.quad	0x00cf9b000000ffff	# __KERNEL32_CS
+diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
+index 4d0f3ed..b680aa1 100644
+--- a/arch/x86/kernel/traps.c
++++ b/arch/x86/kernel/traps.c
+@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
  
  /* Do we ignore FPU interrupts ? */
  char ignore_fpu_irq;
@@ -13821,15 +14704,8 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kern
  #endif
  
  DECLARE_BITMAP(used_vectors, NR_VECTORS);
-@@ -112,19 +106,19 @@ static inline void preempt_conditional_c
- static inline void
- die_if_kernel(const char *str, struct pt_regs *regs, long err)
- {
--	if (!user_mode_vm(regs))
-+	if (!user_mode(regs))
- 		die(str, regs, err);
+@@ -110,13 +104,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
  }
- #endif
  
  static void __kprobes
 -do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
@@ -13844,7 +14720,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kern
  		/*
  		 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
  		 * On nmi (interrupt 2), do_trap should not be called.
-@@ -135,7 +129,7 @@ do_trap(int trapnr, int signr, char *str
+@@ -127,7 +121,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
  	}
  #endif
  
@@ -13853,7 +14729,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kern
  		goto kernel_trap;
  
  #ifdef CONFIG_X86_32
-@@ -158,7 +152,7 @@ trap_signal:
+@@ -150,7 +144,7 @@ trap_signal:
  	    printk_ratelimit()) {
  		printk(KERN_INFO
  		       "%s[%d] trap %s ip:%lx sp:%lx error:%lx",
@@ -13862,7 +14738,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kern
  		       regs->ip, regs->sp, error_code);
  		print_vma_addr(" in ", regs->ip);
  		printk("\n");
-@@ -175,8 +169,20 @@ kernel_trap:
+@@ -167,8 +161,20 @@ kernel_trap:
  	if (!fixup_exception(regs)) {
  		tsk->thread.error_code = error_code;
  		tsk->thread.trap_no = trapnr;
@@ -13883,7 +14759,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kern
  	return;
  
  #ifdef CONFIG_X86_32
-@@ -265,14 +271,30 @@ do_general_protection(struct pt_regs *re
+@@ -257,14 +263,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	conditional_sti(regs);
  
  #ifdef CONFIG_X86_32
@@ -13898,7 +14774,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kern
  		goto gp_in_kernel;
  
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
-+	if (!nx_enabled && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
++	if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
 +		struct mm_struct *mm = tsk->mm;
 +		unsigned long limit;
 +
@@ -13916,7 +14792,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kern
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -305,6 +327,13 @@ gp_in_kernel:
+@@ -297,6 +319,13 @@ gp_in_kernel:
  	if (notify_die(DIE_GPF, "general protection fault", regs,
  				error_code, 13, SIGSEGV) == NOTIFY_STOP)
  		return;
@@ -13930,37 +14806,38 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kern
  	die("general protection fault", regs, error_code);
  }
  
-@@ -558,7 +587,7 @@ dotraplinkage void __kprobes do_debug(st
- 	}
+@@ -565,7 +594,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+ 	/* It's safe to allow irq's after DR6 has been saved */
+ 	preempt_conditional_sti(regs);
  
- #ifdef CONFIG_X86_32
--	if (regs->flags & X86_VM_MASK)
-+	if (v8086_mode(regs))
- 		goto debug_vm86;
- #endif
- 
-@@ -570,7 +599,7 @@ dotraplinkage void __kprobes do_debug(st
- 	 * kernel space (but re-enable TF when returning to user mode).
- 	 */
- 	if (condition & DR_STEP) {
--		if (!user_mode(regs))
-+		if (!user_mode_novm(regs))
- 			goto clear_TF_reenable;
- 	}
- 
-@@ -757,7 +786,7 @@ do_simd_coprocessor_error(struct pt_regs
- 	 * Handle strange cache flush from user space exception
- 	 * in all other cases.  This is undocumented behaviour.
- 	 */
 -	if (regs->flags & X86_VM_MASK) {
 +	if (v8086_mode(regs)) {
- 		handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
+ 		handle_vm86_trap((struct kernel_vm86_regs *) regs,
+ 				error_code, 1);
+ 		preempt_conditional_cli(regs);
+@@ -579,7 +608,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+ 	 * We already checked v86 mode above, so we can check for kernel mode
+ 	 * by just checking the CPL of CS.
+ 	 */
+-	if ((dr6 & DR_STEP) && !user_mode(regs)) {
++	if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
+ 		tsk->thread.debugreg6 &= ~DR_STEP;
+ 		set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
+ 		regs->flags &= ~X86_EFLAGS_TF;
+@@ -608,7 +637,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
  		return;
- 	}
-diff -urNp linux-2.6.32.13/arch/x86/kernel/tsc.c linux-2.6.32.13/arch/x86/kernel/tsc.c
---- linux-2.6.32.13/arch/x86/kernel/tsc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/tsc.c	2010-05-15 13:21:14.134912019 -0400
-@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
+ 	conditional_sti(regs);
+ 
+-	if (!user_mode_vm(regs))
++	if (!user_mode(regs))
+ 	{
+ 		if (!fixup_exception(regs)) {
+ 			task->thread.error_code = error_code;
+diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
+index 4094ae0..8ba3527 100644
+--- a/arch/x86/kernel/tsc.c
++++ b/arch/x86/kernel/tsc.c
+@@ -833,7 +833,7 @@ static struct dmi_system_id __initdata bad_tsc_dmi_table[] = {
  			DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
  		},
  	},
@@ -13969,9 +14846,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/tsc.c linux-2.6.32.13/arch/x86/kernel
  };
  
  static void __init check_system_tsc_reliable(void)
-diff -urNp linux-2.6.32.13/arch/x86/kernel/vm86_32.c linux-2.6.32.13/arch/x86/kernel/vm86_32.c
---- linux-2.6.32.13/arch/x86/kernel/vm86_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/vm86_32.c	2010-05-15 13:21:14.142909281 -0400
+diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
+index 61fb985..5401452 100644
+--- a/arch/x86/kernel/vm86_32.c
++++ b/arch/x86/kernel/vm86_32.c
 @@ -41,6 +41,7 @@
  #include <linux/ptrace.h>
  #include <linux/audit.h>
@@ -13980,7 +14858,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vm86_32.c linux-2.6.32.13/arch/x86/ke
  
  #include <asm/uaccess.h>
  #include <asm/io.h>
-@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct ke
+@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
  		do_exit(SIGSEGV);
  	}
  
@@ -13989,7 +14867,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vm86_32.c linux-2.6.32.13/arch/x86/ke
  	current->thread.sp0 = current->thread.saved_sp0;
  	current->thread.sysenter_cs = __KERNEL_CS;
  	load_sp0(tss, &current->thread);
-@@ -208,6 +209,13 @@ int sys_vm86old(struct pt_regs *regs)
+@@ -207,6 +208,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs)
  	struct task_struct *tsk;
  	int tmp, ret = -EPERM;
  
@@ -14003,7 +14881,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vm86_32.c linux-2.6.32.13/arch/x86/ke
  	tsk = current;
  	if (tsk->thread.saved_sp0)
  		goto out;
-@@ -238,6 +246,14 @@ int sys_vm86(struct pt_regs *regs)
+@@ -237,6 +245,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs)
  	int tmp, ret;
  	struct vm86plus_struct __user *v86;
  
@@ -14016,9 +14894,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vm86_32.c linux-2.6.32.13/arch/x86/ke
 +#endif
 +
  	tsk = current;
- 	switch (regs->bx) {
+ 	switch (cmd) {
  	case VM86_REQUEST_IRQ:
-@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm
+@@ -323,7 +339,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
  	tsk->thread.saved_fs = info->regs32->fs;
  	tsk->thread.saved_gs = get_user_gs(info->regs32);
  
@@ -14027,7 +14905,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vm86_32.c linux-2.6.32.13/arch/x86/ke
  	tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
  	if (cpu_has_sep)
  		tsk->thread.sysenter_cs = 0;
-@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_re
+@@ -528,7 +544,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
  		goto cannot_handle;
  	if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
  		goto cannot_handle;
@@ -14036,10 +14914,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vm86_32.c linux-2.6.32.13/arch/x86/ke
  	if (get_user(segoffs, intr_ptr))
  		goto cannot_handle;
  	if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/kernel/vmi_32.c
---- linux-2.6.32.13/arch/x86/kernel/vmi_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/vmi_32.c	2010-05-15 13:21:14.150906044 -0400
-@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 
+diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
+index ce9fbac..26bc0c8 100644
+--- a/arch/x86/kernel/vmi_32.c
++++ b/arch/x86/kernel/vmi_32.c
+@@ -46,12 +46,17 @@ typedef u32 __attribute__((regparm(1))) (VROMFUNC)(void);
  typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
  
  #define call_vrom_func(rom,func) \
@@ -14048,19 +14927,20 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker
  
  #define call_vrom_long_func(rom,func,arg) \
 -   (((VROMLONGFUNC *)(rom->func)) (arg))
+-
+-static struct vrom_header *vmi_rom;
 +({\
 +	u64 __reloc = ((VROMLONGFUNC *)(ktva_ktla(rom.func))) (arg);\
 +	struct vmi_relocation_info *const __rel = (struct vmi_relocation_info *)&__reloc;\
 +	__rel->eip = (unsigned char *)ktva_ktla((unsigned long)__rel->eip);\
 +	__reloc;\
 +})
- 
--static struct vrom_header *vmi_rom;
++
 +static struct vrom_header vmi_rom __attribute((__section__(".vmi.rom"), __aligned__(PAGE_SIZE)));
  static int disable_pge;
  static int disable_pse;
  static int disable_sep;
-@@ -76,10 +81,10 @@ static struct {
+@@ -78,10 +83,10 @@ static struct {
  	void (*set_initial_ap_state)(int, int);
  	void (*halt)(void);
    	void (*set_lazy_mode)(int mode);
@@ -14073,7 +14953,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker
  
  /*
   * VMI patching routines.
-@@ -94,7 +99,7 @@ struct vmi_timer_ops vmi_timer_ops;
+@@ -96,7 +101,7 @@ struct vmi_timer_ops vmi_timer_ops;
  static inline void patch_offset(void *insnbuf,
  				unsigned long ip, unsigned long dest)
  {
@@ -14082,7 +14962,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker
  }
  
  static unsigned patch_internal(int call, unsigned len, void *insnbuf,
-@@ -102,6 +107,7 @@ static unsigned patch_internal(int call,
+@@ -104,6 +109,7 @@ static unsigned patch_internal(int call, unsigned len, void *insnbuf,
  {
  	u64 reloc;
  	struct vmi_relocation_info *const rel = (struct vmi_relocation_info *)&reloc;
@@ -14090,7 +14970,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker
  	reloc = call_vrom_long_func(vmi_rom, get_reloc,	call);
  	switch(rel->type) {
  		case VMI_RELOCATION_CALL_REL:
-@@ -404,13 +410,13 @@ static void vmi_set_pud(pud_t *pudp, pud
+@@ -382,13 +388,13 @@ static void vmi_set_pud(pud_t *pudp, pud_t pudval)
  
  static void vmi_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
  {
@@ -14106,7 +14986,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker
  	vmi_ops.set_pte(pte, (pte_t *)pmd, VMI_PAGE_PD);
  }
  #endif
-@@ -438,8 +444,8 @@ vmi_startup_ipi_hook(int phys_apicid, un
+@@ -416,8 +422,8 @@ vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip,
  	ap.ss = __KERNEL_DS;
  	ap.esp = (unsigned long) start_esp;
  
@@ -14117,7 +14997,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker
  	ap.fs = __KERNEL_PERCPU;
  	ap.gs = __KERNEL_STACK_CANARY;
  
-@@ -486,6 +492,18 @@ static void vmi_leave_lazy_mmu(void)
+@@ -464,6 +470,18 @@ static void vmi_leave_lazy_mmu(void)
  	paravirt_leave_lazy_mmu();
  }
  
@@ -14136,7 +15016,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker
  static inline int __init check_vmi_rom(struct vrom_header *rom)
  {
  	struct pci_header *pci;
-@@ -498,6 +516,10 @@ static inline int __init check_vmi_rom(s
+@@ -476,6 +494,10 @@ static inline int __init check_vmi_rom(struct vrom_header *rom)
  		return 0;
  	if (rom->vrom_signature != VMI_SIGNATURE)
  		return 0;
@@ -14147,7 +15027,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker
  	if (rom->api_version_maj != VMI_API_REV_MAJOR ||
  	    rom->api_version_min+1 < VMI_API_REV_MINOR+1) {
  		printk(KERN_WARNING "VMI: Found mismatched rom version %d.%d\n",
-@@ -562,7 +584,7 @@ static inline int __init probe_vmi_rom(v
+@@ -540,7 +562,7 @@ static inline int __init probe_vmi_rom(void)
  		struct vrom_header *romstart;
  		romstart = (struct vrom_header *)isa_bus_to_virt(base);
  		if (check_vmi_rom(romstart)) {
@@ -14156,7 +15036,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker
  			return 1;
  		}
  	}
-@@ -836,6 +858,11 @@ static inline int __init activate_vmi(vo
+@@ -816,6 +838,11 @@ static inline int __init activate_vmi(void)
  
  	para_fill(pv_irq_ops.safe_halt, Halt);
  
@@ -14168,7 +15048,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker
  	/*
  	 * Alternative instruction rewriting doesn't happen soon enough
  	 * to convert VMI_IRET to a call instead of a jump; so we have
-@@ -853,16 +880,16 @@ static inline int __init activate_vmi(vo
+@@ -833,16 +860,16 @@ static inline int __init activate_vmi(void)
  
  void __init vmi_init(void)
  {
@@ -14189,7 +15069,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker
  
  #ifdef CONFIG_X86_IO_APIC
  	/* This is virtual hardware; timer routing is wired correctly */
-@@ -874,7 +901,7 @@ void __init vmi_activate(void)
+@@ -854,7 +881,7 @@ void __init vmi_activate(void)
  {
  	unsigned long flags;
  
@@ -14198,24 +15078,16 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker
  		return;
  
  	local_irq_save(flags);
-diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S	2010-05-15 13:21:14.162641857 -0400
-@@ -26,6 +26,22 @@
+diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
+index d0bb522..fdc8dce 100644
+--- a/arch/x86/kernel/vmlinux.lds.S
++++ b/arch/x86/kernel/vmlinux.lds.S
+@@ -26,6 +26,13 @@
  #include <asm/page_types.h>
  #include <asm/cache.h>
  #include <asm/boot.h>
 +#include <asm/segment.h>
 +
-+#undef PMD_SIZE
-+#undef PMD_SHIFT
-+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
-+#define PMD_SHIFT 21
-+#else
-+#define PMD_SHIFT 22
-+#endif
-+#define PMD_SIZE (1 << PMD_SHIFT)
-+
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
 +#define __KERNEL_TEXT_OFFSET	(LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
 +#else
@@ -14224,7 +15096,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
  
  #undef i386     /* in case the preprocessor is a 32bit one */
  
-@@ -34,40 +50,55 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF
+@@ -34,13 +41,13 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
  #ifdef CONFIG_X86_32
  OUTPUT_ARCH(i386)
  ENTRY(phys_startup_32)
@@ -14237,17 +15109,22 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
  
 +jiffies = jiffies_64;
 +
+ #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
+ /*
+  * On 64-bit, align RODATA to 2MB so that even with CONFIG_DEBUG_RODATA
+@@ -69,31 +76,46 @@ jiffies_64 = jiffies;
+ 
  PHDRS {
  	text PT_LOAD FLAGS(5);          /* R_E */
 -	data PT_LOAD FLAGS(7);          /* RWE */
++#ifdef CONFIG_X86_32
++	module PT_LOAD FLAGS(5);        /* R_E */
++#endif
 +#ifdef CONFIG_XEN
 +	rodata PT_LOAD FLAGS(5);        /* R_E */
 +#else
 +	rodata PT_LOAD FLAGS(4);        /* R__ */
 +#endif
-+#ifdef CONFIG_X86_32
-+	module PT_LOAD FLAGS(5);        /* R_E */
-+#endif
 +	data PT_LOAD FLAGS(6);          /* RW_ */
  #ifdef CONFIG_X86_64
  	user PT_LOAD FLAGS(5);          /* R_E */
@@ -14290,7 +15167,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
  		HEAD_TEXT
  #ifdef CONFIG_X86_32
  		. = ALIGN(PAGE_SIZE);
-@@ -82,28 +113,64 @@ SECTIONS
+@@ -108,13 +130,52 @@ SECTIONS
  		IRQENTRY_TEXT
  		*(.fixup)
  		*(.gnu.warning)
@@ -14301,25 +15178,8 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
 -	NOTES :text :note
 +	. += __KERNEL_TEXT_OFFSET;
 +
-+	. = ALIGN(PAGE_SIZE);
-+	NOTES :rodata :note
- 
--	EXCEPTION_TABLE(16) :text = 0x9090
-+	EXCEPTION_TABLE(16) :rodata
- 
- 	RO_DATA(PAGE_SIZE)
- 
 +#ifdef CONFIG_X86_32
 +	. = ALIGN(PAGE_SIZE);
-+	.rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
-+		*(.idt)
-+		. = ALIGN(PAGE_SIZE);
-+		*(.empty_zero_page)
-+		*(.swapper_pg_pmd)
-+		*(.swapper_pg_dir)
-+	}
-+
-+	. = ALIGN(PAGE_SIZE);
 +	.vmi.rom : AT(ADDR(.vmi.rom) - LOAD_OFFSET) {
 +		*(.vmi.rom)
 +	} :module
@@ -14331,20 +15191,46 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
 +		MODULES_EXEC_VADDR = .;
 +		BYTE(0)
 +		. += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
-+		. = ALIGN(PMD_SIZE);
++		. = ALIGN(HPAGE_SIZE);
 +		MODULES_EXEC_END = . - 1;
 +#endif
 +
 +	} :module
 +#endif
 +
- 	/* Data */
- 	.data : AT(ADDR(.data) - LOAD_OFFSET) {
++	.text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
 +		/* End of text section */
 +		_etext = . - __KERNEL_TEXT_OFFSET;
++	}
++
++#ifdef CONFIG_X86_32
++	. = ALIGN(PAGE_SIZE);
++	.rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
++		*(.idt)
++		. = ALIGN(PAGE_SIZE);
++		*(.empty_zero_page)
++		*(.swapper_pg_fixmap)
++		*(.swapper_pg_pmd)
++		*(.swapper_pg_dir)
++		*(.trampoline_pg_dir)
++	} :rodata
++#endif
++
++	. = ALIGN(PAGE_SIZE);
++	NOTES :rodata :note
+ 
+-	EXCEPTION_TABLE(16) :text = 0x9090
++	EXCEPTION_TABLE(16) :rodata
+ 
+ 	X64_ALIGN_DEBUG_RODATA_BEGIN
+ 	RO_DATA(PAGE_SIZE)
+@@ -122,16 +183,20 @@ SECTIONS
+ 
+ 	/* Data */
+ 	.data : AT(ADDR(.data) - LOAD_OFFSET) {
 +
 +#ifdef CONFIG_PAX_KERNEXEC
-+	. = ALIGN(PMD_SIZE);
++	. = ALIGN(HPAGE_SIZE);
 +#else
 +	. = ALIGN(PAGE_SIZE);
 +#endif
@@ -14362,11 +15248,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
  
  		PAGE_ALIGNED_DATA(PAGE_SIZE)
  
-@@ -166,12 +233,6 @@ SECTIONS
+@@ -194,12 +259,6 @@ SECTIONS
  	}
  	vgetcpu_mode = VVIRT(.vgetcpu_mode);
  
--	. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);
+-	. = ALIGN(L1_CACHE_BYTES);
 -	.jiffies : AT(VLOAD(.jiffies)) {
 -		*(.jiffies)
 -	}
@@ -14375,7 +15261,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
  	.vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {
  		*(.vsyscall_3)
  	}
-@@ -187,12 +248,19 @@ SECTIONS
+@@ -215,12 +274,19 @@ SECTIONS
  #endif /* CONFIG_X86_64 */
  
  	/* Init code and data - will be freed after init */
@@ -14384,7 +15270,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
 +		BYTE(0)
 +
 +#ifdef CONFIG_PAX_KERNEXEC
-+		. = ALIGN(PMD_SIZE);
++		. = ALIGN(HPAGE_SIZE);
 +#else
 +		. = ALIGN(PAGE_SIZE);
 +#endif
@@ -14398,7 +15284,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
  	/*
  	 * percpu offsets are zero-based on SMP.  PERCPU_VADDR() changes the
  	 * output PHDR, so the next output section - .init.text - should
-@@ -201,12 +269,27 @@ SECTIONS
+@@ -229,12 +295,27 @@ SECTIONS
  	PERCPU_VADDR(0, :percpu)
  #endif
  
@@ -14414,24 +15300,24 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
 +		VMLINUX_SYMBOL(_einittext) = .;
 +		. = ALIGN(PAGE_SIZE);
 +	} :text.init
-+
+ 
+-	INIT_DATA_SECTION(16)
 +	/*
 +	 * .exit.text is discard at runtime, not link time, to deal with
 +	 *  references from .altinstructions and .eh_frame
 +	 */
-+	.exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
++	.exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
 +		EXIT_TEXT
 +		. = ALIGN(16);
 +	} :text.exit
 +	. = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
- 
--	INIT_DATA_SECTION(16)
++
 +	. = ALIGN(PAGE_SIZE);
 +	INIT_DATA_SECTION(16) :init
  
  	.x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
  		__x86_cpu_dev_start = .;
-@@ -232,19 +315,11 @@ SECTIONS
+@@ -260,19 +341,11 @@ SECTIONS
  		*(.altinstr_replacement)
  	}
  
@@ -14452,8 +15338,13 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
  	PERCPU(PAGE_SIZE)
  #endif
  
-@@ -267,12 +342,6 @@ SECTIONS
- 		. = ALIGN(PAGE_SIZE);
+@@ -291,16 +364,10 @@ SECTIONS
+ 	.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
+ 		__smp_locks = .;
+ 		*(.smp_locks)
+-		. = ALIGN(PAGE_SIZE);
+ 		__smp_locks_end = .;
++		. = ALIGN(PAGE_SIZE);
  	}
  
 -#ifdef CONFIG_X86_64
@@ -14465,18 +15356,18 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
  	/* BSS */
  	. = ALIGN(PAGE_SIZE);
  	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
-@@ -288,6 +357,7 @@ SECTIONS
+@@ -316,6 +383,7 @@ SECTIONS
  		__brk_base = .;
  		. += 64 * 1024;		/* 64k alignment slop space */
  		*(.brk_reservation)	/* areas brk users have reserved */
-+		. = ALIGN(PMD_SIZE);
++		. = ALIGN(HPAGE_SIZE);
  		__brk_limit = .;
  	}
  
-@@ -316,13 +386,12 @@ SECTIONS
+@@ -342,13 +410,12 @@ SECTIONS
   * for the boot processor.
   */
- #define INIT_PER_CPU(x) init_per_cpu__##x = per_cpu__##x + __per_cpu_load
+ #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
 -INIT_PER_CPU(gdt_page);
  INIT_PER_CPU(irq_stack_union);
  
@@ -14488,10 +15379,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8
  	   "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c	2010-05-15 13:21:14.162641857 -0400
-@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa
+diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
+index 1c0c6ab..937756d 100644
+--- a/arch/x86/kernel/vsyscall_64.c
++++ b/arch/x86/kernel/vsyscall_64.c
+@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock,
  
  	write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
  	/* copy vsyscall data */
@@ -14499,7 +15391,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c linux-2.6.32.13/arch/x8
  	vsyscall_gtod_data.clock.vread = clock->vread;
  	vsyscall_gtod_data.clock.cycle_last = clock->cycle_last;
  	vsyscall_gtod_data.clock.mask = clock->mask;
-@@ -202,7 +203,7 @@ vgetcpu(unsigned *cpu, unsigned *node, s
+@@ -203,7 +204,7 @@ vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache)
  	   We do this here because otherwise user space would do it on
  	   its own in a likely inferior way (no access to jiffies).
  	   If you don't like it pass NULL. */
@@ -14508,38 +15400,24 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c linux-2.6.32.13/arch/x8
  		p = tcache->blob[1];
  	} else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
  		/* Load per CPU data from RDTSCP */
-@@ -233,13 +234,13 @@ static ctl_table kernel_table2[] = {
- 	  .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int),
- 	  .mode = 0644,
- 	  .proc_handler = proc_dointvec },
--	{}
-+	{ 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL }
- };
- 
- static ctl_table kernel_root_table2[] = {
- 	{ .ctl_name = CTL_KERN, .procname = "kernel", .mode = 0555,
- 	  .child = kernel_table2 },
--	{}
-+	{ 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL }
- };
- #endif
- 
-diff -urNp linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c	2010-05-15 13:21:14.162641857 -0400
-@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
- 
- EXPORT_SYMBOL(copy_user_generic);
+diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
+index 1b950d1..ca83b2a 100644
+--- a/arch/x86/kernel/x8664_ksyms_64.c
++++ b/arch/x86/kernel/x8664_ksyms_64.c
+@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
+ EXPORT_SYMBOL(copy_user_generic_string);
+ EXPORT_SYMBOL(copy_user_generic_unrolled);
  EXPORT_SYMBOL(__copy_user_nocache);
--EXPORT_SYMBOL(copy_from_user);
--EXPORT_SYMBOL(copy_to_user);
- EXPORT_SYMBOL(__copy_from_user_inatomic);
+-EXPORT_SYMBOL(_copy_from_user);
+-EXPORT_SYMBOL(_copy_to_user);
  
  EXPORT_SYMBOL(copy_page);
-diff -urNp linux-2.6.32.13/arch/x86/kernel/xsave.c linux-2.6.32.13/arch/x86/kernel/xsave.c
---- linux-2.6.32.13/arch/x86/kernel/xsave.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kernel/xsave.c	2010-05-15 13:21:14.162641857 -0400
-@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
+ EXPORT_SYMBOL(clear_page);
+diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
+index 37e68fc..121259e 100644
+--- a/arch/x86/kernel/xsave.c
++++ b/arch/x86/kernel/xsave.c
+@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
  	    fx_sw_user->xstate_size > fx_sw_user->extended_size)
  		return -1;
  
@@ -14557,8 +15435,8 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/xsave.c linux-2.6.32.13/arch/x86/kern
  }
  
  /*
-@@ -228,7 +228,7 @@ int restore_i387_xstate(void __user *buf
- 	if (task_thread_info(tsk)->status & TS_XSAVE)
+@@ -228,7 +228,7 @@ int restore_i387_xstate(void __user *buf)
+ 	if (use_xsave())
  		err = restore_user_xstate(buf);
  	else
 -		err = fxrstor_checking((__force struct i387_fxsave_struct *)
@@ -14566,21 +15444,26 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/xsave.c linux-2.6.32.13/arch/x86/kern
  				       buf);
  	if (unlikely(err)) {
  		/*
-diff -urNp linux-2.6.32.13/arch/x86/kvm/emulate.c linux-2.6.32.13/arch/x86/kvm/emulate.c
---- linux-2.6.32.13/arch/x86/kvm/emulate.c	2010-04-29 17:49:37.541027029 -0400
-+++ linux-2.6.32.13/arch/x86/kvm/emulate.c	2010-05-15 13:21:14.178920275 -0400
-@@ -81,8 +81,8 @@
+diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
+index 582c8fc..24806a4 100644
+--- a/arch/x86/kvm/emulate.c
++++ b/arch/x86/kvm/emulate.c
+@@ -88,11 +88,11 @@
  #define Src2CL      (1<<29)
  #define Src2ImmByte (2<<29)
  #define Src2One     (3<<29)
 -#define Src2Imm16   (4<<29)
--#define Src2Mask    (7<<29)
+-#define Src2Mem16   (5<<29) /* Used for Ep encoding. First argument has to be
 +#define Src2Imm16   (4U<<29)
++#define Src2Mem16   (5U<<29) /* Used for Ep encoding. First argument has to be
+ 			       in memory and second argument is located
+ 			       immediately after the first one in memory. */
+-#define Src2Mask    (7<<29)
 +#define Src2Mask    (7U<<29)
  
  enum {
  	Group1_80, Group1_81, Group1_82, Group1_83,
-@@ -411,6 +411,7 @@ static u32 group2_table[] = {
+@@ -446,6 +446,7 @@ static u32 group2_table[] = {
  
  #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix)	\
  	do {								\
@@ -14588,7 +15471,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/emulate.c linux-2.6.32.13/arch/x86/kvm/e
  		__asm__ __volatile__ (					\
  			_PRE_EFLAGS("0", "4", "2")			\
  			_op _suffix " %"_x"3,%1; "			\
-@@ -424,8 +425,6 @@ static u32 group2_table[] = {
+@@ -459,8 +460,6 @@ static u32 group2_table[] = {
  /* Raw emulation: instruction has two explicit operands. */
  #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \
  	do {								\
@@ -14597,7 +15480,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/emulate.c linux-2.6.32.13/arch/x86/kvm/e
  		switch ((_dst).bytes) {					\
  		case 2:							\
  			____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \
-@@ -441,7 +440,6 @@ static u32 group2_table[] = {
+@@ -476,7 +475,6 @@ static u32 group2_table[] = {
  
  #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
  	do {								     \
@@ -14605,9 +15488,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/emulate.c linux-2.6.32.13/arch/x86/kvm/e
  		switch ((_dst).bytes) {				             \
  		case 1:							     \
  			____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b");  \
-diff -urNp linux-2.6.32.13/arch/x86/kvm/lapic.c linux-2.6.32.13/arch/x86/kvm/lapic.c
---- linux-2.6.32.13/arch/x86/kvm/lapic.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/kvm/lapic.c	2010-05-15 13:21:14.186649754 -0400
+diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
+index 1eb7a4a..66513e00 100644
+--- a/arch/x86/kvm/lapic.c
++++ b/arch/x86/kvm/lapic.c
 @@ -52,7 +52,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
@@ -14617,25 +15501,24 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/lapic.c linux-2.6.32.13/arch/x86/kvm/lap
  
  #define APIC_LVT_NUM			6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-2.6.32.13/arch/x86/kvm/svm.c linux-2.6.32.13/arch/x86/kvm/svm.c
---- linux-2.6.32.13/arch/x86/kvm/svm.c	2010-04-29 17:49:37.601044544 -0400
-+++ linux-2.6.32.13/arch/x86/kvm/svm.c	2010-05-15 13:21:14.206681110 -0400
-@@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k
- static void reload_tss(struct kvm_vcpu *vcpu)
- {
+diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
+index 9ca7032..36aa477 100644
+--- a/arch/x86/kvm/svm.c
++++ b/arch/x86/kvm/svm.c
+@@ -2825,7 +2825,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
  	int cpu = raw_smp_processor_id();
--
- 	struct svm_cpu_data *svm_data = per_cpu(svm_data, cpu);
+ 
+ 	struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
 +
 +	pax_open_kernel();
- 	svm_data->tss_desc->type = 9; /* available 32/64-bit TSS */
+ 	sd->tss_desc->type = 9; /* available 32/64-bit TSS */
 +	pax_close_kernel();
 +
  	load_TR_desc();
  }
  
-@@ -2845,7 +2848,7 @@ static bool svm_gb_page_enable(void)
- 	return true;
+@@ -3370,7 +3374,7 @@ static void svm_fpu_deactivate(struct kvm_vcpu *vcpu)
+ 	update_cr0_intercept(svm);
  }
  
 -static struct kvm_x86_ops svm_x86_ops = {
@@ -14643,13 +15526,14 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/svm.c linux-2.6.32.13/arch/x86/kvm/svm.c
  	.cpu_has_kvm_support = has_svm,
  	.disabled_by_bios = is_disabled,
  	.hardware_setup = svm_hardware_setup,
-diff -urNp linux-2.6.32.13/arch/x86/kvm/vmx.c linux-2.6.32.13/arch/x86/kvm/vmx.c
---- linux-2.6.32.13/arch/x86/kvm/vmx.c	2010-04-29 17:49:37.601044544 -0400
-+++ linux-2.6.32.13/arch/x86/kvm/vmx.c	2010-05-15 13:23:38.934774262 -0400
-@@ -568,7 +568,11 @@ static void reload_tss(void)
+diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
+index 39ac456..37d565b 100644
+--- a/arch/x86/kvm/vmx.c
++++ b/arch/x86/kvm/vmx.c
+@@ -654,7 +654,11 @@ static void reload_tss(void)
  
- 	kvm_get_gdt(&gdt);
- 	descs = (void *)gdt.base;
+ 	native_store_gdt(&gdt);
+ 	descs = (void *)gdt.address;
 +
 +	pax_open_kernel();
  	descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
@@ -14658,7 +15542,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/vmx.c linux-2.6.32.13/arch/x86/kvm/vmx.c
  	load_TR_desc();
  }
  
-@@ -1395,8 +1399,11 @@ static __init int hardware_setup(void)
+@@ -1554,8 +1558,11 @@ static __init int hardware_setup(void)
  	if (!cpu_has_vmx_flexpriority())
  		flexpriority_enabled = 0;
  
@@ -14672,16 +15556,16 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/vmx.c linux-2.6.32.13/arch/x86/kvm/vmx.c
  
  	if (enable_ept && !cpu_has_vmx_ept_2m_page())
  		kvm_disable_largepages();
-@@ -2347,7 +2354,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
- 	vmcs_writel(HOST_IDTR_BASE, dt.base);   /* 22.2.4 */
+@@ -2537,7 +2544,7 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)
+ 	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_write32(VM_ENTRY_MSR_LOAD_COUNT, 0);
-@@ -3703,6 +3710,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
+ 	vmcs_write64(VM_EXIT_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.host));
+@@ -3913,6 +3920,12 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
  		"jmp .Lkvm_vmx_return \n\t"
  		".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
  		".Lkvm_vmx_return: "
@@ -14694,7 +15578,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/vmx.c linux-2.6.32.13/arch/x86/kvm/vmx.c
  		/* Save guest registers, load host registers, keep flags */
  		"xchg %0,     (%%"R"sp) \n\t"
  		"mov %%"R"ax, %c[rax](%0) \n\t"
-@@ -3749,8 +3762,13 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -3959,8 +3972,13 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
  		[r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])),
  #endif
  		[cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))
@@ -14709,17 +15593,17 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/vmx.c linux-2.6.32.13/arch/x86/kvm/vmx.c
  #ifdef CONFIG_X86_64
  		, "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"
  #endif
-@@ -3767,7 +3785,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -3974,7 +3992,7 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
  	if (vmx->rmode.irq.pending)
  		fixup_rmode_irq(vmx);
  
 -	asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
-+	asm("mov %0, %%ds; mov %0, %%es" : : "r"(__KERNEL_DS));
++	asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
  	vmx->launched = 1;
  
  	vmx_complete_interrupts(vmx);
-@@ -3942,7 +3960,7 @@ static bool vmx_gb_page_enable(void)
- 	return false;
+@@ -4195,7 +4213,7 @@ static void vmx_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)
+ {
  }
  
 -static struct kvm_x86_ops vmx_x86_ops = {
@@ -14727,10 +15611,11 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/vmx.c linux-2.6.32.13/arch/x86/kvm/vmx.c
  	.cpu_has_kvm_support = cpu_has_kvm_support,
  	.disabled_by_bios = vmx_disabled_by_bios,
  	.hardware_setup = hardware_setup,
-diff -urNp linux-2.6.32.13/arch/x86/kvm/x86.c linux-2.6.32.13/arch/x86/kvm/x86.c
---- linux-2.6.32.13/arch/x86/kvm/x86.c	2010-05-15 13:20:18.454567530 -0400
-+++ linux-2.6.32.13/arch/x86/kvm/x86.c	2010-05-15 13:21:14.230911822 -0400
-@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct 
+diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
+index eee5cdd..415d3fd 100644
+--- a/arch/x86/kvm/x86.c
++++ b/arch/x86/kvm/x86.c
+@@ -86,7 +86,7 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu);
  static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
  				    struct kvm_cpuid_entry2 __user *entries);
  
@@ -14739,7 +15624,8 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/x86.c linux-2.6.32.13/arch/x86/kvm/x86.c
  EXPORT_SYMBOL_GPL(kvm_x86_ops);
  
  int ignore_msrs = 0;
- module_param_named(ignore_msrs, ignore_msrs, bool, S_IRUGO | S_IWUSR);
+@@ -112,38 +112,38 @@ static struct kvm_shared_msrs_global __read_mostly shared_msrs_global;
+ static DEFINE_PER_CPU(struct kvm_shared_msrs, shared_msrs);
  
  struct kvm_stats_debugfs_item debugfs_entries[] = {
 -	{ "pf_fixed", VCPU_STAT(pf_fixed) },
@@ -14809,7 +15695,16 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/x86.c linux-2.6.32.13/arch/x86/kvm/x86.c
  	{ NULL }
  };
  
-@@ -1635,7 +1635,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
+@@ -1672,6 +1672,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
+ 		if (n < msr_list.nmsrs)
+ 			goto out;
+ 		r = -EFAULT;
++		if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
++			goto out;
+ 		if (copy_to_user(user_msr_list->indices, &msrs_to_save,
+ 				 num_msrs_to_save * sizeof(u32)))
+ 			goto out;
+@@ -2103,7 +2105,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
  static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
  				    struct kvm_interrupt *irq)
  {
@@ -14818,22 +15713,107 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/x86.c linux-2.6.32.13/arch/x86/kvm/x86.c
  		return -EINVAL;
  	if (irqchip_in_kernel(vcpu->kvm))
  		return -ENXIO;
-@@ -3205,10 +3205,10 @@ static struct notifier_block kvmclock_cp
-         .notifier_call  = kvmclock_cpufreq_notifier
- };
+@@ -4076,10 +4078,10 @@ void kvm_after_handle_nmi(struct kvm_vcpu *vcpu)
+ }
+ EXPORT_SYMBOL_GPL(kvm_after_handle_nmi);
  
 -int kvm_arch_init(void *opaque)
 +int kvm_arch_init(const void *opaque)
  {
- 	int r, cpu;
+ 	int r;
 -	struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
 +	const struct kvm_x86_ops *ops = (const struct kvm_x86_ops *)opaque;
  
  	if (kvm_x86_ops) {
  		printk(KERN_ERR "kvm: already loaded the other module\n");
-diff -urNp linux-2.6.32.13/arch/x86/lib/checksum_32.S linux-2.6.32.13/arch/x86/lib/checksum_32.S
---- linux-2.6.32.13/arch/x86/lib/checksum_32.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/checksum_32.S	2010-05-15 13:21:14.230911822 -0400
+diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
+index 71e080d..9a90110 100644
+--- a/arch/x86/lib/atomic64_cx8_32.S
++++ b/arch/x86/lib/atomic64_cx8_32.S
+@@ -86,13 +86,23 @@ ENTRY(atomic64_\func\()_return_cx8)
+ 	movl %edx, %ecx
+ 	\ins\()l %esi, %ebx
+ 	\insc\()l %edi, %ecx
++
++#ifdef CONFIG_PAX_REFCOUNT
++	into
++2:
++	_ASM_EXTABLE(2b, 3f)
++#endif
++
+ 	LOCK_PREFIX
+ 	cmpxchg8b (%ebp)
+ 	jne 1b
+-
+-10:
+ 	movl %ebx, %eax
+ 	movl %ecx, %edx
++
++#ifdef CONFIG_PAX_REFCOUNT
++3:
++#endif
++
+ 	RESTORE edi
+ 	RESTORE esi
+ 	RESTORE ebx
+@@ -116,13 +126,24 @@ ENTRY(atomic64_\func\()_return_cx8)
+ 	movl %edx, %ecx
+ 	\ins\()l $1, %ebx
+ 	\insc\()l $0, %ecx
++
++#ifdef CONFIG_PAX_REFCOUNT
++	into
++2:
++	_ASM_EXTABLE(2b, 3f)
++#endif
++
+ 	LOCK_PREFIX
+ 	cmpxchg8b (%esi)
+ 	jne 1b
+ 
+-10:
+ 	movl %ebx, %eax
+ 	movl %ecx, %edx
++
++#ifdef CONFIG_PAX_REFCOUNT
++3:
++#endif
++
+ 	RESTORE ebx
+ 	ret
+ 	CFI_ENDPROC
+@@ -176,6 +197,13 @@ ENTRY(atomic64_add_unless_cx8)
+ 	movl %edx, %ecx
+ 	addl %esi, %ebx
+ 	adcl %edi, %ecx
++
++#ifdef CONFIG_PAX_REFCOUNT
++	into
++1234:
++	_ASM_EXTABLE(1234b, 1234b)
++#endif
++
+ 	LOCK_PREFIX
+ 	cmpxchg8b (%ebp)
+ 	jne 1b
+@@ -208,6 +236,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
+ 	movl %edx, %ecx
+ 	addl $1, %ebx
+ 	adcl $0, %ecx
++
++#ifdef CONFIG_PAX_REFCOUNT
++	into
++1234:
++	_ASM_EXTABLE(1234b, 1234b)
++#endif
++
+ 	LOCK_PREFIX
+ 	cmpxchg8b (%esi)
+ 	jne 1b
+diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
+index adbccd0..d9f12e3 100644
+--- a/arch/x86/lib/checksum_32.S
++++ b/arch/x86/lib/checksum_32.S
 @@ -28,7 +28,8 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -14844,7 +15824,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/checksum_32.S linux-2.6.32.13/arch/x86/l
  /*
   * computes a partial checksum, e.g. for TCP/UDP fragments
   */
-@@ -304,9 +305,22 @@ unsigned int csum_partial_copy_generic (
+@@ -304,9 +305,22 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
  
  #define ARGBASE 16		
  #define FP		12
@@ -15079,9 +16059,10 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/checksum_32.S linux-2.6.32.13/arch/x86/l
  				
  #undef ROUND
  #undef ROUND1		
-diff -urNp linux-2.6.32.13/arch/x86/lib/clear_page_64.S linux-2.6.32.13/arch/x86/lib/clear_page_64.S
---- linux-2.6.32.13/arch/x86/lib/clear_page_64.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/clear_page_64.S	2010-05-15 13:21:14.230911822 -0400
+diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
+index ebeafcc..609dc8a 100644
+--- a/arch/x86/lib/clear_page_64.S
++++ b/arch/x86/lib/clear_page_64.S
 @@ -43,7 +43,7 @@ ENDPROC(clear_page)
  
  #include <asm/cpufeature.h>
@@ -15091,9 +16072,10 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/clear_page_64.S linux-2.6.32.13/arch/x86
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (clear_page_c - clear_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.32.13/arch/x86/lib/copy_page_64.S linux-2.6.32.13/arch/x86/lib/copy_page_64.S
---- linux-2.6.32.13/arch/x86/lib/copy_page_64.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/copy_page_64.S	2010-05-15 13:21:14.230911822 -0400
+diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
+index 727a5d4..fd61ff4 100644
+--- a/arch/x86/lib/copy_page_64.S
++++ b/arch/x86/lib/copy_page_64.S
 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
  
  #include <asm/cpufeature.h>
@@ -15103,9 +16085,10 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/copy_page_64.S linux-2.6.32.13/arch/x86/
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (copy_page_c - copy_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_64.S linux-2.6.32.13/arch/x86/lib/copy_user_64.S
---- linux-2.6.32.13/arch/x86/lib/copy_user_64.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/copy_user_64.S	2010-05-15 13:21:14.234766826 -0400
+diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
+index 71100c9..31abdb0 100644
+--- a/arch/x86/lib/copy_user_64.S
++++ b/arch/x86/lib/copy_user_64.S
 @@ -15,13 +15,14 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -15122,12 +16105,12 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_64.S linux-2.6.32.13/arch/x86/
  2:	.byte 0xe9			/* near jump with 32bit immediate */
  	.long \alt-1b /* offset */   /* or alternatively to alt */
  	.previous
-@@ -64,32 +65,6 @@
+@@ -64,37 +65,13 @@
  #endif
  	.endm
  
 -/* Standard copy_to_user with segment limit checking */
--ENTRY(copy_to_user)
+-ENTRY(_copy_to_user)
 -	CFI_STARTPROC
 -	GET_THREAD_INFO(%rax)
 -	movq %rdi,%rcx
@@ -15137,10 +16120,10 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_64.S linux-2.6.32.13/arch/x86/
 -	jae bad_to_user
 -	ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
 -	CFI_ENDPROC
--ENDPROC(copy_to_user)
+-ENDPROC(_copy_to_user)
 -
 -/* Standard copy_from_user with segment limit checking */
--ENTRY(copy_from_user)
+-ENTRY(_copy_from_user)
 -	CFI_STARTPROC
 -	GET_THREAD_INFO(%rax)
 -	movq %rsi,%rcx
@@ -15150,28 +16133,10 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_64.S linux-2.6.32.13/arch/x86/
 -	jae bad_from_user
 -	ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
 -	CFI_ENDPROC
--ENDPROC(copy_from_user)
+-ENDPROC(_copy_from_user)
 -
- ENTRY(copy_user_generic)
- 	CFI_STARTPROC
- 	ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
-@@ -98,6 +73,15 @@ ENDPROC(copy_user_generic)
- 
- ENTRY(__copy_from_user_inatomic)
- 	CFI_STARTPROC
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+	mov $PAX_USER_SHADOW_BASE,%rcx
-+	cmp %rcx,%rsi
-+	jae 1f
-+	add %rcx,%rsi
-+1:
-+#endif
-+
- 	ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
- 	CFI_ENDPROC
- ENDPROC(__copy_from_user_inatomic)
-@@ -107,6 +91,8 @@ ENDPROC(__copy_from_user_inatomic)
+ 	.section .fixup,"ax"
+ 	/* must zero dest */
  ENTRY(bad_from_user)
  bad_from_user:
  	CFI_STARTPROC
@@ -15180,9 +16145,10 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_64.S linux-2.6.32.13/arch/x86/
  	movl %edx,%ecx
  	xorl %eax,%eax
  	rep
-diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S	2010-05-15 13:21:14.234766826 -0400
+diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
+index cb0c112..39e53b9 100644
+--- a/arch/x86/lib/copy_user_nocache_64.S
++++ b/arch/x86/lib/copy_user_nocache_64.S
 @@ -14,6 +14,7 @@
  #include <asm/current.h>
  #include <asm/asm-offsets.h>
@@ -15207,10 +16173,11 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.13/a
  	cmpl $8,%edx
  	jb 20f		/* less then 8 bytes, go to byte copy loop */
  	ALIGN_DESTINATION
-diff -urNp linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c	2010-05-15 13:21:14.234766826 -0400
-@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
+diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
+index 459b58a..bb5720e 100644
+--- a/arch/x86/lib/csum-wrappers_64.c
++++ b/arch/x86/lib/csum-wrappers_64.c
+@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
  			len -= 2;
  		}
  	}
@@ -15219,7 +16186,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.13/arch/
  	isum = csum_partial_copy_generic((__force const void *)src,
  				dst, len, isum, errp, NULL);
  	if (unlikely(*errp))
-@@ -105,6 +107,8 @@ csum_partial_copy_to_user(const void *sr
+@@ -105,6 +107,8 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
  	}
  
  	*errp = 0;
@@ -15228,9 +16195,10 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.13/arch/
  	return csum_partial_copy_generic(src, (void __force *)dst,
  					 len, isum, NULL, errp);
  }
-diff -urNp linux-2.6.32.13/arch/x86/lib/getuser.S linux-2.6.32.13/arch/x86/lib/getuser.S
---- linux-2.6.32.13/arch/x86/lib/getuser.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/getuser.S	2010-05-15 13:21:14.234766826 -0400
+diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
+index 51f1504..2f490c0 100644
+--- a/arch/x86/lib/getuser.S
++++ b/arch/x86/lib/getuser.S
 @@ -33,14 +33,38 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -15367,34 +16335,34 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/getuser.S linux-2.6.32.13/arch/x86/lib/g
  	xor %edx,%edx
  	mov $(-EFAULT),%_ASM_AX
  	ret
-diff -urNp linux-2.6.32.13/arch/x86/lib/memcpy_64.S linux-2.6.32.13/arch/x86/lib/memcpy_64.S
---- linux-2.6.32.13/arch/x86/lib/memcpy_64.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/memcpy_64.S	2010-05-15 13:21:14.234766826 -0400
-@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
- 	 * It is also a lot simpler. Use this when possible:
- 	 */
- 
--	.section .altinstr_replacement, "ax"
-+	.section .altinstr_replacement, "a"
- 1:	.byte 0xeb				/* jmp <disp8> */
- 	.byte (memcpy_c - memcpy) - (2f - 1b)	/* offset */
- 2:
-diff -urNp linux-2.6.32.13/arch/x86/lib/memset_64.S linux-2.6.32.13/arch/x86/lib/memset_64.S
---- linux-2.6.32.13/arch/x86/lib/memset_64.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/memset_64.S	2010-05-15 13:21:14.234766826 -0400
-@@ -118,7 +118,7 @@ ENDPROC(__memset)
- 
- #include <asm/cpufeature.h>
- 
--	.section .altinstr_replacement,"ax"
-+	.section .altinstr_replacement,"a"
- 1:	.byte 0xeb				/* jmp <disp8> */
- 	.byte (memset_c - memset) - (2f - 1b)	/* offset */
- 2:
-diff -urNp linux-2.6.32.13/arch/x86/lib/mmx_32.c linux-2.6.32.13/arch/x86/lib/mmx_32.c
---- linux-2.6.32.13/arch/x86/lib/mmx_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/mmx_32.c	2010-05-15 13:21:14.234766826 -0400
-@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
+diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
+index 9f33b98..e3a194d 100644
+--- a/arch/x86/lib/insn.c
++++ b/arch/x86/lib/insn.c
+@@ -21,6 +21,7 @@
+ #include <linux/string.h>
+ #include <asm/inat.h>
+ #include <asm/insn.h>
++#include <asm/pgtable_types.h>
+ 
+ #define get_next(t, insn)	\
+ 	({t r; r = *(t*)insn->next_byte; insn->next_byte += sizeof(t); r; })
+@@ -40,8 +41,8 @@
+ void insn_init(struct insn *insn, const void *kaddr, int x86_64)
+ {
+ 	memset(insn, 0, sizeof(*insn));
+-	insn->kaddr = kaddr;
+-	insn->next_byte = kaddr;
++	insn->kaddr = ktla_ktva(kaddr);
++	insn->next_byte = ktla_ktva(kaddr);
+ 	insn->x86_64 = x86_64 ? 1 : 0;
+ 	insn->opnd_bytes = 4;
+ 	if (x86_64)
+diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
+index c9f2d9b..e7fd2c0 100644
+--- a/arch/x86/lib/mmx_32.c
++++ b/arch/x86/lib/mmx_32.c
+@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
  {
  	void *p;
  	int i;
@@ -15402,7 +16370,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/mmx_32.c linux-2.6.32.13/arch/x86/lib/mm
  
  	if (unlikely(in_interrupt()))
  		return __memcpy(to, from, len);
-@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *
+@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
  	kernel_fpu_begin();
  
  	__asm__ __volatile__ (
@@ -15509,7 +16477,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/mmx_32.c linux-2.6.32.13/arch/x86/lib/mm
  
  	kernel_fpu_begin();
  
-@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, voi
+@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
  	 * but that is for later. -AV
  	 */
  	__asm__ __volatile__(
@@ -15709,9 +16677,10 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/mmx_32.c linux-2.6.32.13/arch/x86/lib/mm
  
  		from += 64;
  		to += 64;
-diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/putuser.S
---- linux-2.6.32.13/arch/x86/lib/putuser.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/putuser.S	2010-05-15 13:21:14.234766826 -0400
+diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
+index 36b0d15..4c35b79 100644
+--- a/arch/x86/lib/putuser.S
++++ b/arch/x86/lib/putuser.S
 @@ -15,7 +15,8 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
@@ -15722,7 +16691,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/p
  
  /*
   * __put_user_X
-@@ -29,59 +30,156 @@
+@@ -29,59 +30,162 @@
   * as they get called from within inline assembly.
   */
  
@@ -15732,6 +16701,12 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/p
  #define EXIT	ret ; \
  		CFI_ENDPROC
  
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define _DEST %_ASM_CX,%_ASM_BX
++#else
++#define _DEST %_ASM_CX
++#endif
++
  .text
  ENTRY(__put_user_1)
  	ENTER
@@ -15743,18 +16718,19 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/p
 +	GET_THREAD_INFO(%_ASM_BX)
  	cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
  	jae bad_put_user
+-1:	movb %al,(%_ASM_CX)
 +
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +	mov $PAX_USER_SHADOW_BASE,%_ASM_BX
 +	cmp %_ASM_BX,%_ASM_CX
-+	jae 1234f
-+	add %_ASM_BX,%_ASM_CX
++	jb 1234f
++	xor %ebx,%ebx
 +1234:
 +#endif
 +
 +#endif
 +
- 1:	movb %al,(%_ASM_CX)
++1:	movb %al,(_DEST)
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +	pushl %ss
@@ -15777,18 +16753,19 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/p
  	sub $1,%_ASM_BX
  	cmp %_ASM_BX,%_ASM_CX
  	jae bad_put_user
+-2:	movw %ax,(%_ASM_CX)
 +
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +	mov $PAX_USER_SHADOW_BASE,%_ASM_BX
 +	cmp %_ASM_BX,%_ASM_CX
-+	jae 1234f
-+	add %_ASM_BX,%_ASM_CX
++	jb 1234f
++	xor %ebx,%ebx
 +1234:
 +#endif
 +
 +#endif
 +
- 2:	movw %ax,(%_ASM_CX)
++2:	movw %ax,(_DEST)
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +	pushl %ss
@@ -15811,18 +16788,19 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/p
  	sub $3,%_ASM_BX
  	cmp %_ASM_BX,%_ASM_CX
  	jae bad_put_user
+-3:	movl %eax,(%_ASM_CX)
 +
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +	mov $PAX_USER_SHADOW_BASE,%_ASM_BX
 +	cmp %_ASM_BX,%_ASM_CX
-+	jae 1234f
-+	add %_ASM_BX,%_ASM_CX
++	jb 1234f
++	xor %ebx,%ebx
 +1234:
 +#endif
 +
 +#endif
 +
- 3:	movl %eax,(%_ASM_CX)
++3:	movl %eax,(_DEST)
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +	pushl %ss
@@ -15845,20 +16823,22 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/p
  	sub $7,%_ASM_BX
  	cmp %_ASM_BX,%_ASM_CX
  	jae bad_put_user
+-4:	mov %_ASM_AX,(%_ASM_CX)
 +
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +	mov $PAX_USER_SHADOW_BASE,%_ASM_BX
 +	cmp %_ASM_BX,%_ASM_CX
-+	jae 1234f
-+	add %_ASM_BX,%_ASM_CX
++	jb 1234f
++	xor %ebx,%ebx
 +1234:
 +#endif
 +
 +#endif
 +
- 4:	mov %_ASM_AX,(%_ASM_CX)
++4:	mov %_ASM_AX,(_DEST)
  #ifdef CONFIG_X86_32
- 5:	movl %edx,4(%_ASM_CX)
+-5:	movl %edx,4(%_ASM_CX)
++5:	movl %edx,4(_DEST)
  #endif
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
@@ -15881,10 +16861,11 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/p
  	movl $-EFAULT,%eax
  	EXIT
  END(bad_put_user)
-diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/lib/usercopy_32.c
---- linux-2.6.32.13/arch/x86/lib/usercopy_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/usercopy_32.c	2010-05-15 13:21:14.234766826 -0400
-@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
+diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
+index e218d5d..5f0615c 100644
+--- a/arch/x86/lib/usercopy_32.c
++++ b/arch/x86/lib/usercopy_32.c
+@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned lon
   * Copy a null terminated string from userspace.
   */
  
@@ -15959,7 +16940,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  }
  EXPORT_SYMBOL(__strncpy_from_user);
  
-@@ -114,7 +119,7 @@ strncpy_from_user(char *dst, const char 
+@@ -114,7 +119,7 @@ strncpy_from_user(char *dst, const char __user *src, long count)
  {
  	long res = -EFAULT;
  	if (access_ok(VERIFY_READ, src, 1))
@@ -16017,7 +16998,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  
  /**
   * clear_user: - Zero a block of memory in user space.
-@@ -157,7 +168,7 @@ clear_user(void __user *to, unsigned lon
+@@ -157,7 +168,7 @@ clear_user(void __user *to, unsigned long n)
  {
  	might_fault();
  	if (access_ok(VERIFY_WRITE, to, n))
@@ -16036,7 +17017,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  }
  EXPORT_SYMBOL(__clear_user);
  
-@@ -200,14 +210,17 @@ long strnlen_user(const char __user *s, 
+@@ -200,14 +210,17 @@ long strnlen_user(const char __user *s, long n)
  	might_fault();
  
  	__asm__ __volatile__(
@@ -16055,7 +17036,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  		".section .fixup,\"ax\"\n"
  		"2:	xorl %%eax,%%eax\n"
  		"	jmp 1b\n"
-@@ -219,7 +232,7 @@ long strnlen_user(const char __user *s, 
+@@ -219,7 +232,7 @@ long strnlen_user(const char __user *s, long n)
  		"	.long 0b,2b\n"
  		".previous"
  		:"=&r" (n), "=&D" (s), "=&a" (res), "=&c" (tmp)
@@ -16077,7 +17058,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  		       "       .align 2,0x90\n"
  		       "1:     movl 32(%4), %%eax\n"
  		       "       cmpl $67, %0\n"
-@@ -239,36 +253,36 @@ __copy_user_intel(void __user *to, const
+@@ -239,36 +253,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
  		       "       .align 2,0x90\n"
  		       "3:     movl 0(%4), %%eax\n"
  		       "4:     movl 4(%4), %%edx\n"
@@ -16130,7 +17111,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  		       "       addl $-64, %0\n"
  		       "       addl $64, %4\n"
  		       "       addl $64, %3\n"
-@@ -282,6 +296,8 @@ __copy_user_intel(void __user *to, const
+@@ -282,6 +296,8 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
  		       "36:    movl %%eax, %0\n"
  		       "37:    rep; movsb\n"
  		       "100:\n"
@@ -16139,7 +17120,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  		       ".section .fixup,\"ax\"\n"
  		       "101:   lea 0(%%eax,%0,4),%0\n"
  		       "       jmp 100b\n"
-@@ -328,7 +344,117 @@ __copy_user_intel(void __user *to, const
+@@ -328,7 +344,117 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
  		       "       .long 99b,101b\n"
  		       ".previous"
  		       : "=&c"(size), "=&D" (d0), "=&S" (d1)
@@ -16258,7 +17239,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  		       : "eax", "edx", "memory");
  	return size;
  }
-@@ -338,6 +464,7 @@ __copy_user_zeroing_intel(void *to, cons
+@@ -338,6 +464,7 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
  {
  	int d0, d1;
  	__asm__ __volatile__(
@@ -16266,7 +17247,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  		       "        .align 2,0x90\n"
  		       "0:      movl 32(%4), %%eax\n"
  		       "        cmpl $67, %0\n"
-@@ -346,36 +473,36 @@ __copy_user_zeroing_intel(void *to, cons
+@@ -346,36 +473,36 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
  		       "        .align 2,0x90\n"
  		       "2:      movl 0(%4), %%eax\n"
  		       "21:     movl 4(%4), %%edx\n"
@@ -16319,7 +17300,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  		       "        addl $-64, %0\n"
  		       "        addl $64, %4\n"
  		       "        addl $64, %3\n"
-@@ -389,6 +516,8 @@ __copy_user_zeroing_intel(void *to, cons
+@@ -389,6 +516,8 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
  		       "        movl %%eax,%0\n"
  		       "7:      rep; movsb\n"
  		       "8:\n"
@@ -16328,7 +17309,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  		       ".section .fixup,\"ax\"\n"
  		       "9:      lea 0(%%eax,%0,4),%0\n"
  		       "16:     pushl %0\n"
-@@ -423,7 +552,7 @@ __copy_user_zeroing_intel(void *to, cons
+@@ -423,7 +552,7 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
  		       "        .long 7b,16b\n"
  		       ".previous"
  		       : "=&c"(size), "=&D" (d0), "=&S" (d1)
@@ -16337,7 +17318,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  		       : "eax", "edx", "memory");
  	return size;
  }
-@@ -439,6 +568,7 @@ static unsigned long __copy_user_zeroing
+@@ -439,6 +568,7 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
  	int d0, d1;
  
  	__asm__ __volatile__(
@@ -16345,7 +17326,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  	       "        .align 2,0x90\n"
  	       "0:      movl 32(%4), %%eax\n"
  	       "        cmpl $67, %0\n"
-@@ -447,36 +577,36 @@ static unsigned long __copy_user_zeroing
+@@ -447,36 +577,36 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
  	       "        .align 2,0x90\n"
  	       "2:      movl 0(%4), %%eax\n"
  	       "21:     movl 4(%4), %%edx\n"
@@ -16398,7 +17379,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  	       "        addl $-64, %0\n"
  	       "        addl $64, %4\n"
  	       "        addl $64, %3\n"
-@@ -491,6 +621,8 @@ static unsigned long __copy_user_zeroing
+@@ -491,6 +621,8 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
  	       "        movl %%eax,%0\n"
  	       "7:      rep; movsb\n"
  	       "8:\n"
@@ -16407,7 +17388,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  	       ".section .fixup,\"ax\"\n"
  	       "9:      lea 0(%%eax,%0,4),%0\n"
  	       "16:     pushl %0\n"
-@@ -525,7 +657,7 @@ static unsigned long __copy_user_zeroing
+@@ -525,7 +657,7 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
  	       "        .long 7b,16b\n"
  	       ".previous"
  	       : "=&c"(size), "=&D" (d0), "=&S" (d1)
@@ -16416,7 +17397,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  	       : "eax", "edx", "memory");
  	return size;
  }
-@@ -536,6 +668,7 @@ static unsigned long __copy_user_intel_n
+@@ -536,6 +668,7 @@ static unsigned long __copy_user_intel_nocache(void *to,
  	int d0, d1;
  
  	__asm__ __volatile__(
@@ -16424,7 +17405,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  	       "        .align 2,0x90\n"
  	       "0:      movl 32(%4), %%eax\n"
  	       "        cmpl $67, %0\n"
-@@ -544,36 +677,36 @@ static unsigned long __copy_user_intel_n
+@@ -544,36 +677,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
  	       "        .align 2,0x90\n"
  	       "2:      movl 0(%4), %%eax\n"
  	       "21:     movl 4(%4), %%edx\n"
@@ -16477,7 +17458,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  	       "        addl $-64, %0\n"
  	       "        addl $64, %4\n"
  	       "        addl $64, %3\n"
-@@ -588,6 +721,8 @@ static unsigned long __copy_user_intel_n
+@@ -588,6 +721,8 @@ static unsigned long __copy_user_intel_nocache(void *to,
  	       "        movl %%eax,%0\n"
  	       "7:      rep; movsb\n"
  	       "8:\n"
@@ -16486,7 +17467,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  	       ".section .fixup,\"ax\"\n"
  	       "9:      lea 0(%%eax,%0,4),%0\n"
  	       "16:     jmp 8b\n"
-@@ -616,7 +751,7 @@ static unsigned long __copy_user_intel_n
+@@ -616,7 +751,7 @@ static unsigned long __copy_user_intel_nocache(void *to,
  	       "        .long 7b,16b\n"
  	       ".previous"
  	       : "=&c"(size), "=&D" (d0), "=&S" (d1)
@@ -16495,7 +17476,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  	       : "eax", "edx", "memory");
  	return size;
  }
-@@ -629,90 +764,146 @@ static unsigned long __copy_user_intel_n
+@@ -629,90 +764,146 @@ static unsigned long __copy_user_intel_nocache(void *to,
   */
  unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
  					unsigned long size);
@@ -16732,7 +17713,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  	return n;
  }
  EXPORT_SYMBOL(__copy_to_user_ll);
-@@ -786,7 +977,7 @@ unsigned long __copy_from_user_ll(void *
+@@ -786,7 +977,7 @@ unsigned long __copy_from_user_ll(void *to, const void __user *from,
  					unsigned long n)
  {
  	if (movsl_is_ok(to, from, n))
@@ -16741,7 +17722,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  	else
  		n = __copy_user_zeroing_intel(to, from, n);
  	return n;
-@@ -797,10 +988,9 @@ unsigned long __copy_from_user_ll_nozero
+@@ -797,10 +988,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
  					 unsigned long n)
  {
  	if (movsl_is_ok(to, from, n))
@@ -16754,7 +17735,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  	return n;
  }
  EXPORT_SYMBOL(__copy_from_user_ll_nozero);
-@@ -812,9 +1002,9 @@ unsigned long __copy_from_user_ll_nocach
+@@ -812,9 +1002,9 @@ unsigned long __copy_from_user_ll_nocache(void *to, const void __user *from,
  	if (n > 64 && cpu_has_xmm2)
  		n = __copy_user_zeroing_intel_nocache(to, from, n);
  	else
@@ -16766,7 +17747,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
  #endif
  	return n;
  }
-@@ -827,59 +1017,40 @@ unsigned long __copy_from_user_ll_nocach
+@@ -827,65 +1017,53 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
  	if (n > 64 && cpu_has_xmm2)
  		n = __copy_user_intel_nocache(to, from, n);
  	else
@@ -16795,25 +17776,15 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
 - */
 -unsigned long
 -copy_to_user(void __user *to, const void *from, unsigned long n)
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+void __set_fs(mm_segment_t x, int cpu)
++void copy_from_user_overflow(void)
  {
 -	if (access_ok(VERIFY_WRITE, to, n))
 -		n = __copy_to_user(to, from, n);
 -	return n;
-+	unsigned long limit = x.seg;
-+	struct desc_struct d;
-+
-+	current_thread_info()->addr_limit = x;
-+	if (unlikely(paravirt_enabled()))
-+		return;
-+
-+	if (likely(limit))
-+		limit = (limit - 1UL) >> PAGE_SHIFT;
-+	pack_descriptor(&d, 0UL, limit, 0xF3, 0xC);
-+	write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_DS, &d, DESCTYPE_S);
++	WARN(1, "Buffer overflow detected!\n");
  }
 -EXPORT_SYMBOL(copy_to_user);
++EXPORT_SYMBOL(copy_from_user_overflow);
  
 -/**
 - * copy_from_user: - Copy a block of data from user space.
@@ -16832,18 +17803,44 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
 - * data to the requested size using zero bytes.
 - */
 -unsigned long
--copy_from_user(void *to, const void __user *from, unsigned long n)
-+void set_fs(mm_segment_t x)
+-_copy_from_user(void *to, const void __user *from, unsigned long n)
++void copy_to_user_overflow(void)
  {
 -	if (access_ok(VERIFY_READ, from, n))
 -		n = __copy_from_user(to, from, n);
 -	else
 -		memset(to, 0, n);
 -	return n;
++	WARN(1, "Buffer overflow detected!\n");
+ }
+-EXPORT_SYMBOL(_copy_from_user);
++EXPORT_SYMBOL(copy_to_user_overflow);
+ 
+-void copy_from_user_overflow(void)
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++void __set_fs(mm_segment_t x, int cpu)
+ {
+-	WARN(1, "Buffer overflow detected!\n");
++	unsigned long limit = x.seg;
++	struct desc_struct d;
++
++	current_thread_info()->addr_limit = x;
++	if (unlikely(paravirt_enabled()))
++		return;
++
++	if (likely(limit))
++		limit = (limit - 1UL) >> PAGE_SHIFT;
++	pack_descriptor(&d, 0UL, limit, 0xF3, 0xC);
++	write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_DS, &d, DESCTYPE_S);
+ }
+-EXPORT_SYMBOL(copy_from_user_overflow);
++
++void set_fs(mm_segment_t x)
++{
 +	__set_fs(x, get_cpu());
 +	put_cpu();
- }
--EXPORT_SYMBOL(copy_from_user);
++}
++EXPORT_SYMBOL(copy_from_user);
 +#else
 +void set_fs(mm_segment_t x)
 +{
@@ -16852,9 +17849,10 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l
 +#endif
 +
 +EXPORT_SYMBOL(set_fs);
-diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_64.c linux-2.6.32.13/arch/x86/lib/usercopy_64.c
---- linux-2.6.32.13/arch/x86/lib/usercopy_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/lib/usercopy_64.c	2010-05-15 13:21:14.234766826 -0400
+diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
+index b7c2849..7d0bb03 100644
+--- a/arch/x86/lib/usercopy_64.c
++++ b/arch/x86/lib/usercopy_64.c
 @@ -42,6 +42,8 @@ long
  __strncpy_from_user(char *dst, const char __user *src, long count)
  {
@@ -16864,7 +17862,7 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_64.c linux-2.6.32.13/arch/x86/l
  	__do_strncpy_from_user(dst, src, count, res);
  	return res;
  }
-@@ -65,6 +67,8 @@ unsigned long __clear_user(void __user *
+@@ -65,6 +67,8 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
  {
  	long __d0;
  	might_fault();
@@ -16891,25 +17889,10 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_64.c linux-2.6.32.13/arch/x86/l
  }
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.32.13/arch/x86/Makefile linux-2.6.32.13/arch/x86/Makefile
---- linux-2.6.32.13/arch/x86/Makefile	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/Makefile	2010-05-15 13:21:14.234766826 -0400
-@@ -189,3 +189,12 @@ define archhelp
-   echo  '                  FDARGS="..."  arguments for the booted kernel'
-   echo  '                  FDINITRD=file initrd for the booted kernel'
- endef
-+
-+define OLD_LD
-+
-+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
-+*** Please upgrade your binutils to 2.18 or newer
-+endef
-+
-+archprepare:
-+	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.32.13/arch/x86/mm/extable.c linux-2.6.32.13/arch/x86/mm/extable.c
---- linux-2.6.32.13/arch/x86/mm/extable.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/extable.c	2010-05-15 13:21:14.234766826 -0400
+diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
+index d0474ad..360f761 100644
+--- a/arch/x86/mm/extable.c
++++ b/arch/x86/mm/extable.c
 @@ -1,14 +1,71 @@
  #include <linux/module.h>
  #include <linux/spinlock.h>
@@ -16983,9 +17966,10 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/extable.c linux-2.6.32.13/arch/x86/mm/ext
  		extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
  		extern u32 pnp_bios_is_utter_crap;
  		pnp_bios_is_utter_crap = 1;
-diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault.c
---- linux-2.6.32.13/arch/x86/mm/fault.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/fault.c	2010-05-15 13:23:38.934774262 -0400
+diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
+index 4c4508e..8752b7e 100644
+--- a/arch/x86/mm/fault.c
++++ b/arch/x86/mm/fault.c
 @@ -11,10 +11,19 @@
  #include <linux/kprobes.h>		/* __kprobes, ...		*/
  #include <linux/mmiotrace.h>		/* kmmio_handler, ...		*/
@@ -17006,7 +17990,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  
  /*
   * Page fault error code bits:
-@@ -51,7 +60,7 @@ static inline int notify_page_fault(stru
+@@ -52,7 +61,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
  	int ret = 0;
  
  	/* kprobe_running() needs smp_processor_id() */
@@ -17015,7 +17999,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  		preempt_disable();
  		if (kprobe_running() && kprobe_fault_handler(regs, 14))
  			ret = 1;
-@@ -172,6 +181,30 @@ force_sig_info_fault(int si_signo, int s
+@@ -173,6 +182,30 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
  	force_sig_info(si_signo, &info, tsk);
  }
  
@@ -17046,7 +18030,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  DEFINE_SPINLOCK(pgd_lock);
  LIST_HEAD(pgd_list);
  
-@@ -224,11 +257,24 @@ void vmalloc_sync_all(void)
+@@ -225,11 +258,24 @@ void vmalloc_sync_all(void)
  	     address += PMD_SIZE) {
  
  		unsigned long flags;
@@ -17072,17 +18056,19 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  				break;
  		}
  		spin_unlock_irqrestore(&pgd_lock, flags);
-@@ -257,6 +303,9 @@ static noinline int vmalloc_fault(unsign
- 	 * Do _not_ use "current" here. We might be inside
+@@ -259,6 +305,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
  	 * an interrupt in the middle of a task switch..
  	 */
+ 	pgd_paddr = read_cr3();
++
 +#ifdef CONFIG_PAX_PER_CPU_PGD
-+	BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
++	BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
 +#endif
- 	pgd_paddr = read_cr3();
++
  	pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
  	if (!pmd_k)
-@@ -332,15 +381,27 @@ void vmalloc_sync_all(void)
+ 		return -1;
+@@ -333,15 +384,27 @@ void vmalloc_sync_all(void)
  
  		const pgd_t *pgd_ref = pgd_offset_k(address);
  		unsigned long flags;
@@ -17110,7 +18096,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  			if (pgd_none(*pgd))
  				set_pgd(pgd, *pgd_ref);
  			else
-@@ -373,7 +434,14 @@ static noinline int vmalloc_fault(unsign
+@@ -374,7 +437,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
  	 * happen within a race in page table update. In the later
  	 * case just flush:
  	 */
@@ -17125,7 +18111,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  	pgd_ref = pgd_offset_k(address);
  	if (pgd_none(*pgd_ref))
  		return -1;
-@@ -535,7 +603,7 @@ static int is_errata93(struct pt_regs *r
+@@ -536,7 +606,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
  static int is_errata100(struct pt_regs *regs, unsigned long address)
  {
  #ifdef CONFIG_X86_64
@@ -17134,7 +18120,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  		return 1;
  #endif
  	return 0;
-@@ -562,7 +630,7 @@ static int is_f00f_bug(struct pt_regs *r
+@@ -563,7 +633,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
  }
  
  static const char nx_warning[] = KERN_CRIT
@@ -17143,12 +18129,12 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  
  static void
  show_fault_oops(struct pt_regs *regs, unsigned long error_code,
-@@ -571,15 +639,26 @@ show_fault_oops(struct pt_regs *regs, un
+@@ -572,15 +642,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
  	if (!oops_may_print())
  		return;
  
 -	if (error_code & PF_INSTR) {
-+	if (nx_enabled && (error_code & PF_INSTR)) {
++	if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
  		unsigned int level;
  
  		pte_t *pte = lookup_address(address, &level);
@@ -17172,14 +18158,14 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  	printk(KERN_ALERT "BUG: unable to handle kernel ");
  	if (address < PAGE_SIZE)
  		printk(KERN_CONT "NULL pointer dereference");
-@@ -704,6 +783,68 @@ __bad_area_nosemaphore(struct pt_regs *r
+@@ -705,6 +786,68 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
  		       unsigned long address, int si_code)
  {
  	struct task_struct *tsk = current;
 +	struct mm_struct *mm = tsk->mm;
 +
 +#ifdef CONFIG_X86_64
-+	if (mm && (error_code & PF_INSTR)) {
++	if (mm && (error_code & PF_INSTR) && mm->context.vdso) {
 +		if (regs->ip == (unsigned long)vgettimeofday) {
 +			regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_gettimeofday);
 +			return;
@@ -17198,7 +18184,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
 +		unsigned long ip = regs->ip;
 +
 +		if (v8086_mode(regs))
-+			ip = ((regs->cs & 0xffff) << 4) + (regs->ip & 0xffff);
++			ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
 +
 +		/*
 +		 * It's possible to have interrupts off here:
@@ -17207,7 +18193,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
 +
 +#ifdef CONFIG_PAX_PAGEEXEC
 +		if ((mm->pax_flags & MF_PAX_PAGEEXEC) &&
-+		    ((nx_enabled && (error_code & PF_INSTR)) || (!(error_code & (PF_PROT | PF_WRITE)) && regs->ip == address))) {
++		    (((__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)) {
@@ -17216,13 +18202,13 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
 +			}
 +#endif
 +
-+			pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
++			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)) && (regs->ip + SEGMEXEC_TASK_SIZE == address)) {
++		if ((mm->pax_flags & MF_PAX_SEGMEXEC) && !(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address)) {
 +
 +#ifdef CONFIG_PAX_EMUTRAMP
 +			switch (pax_handle_fetch_fault(regs)) {
@@ -17231,7 +18217,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
 +			}
 +#endif
 +
-+			pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
++			pax_report_fault(regs, (void *)ip, (void *)regs->sp);
 +			do_group_exit(SIGKILL);
 +		}
 +#endif
@@ -17241,7 +18227,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  
  	/* User mode accesses just cause a SIGSEGV */
  	if (error_code & PF_USER) {
-@@ -848,6 +989,106 @@ static int spurious_fault_check(unsigned
+@@ -851,6 +994,106 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
  	return 1;
  }
  
@@ -17253,7 +18239,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
 +	spinlock_t *ptl;
 +	unsigned char pte_mask;
 +
-+	if (nx_enabled || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
++	if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
 +	    !(mm->pax_flags & MF_PAX_PAGEEXEC))
 +		return 0;
 +
@@ -17348,17 +18334,17 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  /*
   * Handle a spurious fault caused by a stale TLB entry.
   *
-@@ -914,6 +1155,9 @@ int show_unhandled_signals = 1;
+@@ -917,6 +1160,9 @@ int show_unhandled_signals = 1;
  static inline int
  access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
  {
-+	if (nx_enabled && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
++	if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
 +		return 1;
 +
  	if (write) {
  		/* write, present and write, not present: */
  		if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -947,17 +1191,31 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -950,17 +1196,31 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
  {
  	struct vm_area_struct *vma;
  	struct task_struct *tsk;
@@ -17394,7 +18380,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  	/*
  	 * Detect and handle instructions that would cause a page fault for
  	 * both a tracked kernel page and a userspace page.
-@@ -1017,7 +1275,7 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1020,7 +1280,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
  	 * User-mode registers count as a user access even for any
  	 * potential system fault or CPU buglet:
  	 */
@@ -17403,7 +18389,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  		local_irq_enable();
  		error_code |= PF_USER;
  	} else {
-@@ -1071,6 +1329,11 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1074,6 +1334,11 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
  		might_sleep();
  	}
  
@@ -17415,7 +18401,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
  	vma = find_vma(mm, address);
  	if (unlikely(!vma)) {
  		bad_area(regs, error_code, address);
-@@ -1082,18 +1345,24 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1085,18 +1350,24 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
  		bad_area(regs, error_code, address);
  		return;
  	}
@@ -17439,19 +18425,19 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
 +	if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
 +		bad_area(regs, error_code, address);
 +		return;
-+	}
+ 	}
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
 +		bad_area(regs, error_code, address);
 +		return;
- 	}
++	}
 +#endif
 +
  	if (unlikely(expand_stack(vma, address))) {
  		bad_area(regs, error_code, address);
  		return;
-@@ -1137,3 +1406,199 @@ good_area:
+@@ -1140,3 +1411,199 @@ good_area:
  
  	up_read(&mm->mmap_sem);
  }
@@ -17651,10 +18637,11 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault
 +
 +	return ret ? -EFAULT : 0;
 +}
-diff -urNp linux-2.6.32.13/arch/x86/mm/gup.c linux-2.6.32.13/arch/x86/mm/gup.c
---- linux-2.6.32.13/arch/x86/mm/gup.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/gup.c	2010-05-15 13:21:14.234766826 -0400
-@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 
+diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
+index 738e659..ca82c82 100644
+--- a/arch/x86/mm/gup.c
++++ b/arch/x86/mm/gup.c
+@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
  	addr = start;
  	len = (unsigned long) nr_pages << PAGE_SHIFT;
  	end = start + len;
@@ -17663,10 +18650,11 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/gup.c linux-2.6.32.13/arch/x86/mm/gup.c
  					(void __user *)start, len)))
  		return 0;
  
-diff -urNp linux-2.6.32.13/arch/x86/mm/highmem_32.c linux-2.6.32.13/arch/x86/mm/highmem_32.c
---- linux-2.6.32.13/arch/x86/mm/highmem_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/highmem_32.c	2010-05-15 13:21:14.238617110 -0400
-@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
+diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
+index 63a6ba6..79abd7a 100644
+--- a/arch/x86/mm/highmem_32.c
++++ b/arch/x86/mm/highmem_32.c
+@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot)
  	idx = type + KM_TYPE_NR*smp_processor_id();
  	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
  	BUG_ON(!pte_none(*(kmap_pte-idx)));
@@ -17677,10 +18665,11 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/highmem_32.c linux-2.6.32.13/arch/x86/mm/
  
  	return (void *)vaddr;
  }
-diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm/hugetlbpage.c
---- linux-2.6.32.13/arch/x86/mm/hugetlbpage.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/hugetlbpage.c	2010-05-15 13:21:14.238617110 -0400
-@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
+diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
+index 069ce7c..d318f90 100644
+--- a/arch/x86/mm/hugetlbpage.c
++++ b/arch/x86/mm/hugetlbpage.c
+@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
  	struct hstate *h = hstate_file(file);
  	struct mm_struct *mm = current->mm;
  	struct vm_area_struct *vma;
@@ -17691,6 +18680,8 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm
 +	if (mm->pax_flags & MF_PAX_SEGMEXEC)
 +		pax_task_size = SEGMEXEC_TASK_SIZE;
 +#endif
++
++	pax_task_size -= PAGE_SIZE;
  
  	if (len > mm->cached_hole_size) {
 -	        start_addr = mm->free_area_cache;
@@ -17703,7 +18694,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm
  	}
  
  full_search:
-@@ -281,13 +286,13 @@ full_search:
+@@ -280,26 +287,27 @@ full_search:
  
  	for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
  		/* At this point:  (!vma || addr < vma->vm_end). */
@@ -17720,18 +18711,38 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm
  				mm->cached_hole_size = 0;
  				goto full_search;
  			}
-@@ -310,9 +315,8 @@ static unsigned long hugetlb_get_unmappe
+ 			return -ENOMEM;
+ 		}
+-		if (!vma || addr + len <= vma->vm_start) {
+-			mm->free_area_cache = addr + len;
+-			return addr;
+-		}
++		if (check_heap_stack_gap(vma, addr, len))
++			break;
+ 		if (addr + mm->cached_hole_size < vma->vm_start)
+ 		        mm->cached_hole_size = vma->vm_start - addr;
+ 		addr = ALIGN(vma->vm_end, huge_page_size(h));
+ 	}
++
++	mm->free_area_cache = addr + len;
++	return addr;
+ }
+ 
+ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
+@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
+ {
  	struct hstate *h = hstate_file(file);
  	struct mm_struct *mm = current->mm;
- 	struct vm_area_struct *vma, *prev_vma;
+-	struct vm_area_struct *vma, *prev_vma;
 -	unsigned long base = mm->mmap_base, addr = addr0;
++	struct vm_area_struct *vma;
 +	unsigned long base = mm->mmap_base, addr;
  	unsigned long largest_hole = mm->cached_hole_size;
 -	int first_time = 1;
  
  	/* don't allow allocations above current base */
  	if (mm->free_area_cache > base)
-@@ -322,7 +326,7 @@ static unsigned long hugetlb_get_unmappe
+@@ -321,7 +328,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
  	        largest_hole = 0;
  		mm->free_area_cache  = base;
  	}
@@ -17740,7 +18751,51 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm
  	/* make sure it can fit in the remaining address space */
  	if (mm->free_area_cache < len)
  		goto fail;
-@@ -364,22 +368,26 @@ try_again:
+@@ -329,33 +336,27 @@ try_again:
+ 	/* either no address requested or cant fit in requested address hole */
+ 	addr = (mm->free_area_cache - len) & huge_page_mask(h);
+ 	do {
++		vma = find_vma(mm, addr);
+ 		/*
+ 		 * Lookup failure means no vma is above this address,
+ 		 * i.e. return with success:
+-		 */
+-		if (!(vma = find_vma_prev(mm, addr, &prev_vma)))
+-			return addr;
+-
+-		/*
+ 		 * new region fits between prev_vma->vm_end and
+ 		 * vma->vm_start, use it:
+ 		 */
+-		if (addr + len <= vma->vm_start &&
+-		            (!prev_vma || (addr >= prev_vma->vm_end))) {
++		if (check_heap_stack_gap(vma, addr, len)) {
+ 			/* remember the address as a hint for next time */
+-		        mm->cached_hole_size = largest_hole;
+-		        return (mm->free_area_cache = addr);
+-		} else {
+-			/* pull free_area_cache down to the first hole */
+-		        if (mm->free_area_cache == vma->vm_end) {
+-				mm->free_area_cache = vma->vm_start;
+-				mm->cached_hole_size = largest_hole;
+-			}
++			mm->cached_hole_size = largest_hole;
++			return (mm->free_area_cache = addr);
++		}
++		/* pull free_area_cache down to the first hole */
++		if (mm->free_area_cache == vma->vm_end) {
++			mm->free_area_cache = vma->vm_start;
++			mm->cached_hole_size = largest_hole;
+ 		}
+ 
+ 		/* remember the largest hole we saw so far */
+ 		if (addr + largest_hole < vma->vm_start)
+-		        largest_hole = vma->vm_start - addr;
++			largest_hole = vma->vm_start - addr;
+ 
+ 		/* try just below the current vma->vm_start */
+ 		addr = (vma->vm_start - len) & huge_page_mask(h);
+@@ -363,22 +364,26 @@ try_again:
  
  fail:
  	/*
@@ -17778,7 +18833,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm
  	mm->cached_hole_size = ~0UL;
  	addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
  			len, pgoff, flags);
-@@ -387,6 +395,7 @@ fail:
+@@ -386,6 +391,7 @@ fail:
  	/*
  	 * Restore the topdown base:
  	 */
@@ -17786,7 +18841,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm
  	mm->free_area_cache = base;
  	mm->cached_hole_size = ~0UL;
  
-@@ -400,10 +409,17 @@ hugetlb_get_unmapped_area(struct file *f
+@@ -399,10 +405,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
  	struct hstate *h = hstate_file(file);
  	struct mm_struct *mm = current->mm;
  	struct vm_area_struct *vma;
@@ -17801,22 +18856,147 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm
 +		pax_task_size = SEGMEXEC_TASK_SIZE;
 +#endif
 +
++	pax_task_size -= PAGE_SIZE;
++
 +	if (len > pax_task_size)
  		return -ENOMEM;
  
  	if (flags & MAP_FIXED) {
-@@ -415,7 +431,7 @@ hugetlb_get_unmapped_area(struct file *f
+@@ -414,8 +429,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
  	if (addr) {
  		addr = ALIGN(addr, huge_page_size(h));
  		vma = find_vma(mm, addr);
 -		if (TASK_SIZE - len >= addr &&
-+		if (pax_task_size - len >= addr &&
- 		    (!vma || addr + len <= vma->vm_start))
+-		    (!vma || addr + len <= vma->vm_start))
++		if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
  			return addr;
  	}
-diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/init_32.c
---- linux-2.6.32.13/arch/x86/mm/init_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/init_32.c	2010-05-15 13:21:14.238617110 -0400
+ 	if (mm->get_unmapped_area == arch_get_unmapped_area)
+diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
+index b278535..9654c83 100644
+--- a/arch/x86/mm/init.c
++++ b/arch/x86/mm/init.c
+@@ -70,11 +70,7 @@ static void __init find_early_table_space(unsigned long end, int use_pse,
+ 	 * cause a hotspot and fill up ZONE_DMA. The page tables
+ 	 * need roughly 0.5KB per GB.
+ 	 */
+-#ifdef CONFIG_X86_32
+-	start = 0x7000;
+-#else
+-	start = 0x8000;
+-#endif
++	start = 0x100000;
+ 	e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
+ 					tables, PAGE_SIZE);
+ 	if (e820_table_start == -1UL)
+@@ -321,7 +317,13 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+  */
+ int devmem_is_allowed(unsigned long pagenr)
+ {
+-	if (pagenr <= 256)
++	if (!pagenr)
++		return 1;
++#ifdef CONFIG_VM86
++	if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
++		return 1;
++#endif
++	if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
+ 		return 1;
+ 	if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
+ 		return 0;
+@@ -380,6 +382,88 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
+ 
+ void free_initmem(void)
+ {
++
++#ifdef CONFIG_PAX_KERNEXEC
++#ifdef CONFIG_X86_32
++	/* PaX: limit KERNEL_CS to actual size */
++	unsigned long addr, limit;
++	struct desc_struct d;
++	int cpu;
++
++	limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
++	limit = (limit - 1UL) >> PAGE_SHIFT;
++
++	memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
++	for (cpu = 0; cpu < NR_CPUS; cpu++) {
++		pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
++		write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
++	}
++
++	/* PaX: make KERNEL_CS read-only */
++	addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
++	if (!paravirt_enabled())
++		set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
++/*
++		for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
++			pgd = pgd_offset_k(addr);
++			pud = pud_offset(pgd, addr);
++			pmd = pmd_offset(pud, addr);
++			set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
++		}
++*/
++#ifdef CONFIG_X86_PAE
++	set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
++/*
++	for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
++		pgd = pgd_offset_k(addr);
++		pud = pud_offset(pgd, addr);
++		pmd = pmd_offset(pud, addr);
++		set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
++	}
++*/
++#endif
++
++#ifdef CONFIG_MODULES
++	set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
++#endif
++
++#else
++	pgd_t *pgd;
++	pud_t *pud;
++	pmd_t *pmd;
++	unsigned long addr, end;
++
++	/* PaX: make kernel code/rodata read-only, rest non-executable */
++	for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
++		pgd = pgd_offset_k(addr);
++		pud = pud_offset(pgd, addr);
++		pmd = pmd_offset(pud, addr);
++		if (!pmd_present(*pmd))
++			continue;
++		if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
++			set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
++		else
++			set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
++	}
++
++	addr = (unsigned long)__va(__pa(__START_KERNEL_map));
++	end = addr + KERNEL_IMAGE_SIZE;
++	for (; addr < end; addr += PMD_SIZE) {
++		pgd = pgd_offset_k(addr);
++		pud = pud_offset(pgd, addr);
++		pmd = pmd_offset(pud, addr);
++		if (!pmd_present(*pmd))
++			continue;
++		if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
++			set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
++		else
++			set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
++	}
++#endif
++
++	flush_tlb_all();
++#endif
++
+ 	free_init_pages("unused kernel memory",
+ 			(unsigned long)(&__init_begin),
+ 			(unsigned long)(&__init_end));
+diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
+index bca7909..313e4cb 100644
+--- a/arch/x86/mm/init_32.c
++++ b/arch/x86/mm/init_32.c
 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
  }
  
@@ -17854,7 +19034,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
   * Create a page table and place a pointer to it in a middle page
   * directory entry:
   */
-@@ -121,13 +91,28 @@ static pte_t * __init one_page_table_ini
+@@ -121,13 +91,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
  			page_table = (pte_t *)alloc_low_page();
  
  		paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
@@ -17883,7 +19063,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  pmd_t * __init populate_extra_pmd(unsigned long vaddr)
  {
  	int pgd_idx = pgd_index(vaddr);
-@@ -201,6 +186,7 @@ page_table_range_init(unsigned long star
+@@ -201,6 +186,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
  	int pgd_idx, pmd_idx;
  	unsigned long vaddr;
  	pgd_t *pgd;
@@ -17891,7 +19071,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  	pmd_t *pmd;
  	pte_t *pte = NULL;
  
-@@ -210,8 +196,13 @@ page_table_range_init(unsigned long star
+@@ -210,8 +196,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
  	pgd = pgd_base + pgd_idx;
  
  	for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
@@ -17907,7 +19087,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  		for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
  							pmd++, pmd_idx++) {
  			pte = page_table_kmap_check(one_page_table_init(pmd),
-@@ -223,11 +214,20 @@ page_table_range_init(unsigned long star
+@@ -223,11 +214,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
  	}
  }
  
@@ -17932,8 +19112,8 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  }
  
  /*
-@@ -243,9 +243,10 @@ kernel_physical_mapping_init(unsigned lo
- 	int use_pse = page_size_mask == (1<<PG_LEVEL_2M);
+@@ -244,9 +244,10 @@ kernel_physical_mapping_init(unsigned long start,
+ 	unsigned long last_map_addr = end;
  	unsigned long start_pfn, end_pfn;
  	pgd_t *pgd_base = swapper_pg_dir;
 -	int pgd_idx, pmd_idx, pte_ofs;
@@ -17944,7 +19124,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  	pmd_t *pmd;
  	pte_t *pte;
  	unsigned pages_2m, pages_4k;
-@@ -278,8 +279,13 @@ repeat:
+@@ -279,8 +280,13 @@ repeat:
  	pfn = start_pfn;
  	pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
  	pgd = pgd_base + pgd_idx;
@@ -17960,7 +19140,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  
  		if (pfn >= end_pfn)
  			continue;
-@@ -291,14 +297,13 @@ repeat:
+@@ -292,14 +298,13 @@ repeat:
  #endif
  		for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
  		     pmd++, pmd_idx++) {
@@ -17976,7 +19156,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  				pgprot_t prot = PAGE_KERNEL_LARGE;
  				/*
  				 * first pass will use the same initial
-@@ -308,11 +313,7 @@ repeat:
+@@ -309,11 +314,7 @@ repeat:
  					__pgprot(PTE_IDENT_ATTR |
  						 _PAGE_PSE);
  
@@ -17989,7 +19169,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  					prot = PAGE_KERNEL_LARGE_EXEC;
  
  				pages_2m++;
-@@ -329,7 +330,7 @@ repeat:
+@@ -330,7 +331,7 @@ repeat:
  			pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
  			pte += pte_ofs;
  			for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
@@ -17998,7 +19178,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  				pgprot_t prot = PAGE_KERNEL;
  				/*
  				 * first pass will use the same initial
-@@ -337,7 +338,7 @@ repeat:
+@@ -338,7 +339,7 @@ repeat:
  				 */
  				pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
  
@@ -18007,7 +19187,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  					prot = PAGE_KERNEL_EXEC;
  
  				pages_4k++;
-@@ -489,7 +490,7 @@ void __init native_pagetable_setup_start
+@@ -491,7 +492,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
  
  		pud = pud_offset(pgd, va);
  		pmd = pmd_offset(pud, va);
@@ -18016,7 +19196,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  			break;
  
  		pte = pte_offset_kernel(pmd, va);
-@@ -541,9 +542,7 @@ void __init early_ioremap_page_table_ran
+@@ -543,9 +544,7 @@ void __init early_ioremap_page_table_range_init(void)
  
  static void __init pagetable_init(void)
  {
@@ -18027,7 +19207,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  }
  
  #ifdef CONFIG_ACPI_SLEEP
-@@ -551,12 +550,12 @@ static void __init pagetable_init(void)
+@@ -553,12 +552,12 @@ static void __init pagetable_init(void)
   * ACPI suspend needs this for resume, because things like the intel-agp
   * driver might have split up a kernel 4MB mapping.
   */
@@ -18042,7 +19222,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  }
  #else /* !CONFIG_ACPI_SLEEP */
  static inline void save_pg_dir(void)
-@@ -588,7 +587,7 @@ void zap_low_mappings(bool early)
+@@ -590,7 +589,7 @@ void zap_low_mappings(bool early)
  		flush_tlb_all();
  }
  
@@ -18051,7 +19231,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  EXPORT_SYMBOL_GPL(__supported_pte_mask);
  
  /* user-defined highmem size */
-@@ -777,7 +776,7 @@ void __init setup_bootmem_allocator(void
+@@ -781,7 +780,7 @@ void __init setup_bootmem_allocator(void)
  	 * Initialize the boot-time allocator (with low memory only):
  	 */
  	bootmap_size = bootmem_bootmap_pages(max_low_pfn)<<PAGE_SHIFT;
@@ -18060,7 +19240,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  				 PAGE_SIZE);
  	if (bootmap == -1L)
  		panic("Cannot find bootmem map of size %ld\n", bootmap_size);
-@@ -864,6 +863,12 @@ void __init mem_init(void)
+@@ -871,6 +870,12 @@ void __init mem_init(void)
  
  	pci_iommu_alloc();
  
@@ -18073,7 +19253,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  #ifdef CONFIG_FLATMEM
  	BUG_ON(!mem_map);
  #endif
-@@ -881,7 +886,7 @@ void __init mem_init(void)
+@@ -888,7 +893,7 @@ void __init mem_init(void)
  	set_highmem_pages_init();
  
  	codesize =  (unsigned long) &_etext - (unsigned long) &_text;
@@ -18082,7 +19262,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  	initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
  
  	printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
-@@ -923,10 +928,10 @@ void __init mem_init(void)
+@@ -929,10 +934,10 @@ void __init mem_init(void)
  		((unsigned long)&__init_end -
  		 (unsigned long)&__init_begin) >> 10,
  
@@ -18096,7 +19276,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  		((unsigned long)&_etext - (unsigned long)&_text) >> 10);
  
  	/*
-@@ -1007,6 +1012,7 @@ void set_kernel_text_rw(void)
+@@ -1013,6 +1018,7 @@ void set_kernel_text_rw(void)
  	if (!kernel_set_to_readonly)
  		return;
  
@@ -18104,7 +19284,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  	pr_debug("Set kernel text: %lx - %lx for read write\n",
  		 start, start+size);
  
-@@ -1021,6 +1027,7 @@ void set_kernel_text_ro(void)
+@@ -1027,6 +1033,7 @@ void set_kernel_text_ro(void)
  	if (!kernel_set_to_readonly)
  		return;
  
@@ -18112,7 +19292,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  	pr_debug("Set kernel text: %lx - %lx for read only\n",
  		 start, start+size);
  
-@@ -1032,6 +1039,7 @@ void mark_rodata_ro(void)
+@@ -1038,6 +1045,7 @@ void mark_rodata_ro(void)
  	unsigned long start = PFN_ALIGN(_text);
  	unsigned long size = PFN_ALIGN(_etext) - start;
  
@@ -18120,10 +19300,28 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini
  	set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
  	printk(KERN_INFO "Write protecting the kernel text: %luk\n",
  		size >> 10);
-diff -urNp linux-2.6.32.13/arch/x86/mm/init_64.c linux-2.6.32.13/arch/x86/mm/init_64.c
---- linux-2.6.32.13/arch/x86/mm/init_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/init_64.c	2010-05-15 13:21:14.238617110 -0400
-@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 
+diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
+index ee41bba..94a8b29 100644
+--- a/arch/x86/mm/init_64.c
++++ b/arch/x86/mm/init_64.c
+@@ -50,7 +50,6 @@
+ #include <asm/numa.h>
+ #include <asm/cacheflush.h>
+ #include <asm/init.h>
+-#include <linux/bootmem.h>
+ 
+ static unsigned long dma_reserve __initdata;
+ 
+@@ -74,7 +73,7 @@ early_param("gbpages", parse_direct_gbpages_on);
+  * around without checking the pgd every time.
+  */
+ 
+-pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
++pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
+ EXPORT_SYMBOL_GPL(__supported_pte_mask);
+ 
+ int force_personality32;
+@@ -165,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
  	pmd = fill_pmd(pud, vaddr);
  	pte = fill_pte(pmd, vaddr);
  
@@ -18133,7 +19331,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_64.c linux-2.6.32.13/arch/x86/mm/ini
  
  	/*
  	 * It's enough to flush this one mapping.
-@@ -222,14 +224,12 @@ static void __init __init_extra_mapping(
+@@ -224,14 +225,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
  		pgd = pgd_offset_k((unsigned long)__va(phys));
  		if (pgd_none(*pgd)) {
  			pud = (pud_t *) spp_getpage();
@@ -18150,7 +19348,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_64.c linux-2.6.32.13/arch/x86/mm/ini
  		}
  		pmd = pmd_offset(pud, phys);
  		BUG_ON(!pmd_none(*pmd));
-@@ -656,6 +656,12 @@ void __init mem_init(void)
+@@ -680,6 +679,12 @@ void __init mem_init(void)
  
  	pci_iommu_alloc();
  
@@ -18163,7 +19361,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_64.c linux-2.6.32.13/arch/x86/mm/ini
  	/* clear_bss() already clear the empty_zero_page */
  
  	reservedpages = 0;
-@@ -842,8 +848,8 @@ int kern_addr_valid(unsigned long addr)
+@@ -886,8 +891,8 @@ int kern_addr_valid(unsigned long addr)
  static struct vm_area_struct gate_vma = {
  	.vm_start	= VSYSCALL_START,
  	.vm_end		= VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
@@ -18174,7 +19372,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_64.c linux-2.6.32.13/arch/x86/mm/ini
  };
  
  struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-@@ -877,7 +883,7 @@ int in_gate_area_no_task(unsigned long a
+@@ -921,7 +926,7 @@ int in_gate_area_no_task(unsigned long addr)
  
  const char *arch_vma_name(struct vm_area_struct *vma)
  {
@@ -18183,129 +19381,11 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_64.c linux-2.6.32.13/arch/x86/mm/ini
  		return "[vdso]";
  	if (vma == &gate_vma)
  		return "[vsyscall]";
-diff -urNp linux-2.6.32.13/arch/x86/mm/init.c linux-2.6.32.13/arch/x86/mm/init.c
---- linux-2.6.32.13/arch/x86/mm/init.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/init.c	2010-05-15 13:21:14.238617110 -0400
-@@ -69,11 +69,7 @@ static void __init find_early_table_spac
- 	 * cause a hotspot and fill up ZONE_DMA. The page tables
- 	 * need roughly 0.5KB per GB.
- 	 */
--#ifdef CONFIG_X86_32
--	start = 0x7000;
--#else
--	start = 0x8000;
--#endif
-+	start = 0x100000;
- 	e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
- 					tables, PAGE_SIZE);
- 	if (e820_table_start == -1UL)
-@@ -331,7 +327,13 @@ unsigned long __init_refok init_memory_m
-  */
- int devmem_is_allowed(unsigned long pagenr)
- {
--	if (pagenr <= 256)
-+	if (!pagenr)
-+		return 1;
-+#ifdef CONFIG_VM86
-+	if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
-+		return 1;
-+#endif
-+	if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
- 		return 1;
- 	if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
- 		return 0;
-@@ -379,6 +381,87 @@ void free_init_pages(char *what, unsigne
- 
- void free_initmem(void)
- {
-+
-+#ifdef CONFIG_PAX_KERNEXEC
-+	pgd_t *pgd;
-+	pud_t *pud;
-+	pmd_t *pmd;
-+
-+#ifdef CONFIG_X86_32
-+	/* PaX: limit KERNEL_CS to actual size */
-+	unsigned long addr, limit;
-+	struct desc_struct d;
-+	int cpu;
-+
-+	limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
-+	limit = (limit - 1UL) >> PAGE_SHIFT;
-+
-+	memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
-+	for (cpu = 0; cpu < NR_CPUS; cpu++) {
-+		pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
-+		write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
-+	}
-+
-+	/* PaX: make KERNEL_CS read-only */
-+	addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
-+	if (!paravirt_enabled())
-+		set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
-+/*
-+		for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
-+			pgd = pgd_offset_k(addr);
-+			pud = pud_offset(pgd, addr);
-+			pmd = pmd_offset(pud, addr);
-+			set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
-+		}
-+*/
-+#ifdef CONFIG_X86_PAE
-+	set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
-+	for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
-+		pgd = pgd_offset_k(addr);
-+		pud = pud_offset(pgd, addr);
-+		pmd = pmd_offset(pud, addr);
-+		set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
-+	}
-+#endif
-+
-+#ifdef CONFIG_MODULES
-+	set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
-+#endif
-+
-+#else
-+	unsigned long addr, end;
-+
-+	/* PaX: make kernel code/rodata read-only, rest non-executable */
-+	for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
-+		pgd = pgd_offset_k(addr);
-+		pud = pud_offset(pgd, addr);
-+		pmd = pmd_offset(pud, addr);
-+		if (!pmd_present(*pmd))
-+			continue;
-+		if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
-+			set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
-+		else
-+			set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
-+	}
-+
-+	addr = (unsigned long)__va(__pa(__START_KERNEL_map));
-+	end = addr + KERNEL_IMAGE_SIZE;
-+	for (; addr < end; addr += PMD_SIZE) {
-+		pgd = pgd_offset_k(addr);
-+		pud = pud_offset(pgd, addr);
-+		pmd = pmd_offset(pud, addr);
-+		if (!pmd_present(*pmd))
-+			continue;
-+		if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
-+			set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
-+		else
-+			set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
-+	}
-+#endif
-+
-+	flush_tlb_all();
-+#endif
-+
- 	free_init_pages("unused kernel memory",
- 			(unsigned long)(&__init_begin),
- 			(unsigned long)(&__init_end));
-diff -urNp linux-2.6.32.13/arch/x86/mm/iomap_32.c linux-2.6.32.13/arch/x86/mm/iomap_32.c
---- linux-2.6.32.13/arch/x86/mm/iomap_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/iomap_32.c	2010-05-15 13:21:14.238617110 -0400
-@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
+diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
+index 84e236c..69bd3f6 100644
+--- a/arch/x86/mm/iomap_32.c
++++ b/arch/x86/mm/iomap_32.c
+@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot)
  	debug_kmap_atomic(type);
  	idx = type + KM_TYPE_NR * smp_processor_id();
  	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -18317,21 +19397,11 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/iomap_32.c linux-2.6.32.13/arch/x86/mm/io
  	arch_flush_lazy_mmu_mode();
  
  	return (void *)vaddr;
-diff -urNp linux-2.6.32.13/arch/x86/mm/ioremap.c linux-2.6.32.13/arch/x86/mm/ioremap.c
---- linux-2.6.32.13/arch/x86/mm/ioremap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/ioremap.c	2010-05-15 13:21:14.238617110 -0400
-@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
- 	 * Second special case: Some BIOSen report the PC BIOS
- 	 * area (640->1Mb) as ram even though it is not.
- 	 */
--	if (pagenr >= (BIOS_BEGIN >> PAGE_SHIFT) &&
--		    pagenr < (BIOS_END >> PAGE_SHIFT))
-+	if (pagenr >= (ISA_START_ADDRESS >> PAGE_SHIFT) &&
-+		    pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
- 		return 0;
- 
- 	for (i = 0; i < e820.nr_map; i++) {
-@@ -137,13 +137,10 @@ static void __iomem *__ioremap_caller(re
+diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
+index 12e4d2d..66f0373 100644
+--- a/arch/x86/mm/ioremap.c
++++ b/arch/x86/mm/ioremap.c
+@@ -100,13 +100,10 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
  	/*
  	 * Don't allow anybody to remap normal RAM that we're using..
  	 */
@@ -18347,7 +19417,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/ioremap.c linux-2.6.32.13/arch/x86/mm/ior
  			return NULL;
  		WARN_ON_ONCE(is_ram);
  	}
-@@ -407,7 +404,7 @@ static int __init early_ioremap_debug_se
+@@ -346,7 +343,7 @@ static int __init early_ioremap_debug_setup(char *str)
  early_param("early_ioremap_debug", early_ioremap_debug_setup);
  
  static __initdata int after_paging_init;
@@ -18356,7 +19426,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/ioremap.c linux-2.6.32.13/arch/x86/mm/ior
  
  static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
  {
-@@ -439,8 +436,7 @@ void __init early_ioremap_init(void)
+@@ -378,8 +375,7 @@ void __init early_ioremap_init(void)
  		slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
  
  	pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
@@ -18366,10 +19436,11 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/ioremap.c linux-2.6.32.13/arch/x86/mm/ior
  
  	/*
  	 * The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c	2010-05-15 13:21:14.238617110 -0400
-@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
+diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
+index b3b531a..b65b190 100644
+--- a/arch/x86/mm/kmemcheck/kmemcheck.c
++++ b/arch/x86/mm/kmemcheck/kmemcheck.c
+@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
  	 * memory (e.g. tracked pages)? For now, we need this to avoid
  	 * invoking kmemcheck for PnP BIOS calls.
  	 */
@@ -18381,10 +19452,11 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.13/arc
  		return false;
  
  	pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.32.13/arch/x86/mm/mmap.c linux-2.6.32.13/arch/x86/mm/mmap.c
---- linux-2.6.32.13/arch/x86/mm/mmap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/mmap.c	2010-05-15 13:21:14.238617110 -0400
-@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
+diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
+index 1dab519..60a7e5f 100644
+--- a/arch/x86/mm/mmap.c
++++ b/arch/x86/mm/mmap.c
+@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size(void)
   * Leave an at least ~128 MB hole with possible stack randomization.
   */
  #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
@@ -18400,7 +19472,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/mmap.c linux-2.6.32.13/arch/x86/mm/mmap.c
 -static unsigned long mmap_base(void)
 +static unsigned long mmap_base(struct mm_struct *mm)
  {
- 	unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur;
+ 	unsigned long gap = rlimit(RLIMIT_STACK);
 +	unsigned long pax_task_size = TASK_SIZE;
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
@@ -18439,7 +19511,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/mmap.c linux-2.6.32.13/arch/x86/mm/mmap.c
  		return TASK_UNMAPPED_BASE + mmap_rnd();
  }
  
-@@ -125,11 +138,23 @@ static unsigned long mmap_legacy_base(vo
+@@ -125,11 +138,23 @@ static unsigned long mmap_legacy_base(void)
  void arch_pick_mmap_layout(struct mm_struct *mm)
  {
  	if (mmap_is_legacy()) {
@@ -18465,10 +19537,11 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/mmap.c linux-2.6.32.13/arch/x86/mm/mmap.c
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.32.13/arch/x86/mm/numa_32.c linux-2.6.32.13/arch/x86/mm/numa_32.c
---- linux-2.6.32.13/arch/x86/mm/numa_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/numa_32.c	2010-05-15 13:21:14.238617110 -0400
-@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
+diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
+index 809baaa..e3892a3 100644
+--- a/arch/x86/mm/numa_32.c
++++ b/arch/x86/mm/numa_32.c
+@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,
  }
  #endif
  
@@ -18476,74 +19549,131 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/numa_32.c linux-2.6.32.13/arch/x86/mm/num
  extern unsigned long highend_pfn, highstart_pfn;
  
  #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
-diff -urNp linux-2.6.32.13/arch/x86/mm/pageattr.c linux-2.6.32.13/arch/x86/mm/pageattr.c
---- linux-2.6.32.13/arch/x86/mm/pageattr.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/pageattr.c	2010-05-15 13:21:14.238617110 -0400
-@@ -268,9 +268,10 @@ static inline pgprot_t static_protection
+diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
+index e1d1069..2251ff3 100644
+--- a/arch/x86/mm/pageattr-test.c
++++ b/arch/x86/mm/pageattr-test.c
+@@ -36,7 +36,7 @@ enum {
+ 
+ static int pte_testbit(pte_t pte)
+ {
+-	return pte_flags(pte) & _PAGE_UNUSED1;
++	return pte_flags(pte) & _PAGE_CPA_TEST;
+ }
+ 
+ struct split_state {
+diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
+index 532e793..8cddbe9 100644
+--- a/arch/x86/mm/pageattr.c
++++ b/arch/x86/mm/pageattr.c
+@@ -261,16 +261,17 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
+ 	 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
+ 	 */
+ 	if (within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
+-		pgprot_val(forbidden) |= _PAGE_NX;
++		pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
+ 
+ 	/*
+ 	 * The kernel text needs to be executable for obvious reasons
  	 * Does not cover __inittext since that is gone later on. On
  	 * 64bit we do not enforce !NX on the low mapping
  	 */
 -	if (within(address, (unsigned long)_text, (unsigned long)_etext))
+-		pgprot_val(forbidden) |= _PAGE_NX;
 +	if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
- 		pgprot_val(forbidden) |= _PAGE_NX;
++		pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
  
 +#ifdef CONFIG_DEBUG_RODATA
  	/*
  	 * The .rodata section needs to be read-only. Using the pfn
  	 * catches all aliases.
-@@ -278,6 +279,7 @@ static inline pgprot_t static_protection
+@@ -278,6 +279,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
  	if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
  		   __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
  		pgprot_val(forbidden) |= _PAGE_RW;
 +#endif
  
+ #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
+ 	/*
+@@ -316,6 +318,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
+ 	}
+ #endif
+ 
++#ifdef CONFIG_PAX_KERNEXEC
++	if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
++		pgprot_val(forbidden) |= _PAGE_RW;
++		pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
++	}
++#endif
++
  	prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
  
-@@ -331,7 +333,10 @@ EXPORT_SYMBOL_GPL(lookup_address);
+ 	return prot;
+@@ -368,23 +377,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
  static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
  {
  	/* change init_mm */
 +	pax_open_kernel();
  	set_pte_atomic(kpte, pte);
-+	pax_close_kernel();
 +
  #ifdef CONFIG_X86_32
  	if (!SHARED_KERNEL_PMD) {
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++		unsigned long cpu;
++#else
  		struct page *page;
-diff -urNp linux-2.6.32.13/arch/x86/mm/pageattr-test.c linux-2.6.32.13/arch/x86/mm/pageattr-test.c
---- linux-2.6.32.13/arch/x86/mm/pageattr-test.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/pageattr-test.c	2010-05-15 13:21:14.238617110 -0400
-@@ -36,7 +36,7 @@ enum {
- 
- static int pte_testbit(pte_t pte)
- {
--	return pte_flags(pte) & _PAGE_UNUSED1;
-+	return pte_flags(pte) & _PAGE_CPA_TEST;
- }
++#endif
  
- struct split_state {
-diff -urNp linux-2.6.32.13/arch/x86/mm/pat.c linux-2.6.32.13/arch/x86/mm/pat.c
---- linux-2.6.32.13/arch/x86/mm/pat.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/pat.c	2010-05-15 13:21:14.258921790 -0400
-@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
++#ifdef CONFIG_PAX_PER_CPU_PGD
++		for (cpu = 0; cpu < NR_CPUS; ++cpu) {
++			pgd_t *pgd = get_cpu_pgd(cpu);
++#else
+ 		list_for_each_entry(page, &pgd_list, lru) {
+-			pgd_t *pgd;
++			pgd_t *pgd = (pgd_t *)page_address(page);
++#endif
++
+ 			pud_t *pud;
+ 			pmd_t *pmd;
  
-  conflict:
- 	printk(KERN_INFO "%s:%d conflicting memory types "
--	       "%Lx-%Lx %s<->%s\n", current->comm, current->pid, new->start,
-+	       "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), new->start,
- 	       new->end, cattr_name(new->type), cattr_name(entry->type));
- 	return -EBUSY;
+-			pgd = (pgd_t *)page_address(page) + pgd_index(address);
++			pgd += pgd_index(address);
+ 			pud = pud_offset(pgd, address);
+ 			pmd = pmd_offset(pud, address);
+ 			set_pte_atomic((pte_t *)pmd, pte);
+ 		}
+ 	}
+ #endif
++	pax_close_kernel();
  }
-@@ -559,7 +559,7 @@ unlock_ret:
  
- 	if (err) {
+ static int
+diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
+index 64121a1..bfb36ea 100644
+--- a/arch/x86/mm/pat.c
++++ b/arch/x86/mm/pat.c
+@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
+ 
+ 	if (!entry) {
  		printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
 -			current->comm, current->pid, start, end);
 +			current->comm, task_pid_nr(current), start, end);
+ 		return -EINVAL;
  	}
  
- 	dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end);
-@@ -755,7 +755,7 @@ int kernel_map_sync_memtype(u64 base, un
+@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
+ 	while (cursor < to) {
+ 		if (!devmem_is_allowed(pfn)) {
+ 			printk(KERN_INFO
+-		"Program %s tried to access /dev/mem between %Lx->%Lx.\n",
+-				current->comm, from, to);
++		"Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n",
++				current->comm, from, to, cursor);
+ 			return 0;
+ 		}
+ 		cursor += PAGE_SIZE;
+@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
  		printk(KERN_INFO
  			"%s:%d ioremap_change_attr failed %s "
  			"for %Lx-%Lx\n",
@@ -18552,7 +19682,16 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pat.c linux-2.6.32.13/arch/x86/mm/pat.c
  			cattr_name(flags),
  			base, (unsigned long long)(base + size));
  		return -EINVAL;
-@@ -813,7 +813,7 @@ static int reserve_pfn_range(u64 paddr, 
+@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
+ 		if (want_flags != flags) {
+ 			printk(KERN_WARNING
+ 			"%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n",
+-				current->comm, current->pid,
++				current->comm, task_pid_nr(current),
+ 				cattr_name(want_flags),
+ 				(unsigned long long)paddr,
+ 				(unsigned long long)(paddr + size),
+@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
  			free_memtype(paddr, paddr + size);
  			printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
  				" for %Lx-%Lx, got %s\n",
@@ -18561,47 +19700,24 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pat.c linux-2.6.32.13/arch/x86/mm/pat.c
  				cattr_name(want_flags),
  				(unsigned long long)paddr,
  				(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable_32.c linux-2.6.32.13/arch/x86/mm/pgtable_32.c
---- linux-2.6.32.13/arch/x86/mm/pgtable_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/pgtable_32.c	2010-05-15 13:21:14.258921790 -0400
-@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 
- 		return;
- 	}
- 	pte = pte_offset_kernel(pmd, vaddr);
-+
-+	pax_open_kernel();
- 	if (pte_val(pteval))
- 		set_pte_at(&init_mm, vaddr, pte, pteval);
- 	else
- 		pte_clear(&init_mm, vaddr, pte);
-+	pax_close_kernel();
- 
- 	/*
- 	 * It's enough to flush this one mapping.
-diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgtable.c
---- linux-2.6.32.13/arch/x86/mm/pgtable.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/pgtable.c	2010-05-15 13:21:14.258921790 -0400
-@@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather *
- #if PAGETABLE_LEVELS > 3
- void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud)
- {
-+
-+#ifndef CONFIG_PAX_PER_CPU_PGD
- 	paravirt_release_pud(__pa(pud) >> PAGE_SHIFT);
- 	tlb_remove_page(tlb, virt_to_page(pud));
-+#endif
-+
- }
- #endif	/* PAGETABLE_LEVELS > 3 */
- #endif	/* PAGETABLE_LEVELS > 2 */
-@@ -83,8 +87,62 @@ static inline void pgd_list_del(pgd_t *p
+diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
+index 5c4ee42..9ff06a5 100644
+--- a/arch/x86/mm/pgtable.c
++++ b/arch/x86/mm/pgtable.c
+@@ -84,8 +84,58 @@ static inline void pgd_list_del(pgd_t *pgd)
  	list_del(&page->lru);
  }
  
 -#define UNSHARED_PTRS_PER_PGD				\
 -	(SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+pteval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
++pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
++
++void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
++{
++	while (count--)
++		*dst++ = __pgd((pgd_val(*src++) | _PAGE_NX) & ~_PAGE_USER);
++}
 +#endif
 +
 +#ifdef CONFIG_PAX_PER_CPU_PGD
@@ -18616,16 +19732,6 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgt
 +#endif
 +
 +}
-+
-+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
-+{
-+
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+	while (count--)
-+		*dst++ = __pgd((pgd_val(*src++) | _PAGE_NX) & ~_PAGE_USER);
-+#endif
-+
-+}
 +#endif
 +
 +#ifdef CONFIG_PAX_PER_CPU_PGD
@@ -18659,7 +19765,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgt
  
  static void pgd_ctor(pgd_t *pgd)
  {
-@@ -119,6 +177,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -120,6 +170,7 @@ static void pgd_dtor(pgd_t *pgd)
  	pgd_list_del(pgd);
  	spin_unlock_irqrestore(&pgd_lock, flags);
  }
@@ -18667,7 +19773,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgt
  
  /*
   * List of all pgd's needed for non-PAE so it can invalidate entries
-@@ -131,7 +190,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -132,7 +183,7 @@ static void pgd_dtor(pgd_t *pgd)
   * -- wli
   */
  
@@ -18676,7 +19782,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgt
  /*
   * In PAE mode, we need to do a cr3 reload (=tlb flush) when
   * updating the top-level pagetable entries to guarantee the
-@@ -143,7 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -144,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd)
   * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
   * and initialize the kernel pmds here.
   */
@@ -18685,7 +19791,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgt
  
  void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
  {
-@@ -162,36 +221,38 @@ void pud_populate(struct mm_struct *mm, 
+@@ -163,36 +214,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
  	if (mm == current->active_mm)
  		write_cr3(read_cr3());
  }
@@ -18735,7 +19841,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgt
  		return -ENOMEM;
  	}
  
-@@ -204,51 +265,56 @@ static int preallocate_pmds(pmd_t *pmds[
+@@ -205,51 +258,56 @@ static int preallocate_pmds(pmd_t *pmds[])
   * preallocate which never got a corresponding vma will need to be
   * freed manually.
   */
@@ -18809,7 +19915,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgt
  	unsigned long flags;
  
  	pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
-@@ -258,11 +324,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -259,11 +317,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  
  	mm->pgd = pgd;
  
@@ -18823,7 +19929,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgt
  
  	/*
  	 * Make sure that pre-populating the pmds is atomic with
-@@ -272,14 +338,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -273,14 +331,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  	spin_lock_irqsave(&pgd_lock, flags);
  
  	pgd_ctor(pgd);
@@ -18841,7 +19947,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgt
  out_free_pgd:
  	free_page((unsigned long)pgd);
  out:
-@@ -288,7 +354,7 @@ out:
+@@ -289,7 +347,7 @@ out:
  
  void pgd_free(struct mm_struct *mm, pgd_t *pgd)
  {
@@ -18850,78 +19956,62 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgt
  	pgd_dtor(pgd);
  	paravirt_pgd_free(mm, pgd);
  	free_page((unsigned long)pgd);
-diff -urNp linux-2.6.32.13/arch/x86/mm/setup_nx.c linux-2.6.32.13/arch/x86/mm/setup_nx.c
---- linux-2.6.32.13/arch/x86/mm/setup_nx.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/setup_nx.c	2010-05-15 13:21:14.258921790 -0400
-@@ -4,11 +4,10 @@
+diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
+index cac7184..09a39fa 100644
+--- a/arch/x86/mm/pgtable_32.c
++++ b/arch/x86/mm/pgtable_32.c
+@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
+ 		return;
+ 	}
+ 	pte = pte_offset_kernel(pmd, vaddr);
++
++	pax_open_kernel();
+ 	if (pte_val(pteval))
+ 		set_pte_at(&init_mm, vaddr, pte, pteval);
+ 	else
+ 		pte_clear(&init_mm, vaddr, pte);
++	pax_close_kernel();
  
+ 	/*
+ 	 * It's enough to flush this one mapping.
+diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
+index a3250aa..fbe9129 100644
+--- a/arch/x86/mm/setup_nx.c
++++ b/arch/x86/mm/setup_nx.c
+@@ -5,8 +5,10 @@
  #include <asm/pgtable.h>
+ #include <asm/proto.h>
  
-+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
- int nx_enabled;
++#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
+ static int disable_nx __cpuinitdata;
  
--#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
--static int disable_nx __cpuinitdata;
--
 +#ifndef CONFIG_PAX_PAGEEXEC
  /*
   * noexec = on|off
   *
-@@ -22,32 +21,26 @@ static int __init noexec_setup(char *str
- 	if (!str)
- 		return -EINVAL;
- 	if (!strncmp(str, "on", 2)) {
--		__supported_pte_mask |= _PAGE_NX;
--		disable_nx = 0;
-+		nx_enabled = 1;
- 	} else if (!strncmp(str, "off", 3)) {
--		disable_nx = 1;
--		__supported_pte_mask &= ~_PAGE_NX;
-+		nx_enabled = 0;
- 	}
+@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
  	return 0;
  }
  early_param("noexec", noexec_setup);
- #endif
++#endif
++
 +#endif
  
- #ifdef CONFIG_X86_PAE
- void __init set_nx(void)
+ void __cpuinit x86_configure_nx(void)
  {
--	unsigned int v[4], l, h;
-+	if (!nx_enabled && cpu_has_nx) {
-+		unsigned l, h;
- 
--	if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) {
--		cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]);
--
--		if ((v[3] & (1 << 20)) && !disable_nx) {
--			rdmsr(MSR_EFER, l, h);
--			l |= EFER_NX;
--			wrmsr(MSR_EFER, l, h);
--			nx_enabled = 1;
--			__supported_pte_mask |= _PAGE_NX;
--		}
-+		__supported_pte_mask &= ~_PAGE_NX;
-+		rdmsr(MSR_EFER, l, h);
-+		l &= ~EFER_NX;
-+		wrmsr(MSR_EFER, l, h);
- 	}
- }
- #else
-@@ -62,7 +55,7 @@ void __cpuinit check_efer(void)
- 	unsigned long efer;
- 
- 	rdmsrl(MSR_EFER, efer);
--	if (!(efer & EFER_NX) || disable_nx)
-+	if (!(efer & EFER_NX) || !nx_enabled)
++#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
+ 	if (cpu_has_nx && !disable_nx)
+ 		__supported_pte_mask |= _PAGE_NX;
+ 	else
++#endif
  		__supported_pte_mask &= ~_PAGE_NX;
  }
- #endif
-diff -urNp linux-2.6.32.13/arch/x86/mm/tlb.c linux-2.6.32.13/arch/x86/mm/tlb.c
---- linux-2.6.32.13/arch/x86/mm/tlb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/mm/tlb.c	2010-05-15 13:21:14.258921790 -0400
-@@ -12,7 +12,7 @@
+ 
+diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
+index 426f3a1..b42f6da 100644
+--- a/arch/x86/mm/tlb.c
++++ b/arch/x86/mm/tlb.c
+@@ -13,7 +13,7 @@
  #include <asm/uv/uv.h>
  
  DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate)
@@ -18930,7 +20020,7 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/tlb.c linux-2.6.32.13/arch/x86/mm/tlb.c
  
  /*
   *	Smarter SMP flushing macros.
-@@ -61,7 +61,11 @@ void leave_mm(int cpu)
+@@ -62,7 +62,11 @@ void leave_mm(int cpu)
  		BUG();
  	cpumask_clear_cpu(cpu,
  			  mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
@@ -18942,10 +20032,11 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/tlb.c linux-2.6.32.13/arch/x86/mm/tlb.c
  }
  EXPORT_SYMBOL_GPL(leave_mm);
  
-diff -urNp linux-2.6.32.13/arch/x86/oprofile/backtrace.c linux-2.6.32.13/arch/x86/oprofile/backtrace.c
---- linux-2.6.32.13/arch/x86/oprofile/backtrace.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/oprofile/backtrace.c	2010-05-15 13:21:14.258921790 -0400
-@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
+diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
+index 3855096..d03e0ca 100644
+--- a/arch/x86/oprofile/backtrace.c
++++ b/arch/x86/oprofile/backtrace.c
+@@ -58,7 +58,7 @@ static struct frame_head *dump_user_backtrace(struct frame_head *head)
  	struct frame_head bufhead[2];
  
  	/* Also check accessibility of one struct frame_head beyond */
@@ -18954,7 +20045,7 @@ diff -urNp linux-2.6.32.13/arch/x86/oprofile/backtrace.c linux-2.6.32.13/arch/x8
  		return NULL;
  	if (__copy_from_user_inatomic(bufhead, head, sizeof(bufhead)))
  		return NULL;
-@@ -77,7 +77,7 @@ x86_backtrace(struct pt_regs * const reg
+@@ -78,7 +78,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
  {
  	struct frame_head *head = (struct frame_head *)frame_pointer(regs);
  
@@ -18963,10 +20054,11 @@ diff -urNp linux-2.6.32.13/arch/x86/oprofile/backtrace.c linux-2.6.32.13/arch/x8
  		unsigned long stack = kernel_stack_pointer(regs);
  		if (depth)
  			dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c	2010-05-15 13:21:14.270940782 -0400
-@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
+diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
+index 182558d..d5b66f7 100644
+--- a/arch/x86/oprofile/op_model_p4.c
++++ b/arch/x86/oprofile/op_model_p4.c
+@@ -50,7 +50,7 @@ static inline void setup_num_counters(void)
  #endif
  }
  
@@ -18975,10 +20067,11 @@ diff -urNp linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c linux-2.6.32.13/arch/
  {
  #ifdef CONFIG_SMP
  	return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.32.13/arch/x86/pci/common.c linux-2.6.32.13/arch/x86/pci/common.c
---- linux-2.6.32.13/arch/x86/pci/common.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/pci/common.c	2010-05-15 13:21:14.270940782 -0400
-@@ -31,8 +31,8 @@ int noioapicreroute = 1;
+diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
+index 215a27a..fb15590 100644
+--- a/arch/x86/pci/common.c
++++ b/arch/x86/pci/common.c
+@@ -32,8 +32,8 @@ int noioapicreroute = 1;
  int pcibios_last_bus = -1;
  unsigned long pirq_table_addr;
  struct pci_bus *pci_root_bus;
@@ -18989,7 +20082,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/common.c linux-2.6.32.13/arch/x86/pci/co
  
  int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
  						int reg, int len, u32 *val)
-@@ -370,7 +370,7 @@ static const struct dmi_system_id __devi
+@@ -365,7 +365,7 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = {
  			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"),
  		},
  	},
@@ -18998,10 +20091,11 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/common.c linux-2.6.32.13/arch/x86/pci/co
  };
  
  void __init dmi_check_pciprobe(void)
-diff -urNp linux-2.6.32.13/arch/x86/pci/direct.c linux-2.6.32.13/arch/x86/pci/direct.c
---- linux-2.6.32.13/arch/x86/pci/direct.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/pci/direct.c	2010-05-15 13:21:14.270940782 -0400
-@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 
+diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c
+index bd33620..f841b78 100644
+--- a/arch/x86/pci/direct.c
++++ b/arch/x86/pci/direct.c
+@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int seg, unsigned int bus,
  
  #undef PCI_CONF1_ADDRESS
  
@@ -19010,7 +20104,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/direct.c linux-2.6.32.13/arch/x86/pci/di
  	.read =		pci_conf1_read,
  	.write =	pci_conf1_write,
  };
-@@ -173,7 +173,7 @@ static int pci_conf2_write(unsigned int 
+@@ -173,7 +173,7 @@ static int pci_conf2_write(unsigned int seg, unsigned int bus,
  
  #undef PCI_CONF2_ADDRESS
  
@@ -19028,10 +20122,11 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/direct.c linux-2.6.32.13/arch/x86/pci/di
  {
  	u32 x = 0;
  	int year, devfn;
-diff -urNp linux-2.6.32.13/arch/x86/pci/fixup.c linux-2.6.32.13/arch/x86/pci/fixup.c
---- linux-2.6.32.13/arch/x86/pci/fixup.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/pci/fixup.c	2010-05-15 13:21:14.270940782 -0400
-@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
+diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
+index 6dd8955..29b8732 100644
+--- a/arch/x86/pci/fixup.c
++++ b/arch/x86/pci/fixup.c
+@@ -364,7 +364,7 @@ static const struct dmi_system_id __devinitconst msi_k8t_dmi_table[] = {
  			DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
  		},
  	},
@@ -19040,7 +20135,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/fixup.c linux-2.6.32.13/arch/x86/pci/fix
  };
  
  /*
-@@ -435,7 +435,7 @@ static const struct dmi_system_id __devi
+@@ -435,7 +435,7 @@ static const struct dmi_system_id __devinitconst toshiba_ohci1394_dmi_table[] =
  			DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"),
  		},
  	},
@@ -19049,10 +20144,11 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/fixup.c linux-2.6.32.13/arch/x86/pci/fix
  };
  
  static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
-diff -urNp linux-2.6.32.13/arch/x86/pci/irq.c linux-2.6.32.13/arch/x86/pci/irq.c
---- linux-2.6.32.13/arch/x86/pci/irq.c	2010-04-29 17:49:37.625451376 -0400
-+++ linux-2.6.32.13/arch/x86/pci/irq.c	2010-05-15 13:21:14.270940782 -0400
-@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
+diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
+index 9810a0f..b021186 100644
+--- a/arch/x86/pci/irq.c
++++ b/arch/x86/pci/irq.c
+@@ -542,7 +542,7 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
  	static struct pci_device_id __initdata pirq_440gx[] = {
  		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
  		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_2) },
@@ -19061,7 +20157,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/irq.c linux-2.6.32.13/arch/x86/pci/irq.c
  	};
  
  	/* 440GX has a proprietary PIRQ router -- don't use it */
-@@ -1109,7 +1109,7 @@ static struct dmi_system_id __initdata p
+@@ -1113,7 +1113,7 @@ static struct dmi_system_id __initdata pciirq_dmi_table[] = {
  			DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
  		},
  	},
@@ -19069,11 +20165,12 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/irq.c linux-2.6.32.13/arch/x86/pci/irq.c
 +	{ NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL }
  };
  
- int __init pcibios_irq_init(void)
-diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_32.c linux-2.6.32.13/arch/x86/pci/mmconfig_32.c
---- linux-2.6.32.13/arch/x86/pci/mmconfig_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/pci/mmconfig_32.c	2010-05-15 13:21:14.270940782 -0400
-@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int 
+ void __init pcibios_irq_init(void)
+diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
+index a3d9c54..5372e86 100644
+--- a/arch/x86/pci/mmconfig_32.c
++++ b/arch/x86/pci/mmconfig_32.c
+@@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
  	return 0;
  }
  
@@ -19082,10 +20179,11 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_32.c linux-2.6.32.13/arch/x86/p
  	.read =		pci_mmcfg_read,
  	.write =	pci_mmcfg_write,
  };
-diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_64.c linux-2.6.32.13/arch/x86/pci/mmconfig_64.c
---- linux-2.6.32.13/arch/x86/pci/mmconfig_64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/pci/mmconfig_64.c	2010-05-15 13:21:14.270940782 -0400
-@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int 
+diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c
+index e783841..915a493 100644
+--- a/arch/x86/pci/mmconfig_64.c
++++ b/arch/x86/pci/mmconfig_64.c
+@@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
  	return 0;
  }
  
@@ -19094,10 +20192,11 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_64.c linux-2.6.32.13/arch/x86/p
  	.read =		pci_mmcfg_read,
  	.write =	pci_mmcfg_write,
  };
-diff -urNp linux-2.6.32.13/arch/x86/pci/numaq_32.c linux-2.6.32.13/arch/x86/pci/numaq_32.c
---- linux-2.6.32.13/arch/x86/pci/numaq_32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/pci/numaq_32.c	2010-05-15 13:21:14.270940782 -0400
-@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
+diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c
+index 5c9e245..d743b10 100644
+--- a/arch/x86/pci/numaq_32.c
++++ b/arch/x86/pci/numaq_32.c
+@@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned int seg, unsigned int bus,
  
  #undef PCI_CONF1_MQ_ADDRESS
  
@@ -19106,10 +20205,11 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/numaq_32.c linux-2.6.32.13/arch/x86/pci/
  	.read	= pci_conf1_mq_read,
  	.write	= pci_conf1_mq_write
  };
-diff -urNp linux-2.6.32.13/arch/x86/pci/olpc.c linux-2.6.32.13/arch/x86/pci/olpc.c
---- linux-2.6.32.13/arch/x86/pci/olpc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/pci/olpc.c	2010-05-15 13:21:14.270940782 -0400
-@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
+diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c
+index b348154..883dd22 100644
+--- a/arch/x86/pci/olpc.c
++++ b/arch/x86/pci/olpc.c
+@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int seg, unsigned int bus,
  	return 0;
  }
  
@@ -19118,10 +20218,11 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/olpc.c linux-2.6.32.13/arch/x86/pci/olpc
  	.read =	pci_olpc_read,
  	.write = pci_olpc_write,
  };
-diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pcbios.c
---- linux-2.6.32.13/arch/x86/pci/pcbios.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/pci/pcbios.c	2010-05-15 13:21:14.274578804 -0400
-@@ -56,50 +56,93 @@ union bios32 {
+diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
+index 2492d16..78a4d7e 100644
+--- a/arch/x86/pci/pcbios.c
++++ b/arch/x86/pci/pcbios.c
+@@ -57,50 +57,93 @@ union bios32 {
  static struct {
  	unsigned long address;
  	unsigned short segment;
@@ -19229,7 +20330,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  
  static int __devinit check_pcibios(void)
  {
-@@ -108,11 +151,13 @@ static int __devinit check_pcibios(void)
+@@ -109,11 +152,13 @@ static int __devinit check_pcibios(void)
  	unsigned long flags, pcibios_entry;
  
  	if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
@@ -19246,7 +20347,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -121,7 +166,8 @@ static int __devinit check_pcibios(void)
+@@ -122,7 +167,8 @@ static int __devinit check_pcibios(void)
  			  "=b" (ebx),
  			  "=c" (ecx)
  			: "1" (PCIBIOS_PCI_BIOS_PRESENT),
@@ -19256,7 +20357,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  			: "memory");
  		local_irq_restore(flags);
  
-@@ -165,7 +211,10 @@ static int pci_bios_read(unsigned int se
+@@ -166,7 +212,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
  
  	switch (len) {
  	case 1:
@@ -19268,7 +20369,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -174,7 +223,8 @@ static int pci_bios_read(unsigned int se
+@@ -175,7 +224,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
  			: "1" (PCIBIOS_READ_CONFIG_BYTE),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -19278,7 +20379,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  		/*
  		 * Zero-extend the result beyond 8 bits, do not trust the
  		 * BIOS having done it:
-@@ -182,7 +232,10 @@ static int pci_bios_read(unsigned int se
+@@ -183,7 +233,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
  		*value &= 0xff;
  		break;
  	case 2:
@@ -19290,7 +20391,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -191,7 +244,8 @@ static int pci_bios_read(unsigned int se
+@@ -192,7 +245,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
  			: "1" (PCIBIOS_READ_CONFIG_WORD),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -19300,7 +20401,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  		/*
  		 * Zero-extend the result beyond 16 bits, do not trust the
  		 * BIOS having done it:
-@@ -199,7 +253,10 @@ static int pci_bios_read(unsigned int se
+@@ -200,7 +254,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
  		*value &= 0xffff;
  		break;
  	case 4:
@@ -19312,7 +20413,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -208,7 +265,8 @@ static int pci_bios_read(unsigned int se
+@@ -209,7 +266,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
  			: "1" (PCIBIOS_READ_CONFIG_DWORD),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -19322,7 +20423,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  		break;
  	}
  
-@@ -231,7 +289,10 @@ static int pci_bios_write(unsigned int s
+@@ -232,7 +290,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
  
  	switch (len) {
  	case 1:
@@ -19334,7 +20435,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -240,10 +301,14 @@ static int pci_bios_write(unsigned int s
+@@ -241,10 +302,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
  			  "c" (value),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -19351,7 +20452,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -252,10 +317,14 @@ static int pci_bios_write(unsigned int s
+@@ -253,10 +318,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
  			  "c" (value),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -19368,7 +20469,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -264,7 +333,8 @@ static int pci_bios_write(unsigned int s
+@@ -265,7 +334,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
  			  "c" (value),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -19378,7 +20479,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  		break;
  	}
  
-@@ -278,7 +348,7 @@ static int pci_bios_write(unsigned int s
+@@ -279,7 +349,7 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
   * Function table for BIOS32 access
   */
  
@@ -19387,7 +20488,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  	.read =		pci_bios_read,
  	.write =	pci_bios_write
  };
-@@ -287,7 +357,7 @@ static struct pci_raw_ops pci_bios_acces
+@@ -288,7 +358,7 @@ static struct pci_raw_ops pci_bios_access = {
   * Try to find PCI BIOS.
   */
  
@@ -19396,7 +20497,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  {
  	union bios32 *check;
  	unsigned char sum;
-@@ -368,10 +438,13 @@ struct irq_routing_table * pcibios_get_i
+@@ -369,10 +439,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
  
  	DBG("PCI: Fetching IRQ routing table... ");
  	__asm__("push %%es\n\t"
@@ -19411,7 +20512,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  		"jc 1f\n\t"
  		"xor %%ah, %%ah\n"
  		"1:"
-@@ -382,7 +455,8 @@ struct irq_routing_table * pcibios_get_i
+@@ -383,7 +456,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
  		  "1" (0),
  		  "D" ((long) &opt),
  		  "S" (&pci_indirect),
@@ -19421,7 +20522,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  		: "memory");
  	DBG("OK  ret=%d, size=%d, map=%x\n", ret, opt.size, map);
  	if (ret & 0xff00)
-@@ -406,7 +480,10 @@ int pcibios_set_irq_routing(struct pci_d
+@@ -407,7 +481,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
  {
  	int ret;
  
@@ -19433,7 +20534,7 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  		"jc 1f\n\t"
  		"xor %%ah, %%ah\n"
  		"1:"
-@@ -414,7 +491,8 @@ int pcibios_set_irq_routing(struct pci_d
+@@ -415,7 +492,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
  		: "0" (PCIBIOS_SET_PCI_HW_INT),
  		  "b" ((dev->bus->number << 8) | dev->devfn),
  		  "c" ((irq << 8) | (pin + 10)),
@@ -19443,10 +20544,11 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc
  	return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.32.13/arch/x86/power/cpu.c linux-2.6.32.13/arch/x86/power/cpu.c
---- linux-2.6.32.13/arch/x86/power/cpu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/power/cpu.c	2010-05-15 13:21:14.274578804 -0400
-@@ -126,7 +126,7 @@ static void do_fpu_end(void)
+diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
+index 9c57cb1..e2731ff 100644
+--- a/arch/x86/power/cpu.c
++++ b/arch/x86/power/cpu.c
+@@ -130,7 +130,7 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
  	int cpu = smp_processor_id();
@@ -19455,7 +20557,7 @@ diff -urNp linux-2.6.32.13/arch/x86/power/cpu.c linux-2.6.32.13/arch/x86/power/c
  
  	set_tss_desc(cpu, t);	/*
  				 * This just modifies memory; should not be
-@@ -136,7 +136,9 @@ static void fix_processor_context(void)
+@@ -140,7 +140,9 @@ static void fix_processor_context(void)
  				 */
  
  #ifdef CONFIG_X86_64
@@ -19465,9 +20567,10 @@ diff -urNp linux-2.6.32.13/arch/x86/power/cpu.c linux-2.6.32.13/arch/x86/power/c
  
  	syscall_init();				/* This sets MSR_*STAR and related */
  #endif
-diff -urNp linux-2.6.32.13/arch/x86/vdso/Makefile linux-2.6.32.13/arch/x86/vdso/Makefile
---- linux-2.6.32.13/arch/x86/vdso/Makefile	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/vdso/Makefile	2010-05-15 13:21:14.274578804 -0400
+diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
+index 6b4ffed..f55f243 100644
+--- a/arch/x86/vdso/Makefile
++++ b/arch/x86/vdso/Makefile
 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO    $@
  		       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
  		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -19477,9 +20580,10 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/Makefile linux-2.6.32.13/arch/x86/vdso/
  GCOV_PROFILE := n
  
  #
-diff -urNp linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c	2010-05-15 13:21:14.274578804 -0400
+diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
+index ee55754..0013b2e 100644
+--- a/arch/x86/vdso/vclock_gettime.c
++++ b/arch/x86/vdso/vclock_gettime.c
 @@ -22,24 +22,48 @@
  #include <asm/hpet.h>
  #include <asm/unistd.h>
@@ -19533,7 +20637,7 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c linux-2.6.32.13/arch/x
  	return (v * gtod->clock.mult) >> gtod->clock.shift;
  }
  
-@@ -113,7 +137,9 @@ notrace static noinline int do_monotonic
+@@ -113,7 +137,9 @@ notrace static noinline int do_monotonic_coarse(struct timespec *ts)
  
  notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
  {
@@ -19544,7 +20648,7 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c linux-2.6.32.13/arch/x
  		switch (clock) {
  		case CLOCK_REALTIME:
  			if (likely(gtod->clock.vread))
-@@ -133,10 +159,20 @@ notrace int __vdso_clock_gettime(clockid
+@@ -133,10 +159,20 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
  int clock_gettime(clockid_t, struct timespec *)
  	__attribute__((weak, alias("__vdso_clock_gettime")));
  
@@ -19567,7 +20671,7 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c linux-2.6.32.13/arch/x
  		if (likely(tv != NULL)) {
  			BUILD_BUG_ON(offsetof(struct timeval, tv_usec) !=
  				     offsetof(struct timespec, tv_nsec) ||
-@@ -151,9 +187,7 @@ notrace int __vdso_gettimeofday(struct t
+@@ -151,9 +187,7 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
  		}
  		return 0;
  	}
@@ -19578,9 +20682,24 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c linux-2.6.32.13/arch/x
  }
  int gettimeofday(struct timeval *, struct timezone *)
  	__attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c	2010-05-15 13:21:14.274578804 -0400
+diff --git a/arch/x86/vdso/vdso.lds.S b/arch/x86/vdso/vdso.lds.S
+index 4e5dd3b..00ba15e 100644
+--- a/arch/x86/vdso/vdso.lds.S
++++ b/arch/x86/vdso/vdso.lds.S
+@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
+ #define VEXTERN(x)	VDSO64_ ## x = vdso_ ## x;
+ #include "vextern.h"
+ #undef	VEXTERN
++
++#define VEXTERN(x)	VDSO64_ ## x = __vdso_ ## x;
++VEXTERN(fallback_gettimeofday)
++VEXTERN(fallback_time)
++VEXTERN(getcpu)
++#undef	VEXTERN
+diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
+index 02b442e..72f18fe 100644
+--- a/arch/x86/vdso/vdso32-setup.c
++++ b/arch/x86/vdso/vdso32-setup.c
 @@ -25,6 +25,7 @@
  #include <asm/tlbflush.h>
  #include <asm/vdso.h>
@@ -19589,7 +20708,7 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c linux-2.6.32.13/arch/x86
  
  enum {
  	VDSO_DISABLED = 0,
-@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int m
+@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
  void enable_sep_cpu(void)
  {
  	int cpu = get_cpu();
@@ -19607,7 +20726,7 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c linux-2.6.32.13/arch/x86
  	/*
  	 * Make sure the vDSO gets into every core dump.
  	 * Dumping its contents makes post-mortem fully interpretable later
-@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct l
+@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
  	if (compat)
  		addr = VDSO_HIGH_BASE;
  	else {
@@ -19624,7 +20743,7 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c linux-2.6.32.13/arch/x86
  
  	if (compat_uses_vma || !compat) {
  		/*
-@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct l
+@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
  	}
  
  	current_thread_info()->sysenter_return =
@@ -19638,25 +20757,7 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c linux-2.6.32.13/arch/x86
  
  	up_write(&mm->mmap_sem);
  
-@@ -388,7 +389,7 @@ static ctl_table abi_table2[] = {
- 		.mode		= 0644,
- 		.proc_handler	= proc_dointvec
- 	},
--	{}
-+	{ 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL }
- };
- 
- static ctl_table abi_root_table2[] = {
-@@ -398,7 +399,7 @@ static ctl_table abi_root_table2[] = {
- 		.mode = 0555,
- 		.child = abi_table2
- 	},
--	{}
-+	{ 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL }
- };
- 
- static __init int ia32_binfmt_init(void)
-@@ -413,8 +414,14 @@ __initcall(ia32_binfmt_init);
+@@ -412,8 +413,14 @@ __initcall(ia32_binfmt_init);
  
  const char *arch_vma_name(struct vm_area_struct *vma)
  {
@@ -19672,7 +20773,7 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c linux-2.6.32.13/arch/x86
  	return NULL;
  }
  
-@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(stru
+@@ -422,7 +429,7 @@ struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
  	struct mm_struct *mm = tsk->mm;
  
  	/* Check to see if this task was created in compat vdso mode */
@@ -19681,22 +20782,10 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c linux-2.6.32.13/arch/x86
  		return &gate_vma;
  	return NULL;
  }
-diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso.lds.S linux-2.6.32.13/arch/x86/vdso/vdso.lds.S
---- linux-2.6.32.13/arch/x86/vdso/vdso.lds.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/vdso/vdso.lds.S	2010-05-15 13:21:14.274578804 -0400
-@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
- #define VEXTERN(x)	VDSO64_ ## x = vdso_ ## x;
- #include "vextern.h"
- #undef	VEXTERN
-+
-+#define VEXTERN(x)	VDSO64_ ## x = __vdso_ ## x;
-+VEXTERN(fallback_gettimeofday)
-+VEXTERN(fallback_time)
-+VEXTERN(getcpu)
-+#undef	VEXTERN
-diff -urNp linux-2.6.32.13/arch/x86/vdso/vextern.h linux-2.6.32.13/arch/x86/vdso/vextern.h
---- linux-2.6.32.13/arch/x86/vdso/vextern.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/vdso/vextern.h	2010-05-15 13:21:14.274578804 -0400
+diff --git a/arch/x86/vdso/vextern.h b/arch/x86/vdso/vextern.h
+index 1683ba2..48d07f3 100644
+--- a/arch/x86/vdso/vextern.h
++++ b/arch/x86/vdso/vextern.h
 @@ -11,6 +11,5 @@
     put into vextern.h and be referenced as a pointer with vdso prefix.
     The main kernel later fills in the values.   */
@@ -19704,10 +20793,11 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vextern.h linux-2.6.32.13/arch/x86/vdso
 -VEXTERN(jiffies)
  VEXTERN(vgetcpu_mode)
  VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.32.13/arch/x86/vdso/vma.c linux-2.6.32.13/arch/x86/vdso/vma.c
---- linux-2.6.32.13/arch/x86/vdso/vma.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/vdso/vma.c	2010-05-15 13:21:14.274578804 -0400
-@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
+diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
+index ac74869..fe8ff73 100644
+--- a/arch/x86/vdso/vma.c
++++ b/arch/x86/vdso/vma.c
+@@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
  	if (!vbase)
  		goto oom;
  
@@ -19716,7 +20806,7 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vma.c linux-2.6.32.13/arch/x86/vdso/vma
  		printk("VDSO: I'm broken; not ELF\n");
  		vdso_enabled = 0;
  	}
-@@ -66,6 +66,7 @@ static int __init init_vdso_vars(void)
+@@ -67,6 +67,7 @@ static int __init init_vdso_vars(void)
  	*(typeof(__ ## x) **) var_ref(VDSO64_SYMBOL(vbase, x), #x) = &__ ## x;
  #include "vextern.h"
  #undef VEXTERN
@@ -19724,7 +20814,7 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vma.c linux-2.6.32.13/arch/x86/vdso/vma
  	return 0;
  
   oom:
-@@ -116,7 +117,7 @@ int arch_setup_additional_pages(struct l
+@@ -117,7 +118,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
  		goto up_fail;
  	}
  
@@ -19733,7 +20823,7 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vma.c linux-2.6.32.13/arch/x86/vdso/vma
  
  	ret = install_special_mapping(mm, addr, vdso_size,
  				      VM_READ|VM_EXEC|
-@@ -124,7 +125,7 @@ int arch_setup_additional_pages(struct l
+@@ -125,7 +126,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
  				      VM_ALWAYSDUMP,
  				      vdso_pages);
  	if (ret) {
@@ -19742,7 +20832,7 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vma.c linux-2.6.32.13/arch/x86/vdso/vma
  		goto up_fail;
  	}
  
-@@ -132,10 +133,3 @@ up_fail:
+@@ -133,10 +134,3 @@ up_fail:
  	up_write(&mm->mmap_sem);
  	return ret;
  }
@@ -19753,10 +20843,11 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vma.c linux-2.6.32.13/arch/x86/vdso/vma
 -	return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen/enlighten.c
---- linux-2.6.32.13/arch/x86/xen/enlighten.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/xen/enlighten.c	2010-05-15 13:23:38.934774262 -0400
-@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
+diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
+index 25d787c..54e84e1 100644
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -74,8 +74,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
  
@@ -19765,7 +20856,7 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen
  /*
   * Point at some empty memory to start with. We map the real shared_info
   * page as soon as fixmap is up and running.
-@@ -548,7 +546,7 @@ static void xen_write_idt_entry(gate_des
+@@ -551,7 +549,7 @@ static void xen_write_idt_entry(gate_desc *dt, int entrynum, const gate_desc *g)
  
  	preempt_disable();
  
@@ -19774,24 +20865,26 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen
  	end = start + __get_cpu_var(idt_desc).size + 1;
  
  	xen_mc_flush();
-@@ -1102,6 +1100,16 @@ asmlinkage void __init xen_start_kernel(
- #ifdef CONFIG_X86_64
+@@ -1099,7 +1097,17 @@ asmlinkage void __init xen_start_kernel(void)
+ 	__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
+ 
  	/* Work out if we support NX */
- 	check_efer();
-+#elif defined(CONFIG_X86_PAE)
-+	if (cpu_has_nx) {
+-	x86_configure_nx();
++#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
++	if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
++	    (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
 +		unsigned l, h;
 +
-+		nx_enabled = 1;
 +		__supported_pte_mask |= _PAGE_NX;
 +		rdmsr(MSR_EFER, l, h);
 +		l |= EFER_NX;
 +		wrmsr(MSR_EFER, l, h);
 +	}
- #endif
++#endif
  
  	xen_setup_features();
-@@ -1133,13 +1141,6 @@ asmlinkage void __init xen_start_kernel(
+ 
+@@ -1130,13 +1138,6 @@ asmlinkage void __init xen_start_kernel(void)
  
  	machine_ops = xen_machine_ops;
  
@@ -19805,10 +20898,11 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen
  	xen_smp_init();
  
  	pgd = (pgd_t *)xen_start_info->pt_base;
-diff -urNp linux-2.6.32.13/arch/x86/xen/mmu.c linux-2.6.32.13/arch/x86/xen/mmu.c
---- linux-2.6.32.13/arch/x86/xen/mmu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/xen/mmu.c	2010-05-15 13:21:14.282910849 -0400
-@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
+diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
+index 914f046..8965503 100644
+--- a/arch/x86/xen/mmu.c
++++ b/arch/x86/xen/mmu.c
+@@ -1694,6 +1694,8 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
  	convert_pfn_mfn(init_level4_pgt);
  	convert_pfn_mfn(level3_ident_pgt);
  	convert_pfn_mfn(level3_kernel_pgt);
@@ -19817,7 +20911,7 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/mmu.c linux-2.6.32.13/arch/x86/xen/mmu.c
  
  	l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
  	l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
-@@ -1729,7 +1731,10 @@ __init pgd_t *xen_setup_kernel_pagetable
+@@ -1712,7 +1714,10 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
  	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);
@@ -19828,10 +20922,11 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/mmu.c linux-2.6.32.13/arch/x86/xen/mmu.c
  	set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
  	set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
  
-diff -urNp linux-2.6.32.13/arch/x86/xen/smp.c linux-2.6.32.13/arch/x86/xen/smp.c
---- linux-2.6.32.13/arch/x86/xen/smp.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/xen/smp.c	2010-05-15 13:21:14.282910849 -0400
-@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
+diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
+index d2dfbf5..40abbbb 100644
+--- a/arch/x86/xen/smp.c
++++ b/arch/x86/xen/smp.c
+@@ -169,11 +169,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
  {
  	BUG_ON(smp_processor_id() != 0);
  	native_smp_prepare_boot_cpu();
@@ -19843,7 +20938,7 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/smp.c linux-2.6.32.13/arch/x86/xen/smp.c
  	xen_setup_vcpu_info_placement();
  }
  
-@@ -231,8 +226,8 @@ cpu_initialize_context(unsigned int cpu,
+@@ -233,8 +228,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
  	gdt = get_cpu_gdt_table(cpu);
  
  	ctxt->flags = VGCF_IN_KERNEL;
@@ -19854,9 +20949,10 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/smp.c linux-2.6.32.13/arch/x86/xen/smp.c
  	ctxt->user_regs.ss = __KERNEL_DS;
  #ifdef CONFIG_X86_32
  	ctxt->user_regs.fs = __KERNEL_PERCPU;
-diff -urNp linux-2.6.32.13/arch/x86/xen/xen-head.S linux-2.6.32.13/arch/x86/xen/xen-head.S
---- linux-2.6.32.13/arch/x86/xen/xen-head.S	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/xen/xen-head.S	2010-05-15 13:21:14.282910849 -0400
+diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
+index 1a5ff24..a187d40 100644
+--- a/arch/x86/xen/xen-head.S
++++ b/arch/x86/xen/xen-head.S
 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
  #ifdef CONFIG_X86_32
  	mov %esi,xen_start_info
@@ -19875,9 +20971,10 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/xen-head.S linux-2.6.32.13/arch/x86/xen/
  #else
  	mov %rsi,xen_start_info
  	mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-2.6.32.13/arch/x86/xen/xen-ops.h linux-2.6.32.13/arch/x86/xen/xen-ops.h
---- linux-2.6.32.13/arch/x86/xen/xen-ops.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/arch/x86/xen/xen-ops.h	2010-05-15 13:21:14.282910849 -0400
+diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
+index f9153a3..51eab3d 100644
+--- a/arch/x86/xen/xen-ops.h
++++ b/arch/x86/xen/xen-ops.h
 @@ -10,8 +10,6 @@
  extern const char xen_hypervisor_callback[];
  extern const char xen_failsafe_callback[];
@@ -19887,22 +20984,11 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/xen-ops.h linux-2.6.32.13/arch/x86/xen/x
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff -urNp linux-2.6.32.13/block/blk-integrity.c linux-2.6.32.13/block/blk-integrity.c
---- linux-2.6.32.13/block/blk-integrity.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/block/blk-integrity.c	2010-05-15 13:21:14.282910849 -0400
-@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
- 	NULL,
- };
- 
--static struct sysfs_ops integrity_ops = {
-+static const struct sysfs_ops integrity_ops = {
- 	.show	= &integrity_attr_show,
- 	.store	= &integrity_attr_store,
- };
-diff -urNp linux-2.6.32.13/block/blk-iopoll.c linux-2.6.32.13/block/blk-iopoll.c
---- linux-2.6.32.13/block/blk-iopoll.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/block/blk-iopoll.c	2010-05-15 13:21:14.282910849 -0400
-@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
+diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
+index 58916af..9cb880b 100644
+--- a/block/blk-iopoll.c
++++ b/block/blk-iopoll.c
+@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
  }
  EXPORT_SYMBOL(blk_iopoll_complete);
  
@@ -19911,10 +20997,11 @@ diff -urNp linux-2.6.32.13/block/blk-iopoll.c linux-2.6.32.13/block/blk-iopoll.c
  {
  	struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
  	int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-2.6.32.13/block/blk-map.c linux-2.6.32.13/block/blk-map.c
---- linux-2.6.32.13/block/blk-map.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/block/blk-map.c	2010-05-15 13:21:14.282910849 -0400
-@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
+diff --git a/block/blk-map.c b/block/blk-map.c
+index 30a7e51..3254ef2 100644
+--- a/block/blk-map.c
++++ b/block/blk-map.c
+@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct request_queue *q, struct request *rq,
  	 * direct dma. else, set up kernel bounce buffers
  	 */
  	uaddr = (unsigned long) ubuf;
@@ -19923,7 +21010,7 @@ diff -urNp linux-2.6.32.13/block/blk-map.c linux-2.6.32.13/block/blk-map.c
  		bio = bio_map_user(q, NULL, uaddr, len, reading, gfp_mask);
  	else
  		bio = bio_copy_user(q, map_data, uaddr, len, reading, gfp_mask);
-@@ -297,7 +297,7 @@ int blk_rq_map_kern(struct request_queue
+@@ -299,7 +299,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
  	if (!len || !kbuf)
  		return -EINVAL;
  
@@ -19932,10 +21019,11 @@ diff -urNp linux-2.6.32.13/block/blk-map.c linux-2.6.32.13/block/blk-map.c
  	if (do_copy)
  		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
  	else
-diff -urNp linux-2.6.32.13/block/blk-softirq.c linux-2.6.32.13/block/blk-softirq.c
---- linux-2.6.32.13/block/blk-softirq.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/block/blk-softirq.c	2010-05-15 13:21:14.282910849 -0400
-@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 
+diff --git a/block/blk-softirq.c b/block/blk-softirq.c
+index ee9c216..58d410a 100644
+--- a/block/blk-softirq.c
++++ b/block/blk-softirq.c
+@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
   * Softirq action handler - move entries to local list and loop over them
   * while passing them to the queue registered handler.
   */
@@ -19944,34 +21032,11 @@ diff -urNp linux-2.6.32.13/block/blk-softirq.c linux-2.6.32.13/block/blk-softirq
  {
  	struct list_head *cpu_list, local_list;
  
-diff -urNp linux-2.6.32.13/block/blk-sysfs.c linux-2.6.32.13/block/blk-sysfs.c
---- linux-2.6.32.13/block/blk-sysfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/block/blk-sysfs.c	2010-05-15 13:21:14.282910849 -0400
-@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
- 	kmem_cache_free(blk_requestq_cachep, q);
- }
- 
--static struct sysfs_ops queue_sysfs_ops = {
-+static const struct sysfs_ops queue_sysfs_ops = {
- 	.show	= queue_attr_show,
- 	.store	= queue_attr_store,
- };
-diff -urNp linux-2.6.32.13/block/elevator.c linux-2.6.32.13/block/elevator.c
---- linux-2.6.32.13/block/elevator.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/block/elevator.c	2010-05-15 13:21:14.282910849 -0400
-@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
- 	return error;
- }
- 
--static struct sysfs_ops elv_sysfs_ops = {
-+static const struct sysfs_ops elv_sysfs_ops = {
- 	.show	= elv_attr_show,
- 	.store	= elv_attr_store,
- };
-diff -urNp linux-2.6.32.13/crypto/lrw.c linux-2.6.32.13/crypto/lrw.c
---- linux-2.6.32.13/crypto/lrw.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/crypto/lrw.c	2010-05-15 13:21:14.282910849 -0400
-@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
+diff --git a/crypto/lrw.c b/crypto/lrw.c
+index 358f80b..31b2333 100644
+--- a/crypto/lrw.c
++++ b/crypto/lrw.c
+@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *parent, const u8 *key,
  	struct priv *ctx = crypto_tfm_ctx(parent);
  	struct crypto_cipher *child = ctx->child;
  	int err, i;
@@ -19980,136 +21045,11 @@ diff -urNp linux-2.6.32.13/crypto/lrw.c linux-2.6.32.13/crypto/lrw.c
  	int bsize = crypto_cipher_blocksize(child);
  
  	crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
-diff -urNp linux-2.6.32.13/Documentation/dontdiff linux-2.6.32.13/Documentation/dontdiff
---- linux-2.6.32.13/Documentation/dontdiff	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/Documentation/dontdiff	2010-05-15 13:21:14.282910849 -0400
-@@ -3,6 +3,7 @@
- *.bin
- *.cpio
- *.csp
-+*.dbg
- *.dsp
- *.dvi
- *.elf
-@@ -40,6 +41,7 @@
- *.ver
- *.xml
- *_MODULES
-+*_reg_safe.h
- *_vga16.c
- *~
- *.9
-@@ -49,11 +51,16 @@
- 53c700_d.h
- CVS
- ChangeSet
-+GPATH
-+GRTAGS
-+GSYMS
-+GTAGS
- Image
- Kerntypes
- Module.markers
- Module.symvers
- PENDING
-+PERF*
- SCCS
- System.map*
- TAGS
-@@ -76,7 +83,10 @@ btfixupprep
- build
- bvmlinux
- bzImage*
-+capflags.c
- classlist.h*
-+clut_vga16.c
-+common-cmds.h
- comp*.log
- compile.h*
- conf
-@@ -103,13 +113,14 @@ gen_crc32table
- gen_init_cpio
- genksyms
- *_gray256.c
-+hash
- ihex2fw
- ikconfig.h*
- initramfs_data.cpio
-+initramfs_data.cpio.bz2
- initramfs_data.cpio.gz
- initramfs_list
- kallsyms
--kconfig
- keywords.c
- ksym.c*
- ksym.h*
-@@ -133,7 +144,9 @@ mkboot
- mkbugboot
- mkcpustr
- mkdep
-+mkpiggy
- mkprep
-+mkregtable
- mktables
- mktree
- modpost
-@@ -149,6 +162,7 @@ patches*
- pca200e.bin
- pca200e_ecd.bin2
- piggy.gz
-+piggy.S
- piggyback
- pnmtologo
- ppc_defs.h*
-@@ -163,6 +177,7 @@ setup
- setup.bin
- setup.elf
- sImage
-+slabinfo
- sm_tbl*
- split-include
- syscalltab.h
-@@ -186,14 +201,20 @@ version.h*
- vmlinux
- vmlinux-*
- vmlinux.aout
-+vmlinux.bin.all
-+vmlinux.bin.bz2
- vmlinux.lds
-+vmlinux.relocs
-+voffset.h
- vsyscall.lds
- vsyscall_32.lds
- wanxlfw.inc
- uImage
- unifdef
-+utsrelease.h
- wakeup.bin
- wakeup.elf
- wakeup.lds
- zImage*
- zconf.hash.c
-+zoffset.h
-diff -urNp linux-2.6.32.13/Documentation/kernel-parameters.txt linux-2.6.32.13/Documentation/kernel-parameters.txt
---- linux-2.6.32.13/Documentation/kernel-parameters.txt	2010-05-15 13:20:18.374565913 -0400
-+++ linux-2.6.32.13/Documentation/kernel-parameters.txt	2010-05-15 13:21:14.282910849 -0400
-@@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters. 
- 			the specified number of seconds.  This is to be used if
- 			your oopses keep scrolling off the screen.
- 
-+	pax_nouderef	[X86-32] disables UDEREF.  Most likely needed under certain
-+			virtualization environments that don't cope well with the
-+			expand down segment used by UDEREF on X86-32.
-+
-+	pax_softmode=	[X86-32] 0/1 to disable/enable PaX softmode on boot already.
-+
- 	pcbit=		[HW,ISDN]
- 
- 	pcd.		[PARIDE]
-diff -urNp linux-2.6.32.13/drivers/acpi/battery.c linux-2.6.32.13/drivers/acpi/battery.c
---- linux-2.6.32.13/drivers/acpi/battery.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/acpi/battery.c	2010-05-15 13:21:14.282910849 -0400
-@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
+diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
+index 68919e2..e4cdf22 100644
+--- a/drivers/acpi/battery.c
++++ b/drivers/acpi/battery.c
+@@ -846,7 +846,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
  	}
  
  static struct battery_file {
@@ -20118,10 +21058,11 @@ diff -urNp linux-2.6.32.13/drivers/acpi/battery.c linux-2.6.32.13/drivers/acpi/b
  	mode_t mode;
  	const char *name;
  } acpi_battery_file[] = {
-diff -urNp linux-2.6.32.13/drivers/acpi/blacklist.c linux-2.6.32.13/drivers/acpi/blacklist.c
---- linux-2.6.32.13/drivers/acpi/blacklist.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/acpi/blacklist.c	2010-05-15 13:21:14.295422110 -0400
-@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
+diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
+index 51cada7..60e0d99 100644
+--- a/drivers/acpi/blacklist.c
++++ b/drivers/acpi/blacklist.c
+@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_blacklist[] __initdata = {
  	{"IBM   ", "TP600E  ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
  	 "Incorrect _ADR", 1},
  
@@ -20130,9 +21071,10 @@ diff -urNp linux-2.6.32.13/drivers/acpi/blacklist.c linux-2.6.32.13/drivers/acpi
  };
  
  #if	CONFIG_ACPI_BLACKLIST_YEAR
-diff -urNp linux-2.6.32.13/drivers/acpi/dock.c linux-2.6.32.13/drivers/acpi/dock.c
---- linux-2.6.32.13/drivers/acpi/dock.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/acpi/dock.c	2010-05-15 13:21:14.298962418 -0400
+diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
+index 3fe29e9..b3484bf 100644
+--- a/drivers/acpi/dock.c
++++ b/drivers/acpi/dock.c
 @@ -77,7 +77,7 @@ struct dock_dependent_device {
  	struct list_head list;
  	struct list_head hotplug_list;
@@ -20142,7 +21084,7 @@ diff -urNp linux-2.6.32.13/drivers/acpi/dock.c linux-2.6.32.13/drivers/acpi/dock
  	void *context;
  };
  
-@@ -605,7 +605,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifi
+@@ -589,7 +589,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifier);
   * the dock driver after _DCK is executed.
   */
  int
@@ -20151,10 +21093,11 @@ diff -urNp linux-2.6.32.13/drivers/acpi/dock.c linux-2.6.32.13/drivers/acpi/dock
  			     void *context)
  {
  	struct dock_dependent_device *dd;
-diff -urNp linux-2.6.32.13/drivers/acpi/osl.c linux-2.6.32.13/drivers/acpi/osl.c
---- linux-2.6.32.13/drivers/acpi/osl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/acpi/osl.c	2010-05-15 13:21:14.298962418 -0400
-@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
+diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
+index 78418ce..a991f41 100644
+--- a/drivers/acpi/osl.c
++++ b/drivers/acpi/osl.c
+@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width)
  	void __iomem *virt_addr;
  
  	virt_addr = ioremap(phys_addr, width);
@@ -20163,7 +21106,7 @@ diff -urNp linux-2.6.32.13/drivers/acpi/osl.c linux-2.6.32.13/drivers/acpi/osl.c
  	if (!value)
  		value = &dummy;
  
-@@ -551,6 +553,8 @@ acpi_os_write_memory(acpi_physical_addre
+@@ -551,6 +553,8 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
  	void __iomem *virt_addr;
  
  	virt_addr = ioremap(phys_addr, width);
@@ -20172,10 +21115,11 @@ diff -urNp linux-2.6.32.13/drivers/acpi/osl.c linux-2.6.32.13/drivers/acpi/osl.c
  
  	switch (width) {
  	case 8:
-diff -urNp linux-2.6.32.13/drivers/acpi/power_meter.c linux-2.6.32.13/drivers/acpi/power_meter.c
---- linux-2.6.32.13/drivers/acpi/power_meter.c	2010-05-15 13:20:18.454567530 -0400
-+++ linux-2.6.32.13/drivers/acpi/power_meter.c	2010-05-15 13:21:14.298962418 -0400
-@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
+diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
+index 66f6729..2d6de0a 100644
+--- a/drivers/acpi/power_meter.c
++++ b/drivers/acpi/power_meter.c
+@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
  		return res;
  
  	temp /= 1000;
@@ -20184,10 +21128,11 @@ diff -urNp linux-2.6.32.13/drivers/acpi/power_meter.c linux-2.6.32.13/drivers/ac
  
  	mutex_lock(&resource->lock);
  	resource->trip[attr->index - 7] = temp;
-diff -urNp linux-2.6.32.13/drivers/acpi/proc.c linux-2.6.32.13/drivers/acpi/proc.c
---- linux-2.6.32.13/drivers/acpi/proc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/acpi/proc.c	2010-05-15 13:21:14.307002164 -0400
-@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
+diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
+index 1ac678d..ebee2d7 100644
+--- a/drivers/acpi/proc.c
++++ b/drivers/acpi/proc.c
+@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct file *file,
  				size_t count, loff_t * ppos)
  {
  	struct list_head *node, *next;
@@ -20213,7 +21158,7 @@ diff -urNp linux-2.6.32.13/drivers/acpi/proc.c linux-2.6.32.13/drivers/acpi/proc
  
  	mutex_lock(&acpi_device_lock);
  	list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-@@ -413,7 +408,7 @@ acpi_system_write_wakeup_device(struct f
+@@ -413,7 +408,7 @@ acpi_system_write_wakeup_device(struct file *file,
  		if (!dev->wakeup.flags.valid)
  			continue;
  
@@ -20222,22 +21167,24 @@ diff -urNp linux-2.6.32.13/drivers/acpi/proc.c linux-2.6.32.13/drivers/acpi/proc
  			dev->wakeup.state.enabled =
  			    dev->wakeup.state.enabled ? 0 : 1;
  			found_dev = dev;
-diff -urNp linux-2.6.32.13/drivers/acpi/processor_core.c linux-2.6.32.13/drivers/acpi/processor_core.c
---- linux-2.6.32.13/drivers/acpi/processor_core.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/acpi/processor_core.c	2010-05-15 13:21:14.307002164 -0400
-@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
+diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
+index 38ea0cc..58c1914 100644
+--- a/drivers/acpi/processor_driver.c
++++ b/drivers/acpi/processor_driver.c
+@@ -586,7 +586,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
  		return 0;
- 	}
+ #endif
  
 -	BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
 +	BUG_ON(pr->id >= nr_cpu_ids);
  
  	/*
  	 * Buggy BIOS check
-diff -urNp linux-2.6.32.13/drivers/acpi/processor_idle.c linux-2.6.32.13/drivers/acpi/processor_idle.c
---- linux-2.6.32.13/drivers/acpi/processor_idle.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/acpi/processor_idle.c	2010-05-15 13:21:14.330926828 -0400
-@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
+diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
+index e9a8026..553acaa 100644
+--- a/drivers/acpi/processor_idle.c
++++ b/drivers/acpi/processor_idle.c
+@@ -124,7 +124,7 @@ static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = {
  	  DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
  	  DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
  	 (void *)1},
@@ -20246,10 +21193,11 @@ diff -urNp linux-2.6.32.13/drivers/acpi/processor_idle.c linux-2.6.32.13/drivers
  };
  
  
-diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sleep.c
---- linux-2.6.32.13/drivers/acpi/sleep.c	2010-05-15 13:20:18.454567530 -0400
-+++ linux-2.6.32.13/drivers/acpi/sleep.c	2010-05-15 13:21:14.330926828 -0400
-@@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp
+diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
+index 4882bc1..53f6c8a 100644
+--- a/drivers/acpi/sleep.c
++++ b/drivers/acpi/sleep.c
+@@ -318,7 +318,7 @@ static int acpi_suspend_state_valid(suspend_state_t pm_state)
  	}
  }
  
@@ -20258,7 +21206,7 @@ diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sle
  	.valid = acpi_suspend_state_valid,
  	.begin = acpi_suspend_begin,
  	.prepare_late = acpi_pm_prepare,
-@@ -330,7 +330,7 @@ static int acpi_suspend_begin_old(suspen
+@@ -346,7 +346,7 @@ static int acpi_suspend_begin_old(suspend_state_t pm_state)
   * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
   * been requested.
   */
@@ -20266,8 +21214,8 @@ diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sle
 +static const struct platform_suspend_ops acpi_suspend_ops_old = {
  	.valid = acpi_suspend_state_valid,
  	.begin = acpi_suspend_begin_old,
- 	.prepare_late = acpi_pm_disable_gpes,
-@@ -701,7 +701,7 @@ static void acpi_pm_enable_gpes(void)
+ 	.prepare_late = acpi_pm_freeze,
+@@ -500,7 +500,7 @@ static void acpi_pm_thaw(void)
  	acpi_enable_all_runtime_gpes();
  }
  
@@ -20276,7 +21224,7 @@ diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sle
  	.begin = acpi_hibernation_begin,
  	.end = acpi_pm_end,
  	.pre_snapshot = acpi_hibernation_pre_snapshot,
-@@ -754,7 +754,7 @@ static int acpi_hibernation_pre_snapshot
+@@ -550,7 +550,7 @@ static int acpi_hibernation_pre_snapshot_old(void)
   * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
   * been requested.
   */
@@ -20285,10 +21233,11 @@ diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sle
  	.begin = acpi_hibernation_begin_old,
  	.end = acpi_pm_end,
  	.pre_snapshot = acpi_hibernation_pre_snapshot_old,
-diff -urNp linux-2.6.32.13/drivers/acpi/video.c linux-2.6.32.13/drivers/acpi/video.c
---- linux-2.6.32.13/drivers/acpi/video.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/acpi/video.c	2010-05-15 13:21:14.330926828 -0400
-@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
+diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
+index 9865d46..ffc6a96 100644
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -363,7 +363,7 @@ static int acpi_video_set_brightness(struct backlight_device *bd)
  				vd->brightness->levels[request_level]);
  }
  
@@ -20297,20 +21246,12 @@ diff -urNp linux-2.6.32.13/drivers/acpi/video.c linux-2.6.32.13/drivers/acpi/vid
  	.get_brightness = acpi_video_get_brightness,
  	.update_status  = acpi_video_set_brightness,
  };
-diff -urNp linux-2.6.32.13/drivers/ata/ahci.c linux-2.6.32.13/drivers/ata/ahci.c
---- linux-2.6.32.13/drivers/ata/ahci.c	2010-04-29 17:49:37.661448235 -0400
-+++ linux-2.6.32.13/drivers/ata/ahci.c	2010-05-15 13:21:14.374114367 -0400
-@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
- 	.sdev_attrs		= ahci_sdev_attrs,
- };
- 
--static struct ata_port_operations ahci_ops = {
-+static const struct ata_port_operations ahci_ops = {
- 	.inherits		= &sata_pmp_port_ops,
- 
- 	.qc_defer		= sata_pmp_qc_defer_cmd_switch,
-@@ -424,17 +424,17 @@ static struct ata_port_operations ahci_o
- 	.port_stop		= ahci_port_stop,
+diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
+index d571e3f..7689d88 100644
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -93,17 +93,17 @@ static struct scsi_host_template ahci_sht = {
+ 	AHCI_SHT("ahci"),
  };
  
 -static struct ata_port_operations ahci_vt8251_ops = {
@@ -20330,7 +21271,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/ahci.c linux-2.6.32.13/drivers/ata/ahci.c
  	.inherits		= &ahci_ops,
  	.softreset		= ahci_sb600_softreset,
  	.pmp_softreset		= ahci_sb600_softreset,
-@@ -687,7 +687,7 @@ static const struct pci_device_id ahci_p
+@@ -374,7 +374,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {
  	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
  	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
  
@@ -20339,10 +21280,24 @@ diff -urNp linux-2.6.32.13/drivers/ata/ahci.c linux-2.6.32.13/drivers/ata/ahci.c
  };
  
  
-diff -urNp linux-2.6.32.13/drivers/ata/ata_generic.c linux-2.6.32.13/drivers/ata/ata_generic.c
---- linux-2.6.32.13/drivers/ata/ata_generic.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/ata_generic.c	2010-05-15 13:21:14.387424242 -0400
-@@ -95,7 +95,7 @@ static struct scsi_host_template generic
+diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
+index 22a20e8..9180f01 100644
+--- a/drivers/ata/ahci.h
++++ b/drivers/ata/ahci.h
+@@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sdev_attrs[];
+ 	.shost_attrs		= ahci_shost_attrs,			\
+ 	.sdev_attrs		= ahci_sdev_attrs
+ 
+-extern struct ata_port_operations ahci_ops;
++extern const struct ata_port_operations ahci_ops;
+ 
+ void ahci_save_initial_config(struct device *dev,
+ 			      struct ahci_host_priv *hpriv,
+diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
+index 7107a69..6268939 100644
+--- a/drivers/ata/ata_generic.c
++++ b/drivers/ata/ata_generic.c
+@@ -104,7 +104,7 @@ static struct scsi_host_template generic_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20351,10 +21306,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/ata_generic.c linux-2.6.32.13/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_unknown,
  	.set_mode	= generic_set_mode,
-diff -urNp linux-2.6.32.13/drivers/ata/ata_piix.c linux-2.6.32.13/drivers/ata/ata_piix.c
---- linux-2.6.32.13/drivers/ata/ata_piix.c	2010-04-29 17:49:37.669446700 -0400
-+++ linux-2.6.32.13/drivers/ata/ata_piix.c	2010-05-15 13:21:14.387424242 -0400
-@@ -299,7 +299,7 @@ static const struct pci_device_id piix_p
+diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
+index 3971bc0..4169733 100644
+--- a/drivers/ata/ata_piix.c
++++ b/drivers/ata/ata_piix.c
+@@ -302,7 +302,7 @@ static const struct pci_device_id piix_pci_tbl[] = {
  	{ 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 },
@@ -20363,16 +21319,22 @@ diff -urNp linux-2.6.32.13/drivers/ata/ata_piix.c linux-2.6.32.13/drivers/ata/at
  };
  
  static struct pci_driver piix_pci_driver = {
-@@ -317,7 +317,7 @@ static struct scsi_host_template piix_sh
+@@ -320,12 +320,12 @@ static struct scsi_host_template piix_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
+-static struct ata_port_operations piix_sata_ops = {
++static const struct ata_port_operations piix_sata_ops = {
+ 	.inherits		= &ata_bmdma32_port_ops,
+ 	.sff_irq_check		= piix_irq_check,
+ };
+ 
 -static struct ata_port_operations piix_pata_ops = {
 +static const struct ata_port_operations piix_pata_ops = {
- 	.inherits		= &ata_bmdma32_port_ops,
+ 	.inherits		= &piix_sata_ops,
  	.cable_detect		= ata_cable_40wire,
  	.set_piomode		= piix_set_piomode,
-@@ -325,22 +325,22 @@ static struct ata_port_operations piix_p
+@@ -333,18 +333,18 @@ static struct ata_port_operations piix_pata_ops = {
  	.prereset		= piix_pata_prereset,
  };
  
@@ -20389,17 +21351,12 @@ diff -urNp linux-2.6.32.13/drivers/ata/ata_piix.c linux-2.6.32.13/drivers/ata/at
  	.set_dmamode		= ich_set_dmamode,
  };
  
--static struct ata_port_operations piix_sata_ops = {
-+static const struct ata_port_operations piix_sata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- };
- 
 -static struct ata_port_operations piix_sidpr_sata_ops = {
 +static const struct ata_port_operations piix_sidpr_sata_ops = {
  	.inherits		= &piix_sata_ops,
  	.hardreset		= sata_std_hardreset,
  	.scr_read		= piix_sidpr_scr_read,
-@@ -616,7 +616,7 @@ static const struct ich_laptop ich_lapto
+@@ -620,7 +620,7 @@ static const struct ich_laptop ich_laptop[] = {
  	{ 0x2653, 0x1043, 0x82D8 },	/* ICH6M on Asus Eee 701 */
  	{ 0x27df, 0x104d, 0x900e },	/* ICH7 on Sony TZ-90 */
  	/* end marker */
@@ -20408,7 +21365,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/ata_piix.c linux-2.6.32.13/drivers/ata/at
  };
  
  /**
-@@ -1094,7 +1094,7 @@ static int piix_broken_suspend(void)
+@@ -1112,7 +1112,7 @@ static int piix_broken_suspend(void)
  			},
  		},
  
@@ -20417,10 +21374,24 @@ diff -urNp linux-2.6.32.13/drivers/ata/ata_piix.c linux-2.6.32.13/drivers/ata/at
  	};
  	static const char *oemstrs[] = {
  		"Tecra M3,",
-diff -urNp linux-2.6.32.13/drivers/ata/libata-acpi.c linux-2.6.32.13/drivers/ata/libata-acpi.c
---- linux-2.6.32.13/drivers/ata/libata-acpi.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/libata-acpi.c	2010-05-15 13:21:14.387424242 -0400
-@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
+diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
+index b5aecd0..d80d173 100644
+--- a/drivers/ata/libahci.c
++++ b/drivers/ata/libahci.c
+@@ -141,7 +141,7 @@ struct device_attribute *ahci_sdev_attrs[] = {
+ };
+ EXPORT_SYMBOL_GPL(ahci_sdev_attrs);
+ 
+-struct ata_port_operations ahci_ops = {
++const struct ata_port_operations ahci_ops = {
+ 	.inherits		= &sata_pmp_port_ops,
+ 
+ 	.qc_defer		= ahci_pmp_qc_defer,
+diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
+index 7b5eea7..e9eb041 100644
+--- a/drivers/ata/libata-acpi.c
++++ b/drivers/ata/libata-acpi.c
+@@ -224,12 +224,12 @@ static void ata_acpi_dev_uevent(acpi_handle handle, u32 event, void *data)
  	ata_acpi_uevent(dev->link->ap, dev, event);
  }
  
@@ -20435,10 +21406,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-acpi.c linux-2.6.32.13/drivers/ata
  	.handler = ata_acpi_ap_notify_dock,
  	.uevent = ata_acpi_ap_uevent,
  };
-diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata/libata-core.c
---- linux-2.6.32.13/drivers/ata/libata-core.c	2010-04-29 17:49:37.689144697 -0400
-+++ linux-2.6.32.13/drivers/ata/libata-core.c	2010-05-15 13:21:14.390775531 -0400
-@@ -896,7 +896,7 @@ static const struct ata_xfer_ent {
+diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
+index 1f24267..fa2553e 100644
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -901,7 +901,7 @@ static const struct ata_xfer_ent {
  	{ ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
  	{ ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
  	{ ATA_SHIFT_UDMA, ATA_NR_UDMA_MODES, XFER_UDMA_0 },
@@ -20447,7 +21419,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata
  };
  
  /**
-@@ -3163,7 +3163,7 @@ static const struct ata_timing ata_timin
+@@ -3073,7 +3073,7 @@ static const struct ata_timing ata_timing[] = {
  	{ XFER_UDMA_5,     0,   0,   0,   0,   0,   0, 0,    0,  20 },
  	{ XFER_UDMA_6,     0,   0,   0,   0,   0,   0, 0,    0,  15 },
  
@@ -20456,7 +21428,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata
  };
  
  #define ENOUGH(v, unit)		(((v)-1)/(unit)+1)
-@@ -4388,7 +4388,7 @@ static const struct ata_blacklist_entry 
+@@ -4323,7 +4323,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
  	{ "PIONEER DVD-RW  DVRTD08",	"1.00",	ATA_HORKAGE_NOSETXFER },
  
  	/* End Marker */
@@ -20465,7 +21437,25 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata
  };
  
  static int strn_pattern_cmp(const char *patt, const char *name, int wildchar)
-@@ -5964,7 +5964,7 @@ static void ata_host_stop(struct device 
+@@ -4884,7 +4884,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
+ 	struct ata_port *ap;
+ 	unsigned int tag;
+ 
+-	WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
++	BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
+ 	ap = qc->ap;
+ 
+ 	qc->flags = 0;
+@@ -4900,7 +4900,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
+ 	struct ata_port *ap;
+ 	struct ata_link *link;
+ 
+-	WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
++	BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
+ 	WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
+ 	ap = qc->ap;
+ 	link = qc->dev->link;
+@@ -5881,7 +5881,7 @@ static void ata_host_stop(struct device *gendev, void *res)
   *	LOCKING:
   *	None.
   */
@@ -20474,7 +21464,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata
  {
  	static DEFINE_SPINLOCK(lock);
  	const struct ata_port_operations *cur;
-@@ -5976,6 +5976,7 @@ static void ata_finalize_port_ops(struct
+@@ -5893,6 +5893,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
  		return;
  
  	spin_lock(&lock);
@@ -20482,7 +21472,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata
  
  	for (cur = ops->inherits; cur; cur = cur->inherits) {
  		void **inherit = (void **)cur;
-@@ -5989,8 +5990,9 @@ static void ata_finalize_port_ops(struct
+@@ -5906,8 +5907,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
  		if (IS_ERR(*pp))
  			*pp = NULL;
  
@@ -20493,7 +21483,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata
  	spin_unlock(&lock);
  }
  
-@@ -6087,7 +6089,7 @@ int ata_host_start(struct ata_host *host
+@@ -6004,7 +6006,7 @@ int ata_host_start(struct ata_host *host)
   */
  /* KILLME - the only user left is ipr */
  void ata_host_init(struct ata_host *host, struct device *dev,
@@ -20502,7 +21492,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata
  {
  	spin_lock_init(&host->lock);
  	host->dev = dev;
-@@ -6750,7 +6752,7 @@ static void ata_dummy_error_handler(stru
+@@ -6654,7 +6656,7 @@ static void ata_dummy_error_handler(struct ata_port *ap)
  	/* truly dummy */
  }
  
@@ -20511,10 +21501,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata
  	.qc_prep		= ata_noop_qc_prep,
  	.qc_issue		= ata_dummy_qc_issue,
  	.error_handler		= ata_dummy_error_handler,
-diff -urNp linux-2.6.32.13/drivers/ata/libata-eh.c linux-2.6.32.13/drivers/ata/libata-eh.c
---- linux-2.6.32.13/drivers/ata/libata-eh.c	2010-05-15 13:20:18.462978524 -0400
-+++ linux-2.6.32.13/drivers/ata/libata-eh.c	2010-05-15 13:21:14.390775531 -0400
-@@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_
+diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
+index da5a55b..9855d41 100644
+--- a/drivers/ata/libata-eh.c
++++ b/drivers/ata/libata-eh.c
+@@ -3684,7 +3684,7 @@ void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
   */
  void ata_std_error_handler(struct ata_port *ap)
  {
@@ -20523,10 +21514,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-eh.c linux-2.6.32.13/drivers/ata/l
  	ata_reset_fn_t hardreset = ops->hardreset;
  
  	/* ignore built-in hardreset if SCR access is not available */
-diff -urNp linux-2.6.32.13/drivers/ata/libata-pmp.c linux-2.6.32.13/drivers/ata/libata-pmp.c
---- linux-2.6.32.13/drivers/ata/libata-pmp.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/libata-pmp.c	2010-05-15 13:21:14.390775531 -0400
-@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
+diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
+index 224faab..1890316 100644
+--- a/drivers/ata/libata-pmp.c
++++ b/drivers/ata/libata-pmp.c
+@@ -868,7 +868,7 @@ static int sata_pmp_handle_link_fail(struct ata_link *link, int *link_tries)
   */
  static int sata_pmp_eh_recover(struct ata_port *ap)
  {
@@ -20535,10 +21527,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-pmp.c linux-2.6.32.13/drivers/ata/
  	int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
  	struct ata_link *pmp_link = &ap->link;
  	struct ata_device *pmp_dev = pmp_link->device;
-diff -urNp linux-2.6.32.13/drivers/ata/pata_acpi.c linux-2.6.32.13/drivers/ata/pata_acpi.c
---- linux-2.6.32.13/drivers/ata/pata_acpi.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_acpi.c	2010-05-15 13:21:14.390775531 -0400
-@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
+diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
+index c8d4703..e9e7d35 100644
+--- a/drivers/ata/pata_acpi.c
++++ b/drivers/ata/pata_acpi.c
+@@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20547,10 +21540,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_acpi.c linux-2.6.32.13/drivers/ata/p
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_issue		= pacpi_qc_issue,
  	.cable_detect		= pacpi_cable_detect,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_ali.c linux-2.6.32.13/drivers/ata/pata_ali.c
---- linux-2.6.32.13/drivers/ata/pata_ali.c	2010-04-29 17:49:37.689144697 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_ali.c	2010-05-15 13:21:14.402931362 -0400
-@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
+diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
+index 794ec6e..77b1883 100644
+--- a/drivers/ata/pata_ali.c
++++ b/drivers/ata/pata_ali.c
+@@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht = {
   *	Port operations for PIO only ALi
   */
  
@@ -20559,7 +21553,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ali.c linux-2.6.32.13/drivers/ata/pa
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= ali_set_piomode,
-@@ -382,7 +382,7 @@ static const struct ata_port_operations 
+@@ -380,7 +380,7 @@ static const struct ata_port_operations ali_dma_base_ops = {
   *	Port operations for DMA capable ALi without cable
   *	detect
   */
@@ -20568,7 +21562,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ali.c linux-2.6.32.13/drivers/ata/pa
  	.inherits	= &ali_dma_base_ops,
  	.cable_detect	= ata_cable_40wire,
  	.mode_filter	= ali_20_filter,
-@@ -393,7 +393,7 @@ static struct ata_port_operations ali_20
+@@ -391,7 +391,7 @@ static struct ata_port_operations ali_20_port_ops = {
  /*
   *	Port operations for DMA capable ALi with cable detect
   */
@@ -20577,7 +21571,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ali.c linux-2.6.32.13/drivers/ata/pa
  	.inherits	= &ali_dma_base_ops,
  	.check_atapi_dma = ali_check_atapi_dma,
  	.cable_detect	= ali_c2_cable_detect,
-@@ -404,7 +404,7 @@ static struct ata_port_operations ali_c2
+@@ -402,7 +402,7 @@ static struct ata_port_operations ali_c2_port_ops = {
  /*
   *	Port operations for DMA capable ALi with cable detect
   */
@@ -20586,7 +21580,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ali.c linux-2.6.32.13/drivers/ata/pa
  	.inherits	= &ali_dma_base_ops,
  	.check_atapi_dma = ali_check_atapi_dma,
  	.cable_detect	= ali_c2_cable_detect,
-@@ -414,7 +414,7 @@ static struct ata_port_operations ali_c4
+@@ -412,7 +412,7 @@ static struct ata_port_operations ali_c4_port_ops = {
  /*
   *	Port operations for DMA capable ALi with cable detect and LBA48
   */
@@ -20595,10 +21589,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ali.c linux-2.6.32.13/drivers/ata/pa
  	.inherits	= &ali_dma_base_ops,
  	.check_atapi_dma = ali_check_atapi_dma,
  	.dev_config	= ali_warn_atapi_dma,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_amd.c linux-2.6.32.13/drivers/ata/pata_amd.c
---- linux-2.6.32.13/drivers/ata/pata_amd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_amd.c	2010-05-15 13:21:14.402931362 -0400
-@@ -397,28 +397,28 @@ static const struct ata_port_operations 
+diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
+index 620a07c..06d4e17 100644
+--- a/drivers/ata/pata_amd.c
++++ b/drivers/ata/pata_amd.c
+@@ -397,28 +397,28 @@ static const struct ata_port_operations amd_base_port_ops = {
  	.prereset	= amd_pre_reset,
  };
  
@@ -20631,7 +21626,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_amd.c linux-2.6.32.13/drivers/ata/pa
  	.inherits	= &amd_base_port_ops,
  	.cable_detect	= amd_cable_detect,
  	.set_piomode	= amd133_set_piomode,
-@@ -433,13 +433,13 @@ static const struct ata_port_operations 
+@@ -433,13 +433,13 @@ static const struct ata_port_operations nv_base_port_ops = {
  	.host_stop	= nv_host_stop,
  };
  
@@ -20647,10 +21642,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_amd.c linux-2.6.32.13/drivers/ata/pa
  	.inherits	= &nv_base_port_ops,
  	.set_piomode	= nv133_set_piomode,
  	.set_dmamode	= nv133_set_dmamode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_artop.c linux-2.6.32.13/drivers/ata/pata_artop.c
---- linux-2.6.32.13/drivers/ata/pata_artop.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_artop.c	2010-05-15 13:21:14.402931362 -0400
-@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
+diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
+index ba43f0f..3949a4f 100644
+--- a/drivers/ata/pata_artop.c
++++ b/drivers/ata/pata_artop.c
+@@ -311,7 +311,7 @@ static struct scsi_host_template artop_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20659,7 +21655,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_artop.c linux-2.6.32.13/drivers/ata/
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= ata_cable_40wire,
  	.set_piomode		= artop6210_set_piomode,
-@@ -320,7 +320,7 @@ static struct ata_port_operations artop6
+@@ -320,7 +320,7 @@ static struct ata_port_operations artop6210_ops = {
  	.qc_defer		= artop6210_qc_defer,
  };
  
@@ -20668,10 +21664,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_artop.c linux-2.6.32.13/drivers/ata/
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= artop6260_cable_detect,
  	.set_piomode		= artop6260_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_at32.c linux-2.6.32.13/drivers/ata/pata_at32.c
---- linux-2.6.32.13/drivers/ata/pata_at32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_at32.c	2010-05-15 13:21:14.402931362 -0400
-@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
+diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c
+index 66ce6a5..2e36304 100644
+--- a/drivers/ata/pata_at32.c
++++ b/drivers/ata/pata_at32.c
+@@ -173,7 +173,7 @@ static struct scsi_host_template at32_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -20680,10 +21677,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_at32.c linux-2.6.32.13/drivers/ata/p
  	.inherits		= &ata_sff_port_ops,
  	.cable_detect		= ata_cable_40wire,
  	.set_piomode		= pata_at32_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_at91.c linux-2.6.32.13/drivers/ata/pata_at91.c
---- linux-2.6.32.13/drivers/ata/pata_at91.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_at91.c	2010-05-15 13:21:14.402931362 -0400
-@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
+diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
+index 0da0dcc..04d7d77 100644
+--- a/drivers/ata/pata_at91.c
++++ b/drivers/ata/pata_at91.c
+@@ -196,7 +196,7 @@ static struct scsi_host_template pata_at91_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -20692,10 +21690,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_at91.c linux-2.6.32.13/drivers/ata/p
  	.inherits	= &ata_sff_port_ops,
  
  	.sff_data_xfer	= pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_atiixp.c linux-2.6.32.13/drivers/ata/pata_atiixp.c
---- linux-2.6.32.13/drivers/ata/pata_atiixp.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_atiixp.c	2010-05-15 13:21:14.444201793 -0400
-@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
+diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
+index 4375561..cfe4ef5 100644
+--- a/drivers/ata/pata_atiixp.c
++++ b/drivers/ata/pata_atiixp.c
+@@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_sht = {
  	.sg_tablesize		= LIBATA_DUMB_MAX_PRD,
  };
  
@@ -20703,11 +21702,12 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_atiixp.c linux-2.6.32.13/drivers/ata
 +static const struct ata_port_operations atiixp_port_ops = {
  	.inherits	= &ata_bmdma_port_ops,
  
- 	.qc_prep 	= ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_atp867x.c linux-2.6.32.13/drivers/ata/pata_atp867x.c
---- linux-2.6.32.13/drivers/ata/pata_atp867x.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_atp867x.c	2010-05-15 13:21:14.451300458 -0400
-@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
+ 	.qc_prep 	= ata_bmdma_dumb_qc_prep,
+diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c
+index 9529593..5fcc356 100644
+--- a/drivers/ata/pata_atp867x.c
++++ b/drivers/ata/pata_atp867x.c
+@@ -275,7 +275,7 @@ static struct scsi_host_template atp867x_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20716,34 +21716,37 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_atp867x.c linux-2.6.32.13/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= atp867x_cable_detect,
  	.set_piomode		= atp867x_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_bf54x.c linux-2.6.32.13/drivers/ata/pata_bf54x.c
---- linux-2.6.32.13/drivers/ata/pata_bf54x.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_bf54x.c	2010-05-15 13:21:14.451300458 -0400
-@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
+diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
+index 9cae65d..7b29f13 100644
+--- a/drivers/ata/pata_bf54x.c
++++ b/drivers/ata/pata_bf54x.c
+@@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sht = {
  	.dma_boundary		= ATA_DMA_BOUNDARY,
  };
  
 -static struct ata_port_operations bfin_pata_ops = {
 +static const struct ata_port_operations bfin_pata_ops = {
- 	.inherits		= &ata_sff_port_ops,
+ 	.inherits		= &ata_bmdma_port_ops,
  
  	.set_piomode		= bfin_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd640.c linux-2.6.32.13/drivers/ata/pata_cmd640.c
---- linux-2.6.32.13/drivers/ata/pata_cmd640.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_cmd640.c	2010-05-15 13:21:14.451300458 -0400
-@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
- 	ATA_BMDMA_SHT(DRV_NAME),
+diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
+index e5f289f..bad2c44 100644
+--- a/drivers/ata/pata_cmd640.c
++++ b/drivers/ata/pata_cmd640.c
+@@ -165,7 +165,7 @@ static struct scsi_host_template cmd640_sht = {
+ 	ATA_PIO_SHT(DRV_NAME),
  };
  
 -static struct ata_port_operations cmd640_port_ops = {
 +static const struct ata_port_operations cmd640_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
+ 	.inherits	= &ata_sff_port_ops,
  	/* In theory xfer_noirq is not needed once we kill the prefetcher */
  	.sff_data_xfer	= ata_sff_data_xfer_noirq,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd64x.c linux-2.6.32.13/drivers/ata/pata_cmd64x.c
---- linux-2.6.32.13/drivers/ata/pata_cmd64x.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_cmd64x.c	2010-05-15 13:21:14.451300458 -0400
-@@ -275,18 +275,18 @@ static const struct ata_port_operations 
+diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
+index 905ff76..976f0c0 100644
+--- a/drivers/ata/pata_cmd64x.c
++++ b/drivers/ata/pata_cmd64x.c
+@@ -268,18 +268,18 @@ static const struct ata_port_operations cmd64x_base_ops = {
  	.set_dmamode	= cmd64x_set_dmamode,
  };
  
@@ -20765,22 +21768,24 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd64x.c linux-2.6.32.13/drivers/ata
  	.inherits	= &cmd64x_base_ops,
  	.bmdma_stop	= cmd648_bmdma_stop,
  	.cable_detect	= cmd648_cable_detect,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5520.c linux-2.6.32.13/drivers/ata/pata_cs5520.c
---- linux-2.6.32.13/drivers/ata/pata_cs5520.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_cs5520.c	2010-05-15 13:21:14.475033843 -0400
-@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
+diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
+index 030952f..2984d7a 100644
+--- a/drivers/ata/pata_cs5520.c
++++ b/drivers/ata/pata_cs5520.c
+@@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_sht = {
  	.sg_tablesize		= LIBATA_DUMB_MAX_PRD,
  };
  
 -static struct ata_port_operations cs5520_port_ops = {
 +static const struct ata_port_operations cs5520_port_ops = {
  	.inherits		= &ata_bmdma_port_ops,
- 	.qc_prep		= ata_sff_dumb_qc_prep,
+ 	.qc_prep		= ata_bmdma_dumb_qc_prep,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5530.c linux-2.6.32.13/drivers/ata/pata_cs5530.c
---- linux-2.6.32.13/drivers/ata/pata_cs5530.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_cs5530.c	2010-05-15 13:21:14.487977689 -0400
-@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
+diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
+index f792330..d4a893a 100644
+--- a/drivers/ata/pata_cs5530.c
++++ b/drivers/ata/pata_cs5530.c
+@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_sht = {
  	.sg_tablesize	= LIBATA_DUMB_MAX_PRD,
  };
  
@@ -20788,11 +21793,12 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5530.c linux-2.6.32.13/drivers/ata
 +static const struct ata_port_operations cs5530_port_ops = {
  	.inherits	= &ata_bmdma_port_ops,
  
- 	.qc_prep 	= ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5535.c linux-2.6.32.13/drivers/ata/pata_cs5535.c
---- linux-2.6.32.13/drivers/ata/pata_cs5535.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_cs5535.c	2010-05-15 13:21:14.487977689 -0400
-@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
+ 	.qc_prep 	= ata_bmdma_dumb_qc_prep,
+diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
+index 03a9318..003dadf 100644
+--- a/drivers/ata/pata_cs5535.c
++++ b/drivers/ata/pata_cs5535.c
+@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20801,22 +21807,24 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5535.c linux-2.6.32.13/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= cs5535_cable_detect,
  	.set_piomode	= cs5535_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5536.c linux-2.6.32.13/drivers/ata/pata_cs5536.c
---- linux-2.6.32.13/drivers/ata/pata_cs5536.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_cs5536.c	2010-05-15 13:21:14.487977689 -0400
-@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
+diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
+index 21ee23f..12f1bb4 100644
+--- a/drivers/ata/pata_cs5536.c
++++ b/drivers/ata/pata_cs5536.c
+@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
 -static struct ata_port_operations cs5536_port_ops = {
 +static const struct ata_port_operations cs5536_port_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
+ 	.inherits		= &ata_bmdma32_port_ops,
  	.cable_detect		= cs5536_cable_detect,
  	.set_piomode		= cs5536_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_cypress.c linux-2.6.32.13/drivers/ata/pata_cypress.c
---- linux-2.6.32.13/drivers/ata/pata_cypress.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_cypress.c	2010-05-15 13:21:14.487977689 -0400
-@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
+diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
+index 6d915b0..5f95c77 100644
+--- a/drivers/ata/pata_cypress.c
++++ b/drivers/ata/pata_cypress.c
+@@ -115,7 +115,7 @@ static struct scsi_host_template cy82c693_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20825,10 +21833,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cypress.c linux-2.6.32.13/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= cy82c693_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_efar.c linux-2.6.32.13/drivers/ata/pata_efar.c
---- linux-2.6.32.13/drivers/ata/pata_efar.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_efar.c	2010-05-15 13:21:14.487977689 -0400
-@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
+diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
+index a088347..505e510 100644
+--- a/drivers/ata/pata_efar.c
++++ b/drivers/ata/pata_efar.c
+@@ -238,7 +238,7 @@ static struct scsi_host_template efar_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20837,10 +21846,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_efar.c linux-2.6.32.13/drivers/ata/p
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= efar_cable_detect,
  	.set_piomode		= efar_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt366.c linux-2.6.32.13/drivers/ata/pata_hpt366.c
---- linux-2.6.32.13/drivers/ata/pata_hpt366.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_hpt366.c	2010-05-15 13:21:14.487977689 -0400
-@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
+diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
+index 7688868..6d241ae 100644
+--- a/drivers/ata/pata_hpt366.c
++++ b/drivers/ata/pata_hpt366.c
+@@ -269,7 +269,7 @@ static struct scsi_host_template hpt36x_sht = {
   *	Configuration for HPT366/68
   */
  
@@ -20849,10 +21859,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt366.c linux-2.6.32.13/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= hpt36x_cable_detect,
  	.mode_filter	= hpt366_filter,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt37x.c linux-2.6.32.13/drivers/ata/pata_hpt37x.c
---- linux-2.6.32.13/drivers/ata/pata_hpt37x.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_hpt37x.c	2010-05-15 13:21:14.490951596 -0400
-@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
+diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
+index 9ae4c08..f1bec3e 100644
+--- a/drivers/ata/pata_hpt37x.c
++++ b/drivers/ata/pata_hpt37x.c
+@@ -564,7 +564,7 @@ static struct scsi_host_template hpt37x_sht = {
   *	Configuration for HPT370
   */
  
@@ -20861,7 +21872,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt37x.c linux-2.6.32.13/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  
  	.bmdma_stop	= hpt370_bmdma_stop,
-@@ -591,7 +591,7 @@ static struct ata_port_operations hpt370
+@@ -580,7 +580,7 @@ static struct ata_port_operations hpt370_port_ops = {
   *	Configuration for HPT370A. Close to 370 but less filters
   */
  
@@ -20870,7 +21881,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt37x.c linux-2.6.32.13/drivers/ata
  	.inherits	= &hpt370_port_ops,
  	.mode_filter	= hpt370a_filter,
  };
-@@ -601,7 +601,7 @@ static struct ata_port_operations hpt370
+@@ -590,7 +590,7 @@ static struct ata_port_operations hpt370a_port_ops = {
   *	and DMA mode setting functionality.
   */
  
@@ -20879,19 +21890,20 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt37x.c linux-2.6.32.13/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  
  	.bmdma_stop	= hpt37x_bmdma_stop,
-@@ -616,7 +616,7 @@ static struct ata_port_operations hpt372
+@@ -606,7 +606,7 @@ static struct ata_port_operations hpt372_port_ops = {
   *	but we have a different cable detection procedure for function 1.
   */
  
 -static struct ata_port_operations hpt374_fn1_port_ops = {
 +static const struct ata_port_operations hpt374_fn1_port_ops = {
  	.inherits	= &hpt372_port_ops,
- 	.prereset	= hpt374_fn1_pre_reset,
- };
-diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c	2010-05-15 13:21:14.498954899 -0400
-@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
+ 	.cable_detect	= hpt374_fn1_cable_detect,
+ 	.prereset	= hpt37x_pre_reset,
+diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
+index 32f3463..27654f8 100644
+--- a/drivers/ata/pata_hpt3x2n.c
++++ b/drivers/ata/pata_hpt3x2n.c
+@@ -331,7 +331,7 @@ static struct scsi_host_template hpt3x2n_sht = {
   *	Configuration for HPT3x2n.
   */
  
@@ -20900,10 +21912,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c linux-2.6.32.13/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  
  	.bmdma_stop	= hpt3x2n_bmdma_stop,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x3.c linux-2.6.32.13/drivers/ata/pata_hpt3x3.c
---- linux-2.6.32.13/drivers/ata/pata_hpt3x3.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_hpt3x3.c	2010-05-15 13:21:14.498954899 -0400
-@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
+diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
+index b63d5e2..d8f14d6 100644
+--- a/drivers/ata/pata_hpt3x3.c
++++ b/drivers/ata/pata_hpt3x3.c
+@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20912,22 +21925,24 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x3.c linux-2.6.32.13/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= hpt3x3_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_icside.c linux-2.6.32.13/drivers/ata/pata_icside.c
---- linux-2.6.32.13/drivers/ata/pata_icside.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_icside.c	2010-05-15 13:21:14.498954899 -0400
-@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
+diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
+index 9f2889f..aeb00ba 100644
+--- a/drivers/ata/pata_icside.c
++++ b/drivers/ata/pata_icside.c
+@@ -320,7 +320,7 @@ static void pata_icside_postreset(struct ata_link *link, unsigned int *classes)
  	}
  }
  
 -static struct ata_port_operations pata_icside_port_ops = {
 +static const struct ata_port_operations pata_icside_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
+ 	.inherits		= &ata_bmdma_port_ops,
  	/* no need to build any PRD tables for DMA */
  	.qc_prep		= ata_noop_qc_prep,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_isapnp.c linux-2.6.32.13/drivers/ata/pata_isapnp.c
---- linux-2.6.32.13/drivers/ata/pata_isapnp.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_isapnp.c	2010-05-15 13:21:14.498954899 -0400
-@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
+diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
+index 4bceb88..457dfb6 100644
+--- a/drivers/ata/pata_isapnp.c
++++ b/drivers/ata/pata_isapnp.c
+@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -20942,10 +21957,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_isapnp.c linux-2.6.32.13/drivers/ata
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	/* No altstatus so we don't want to use the lost interrupt poll */
-diff -urNp linux-2.6.32.13/drivers/ata/pata_it8213.c linux-2.6.32.13/drivers/ata/pata_it8213.c
---- linux-2.6.32.13/drivers/ata/pata_it8213.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_it8213.c	2010-05-15 13:21:14.498954899 -0400
-@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
+diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c
+index 4d142a2..9c78bee 100644
+--- a/drivers/ata/pata_it8213.c
++++ b/drivers/ata/pata_it8213.c
+@@ -233,7 +233,7 @@ static struct scsi_host_template it8213_sht = {
  };
  
  
@@ -20954,10 +21970,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_it8213.c linux-2.6.32.13/drivers/ata
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= it8213_cable_detect,
  	.set_piomode		= it8213_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_it821x.c linux-2.6.32.13/drivers/ata/pata_it821x.c
---- linux-2.6.32.13/drivers/ata/pata_it821x.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_it821x.c	2010-05-15 13:21:14.498954899 -0400
-@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
+diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
+index bf88f71..c690096 100644
+--- a/drivers/ata/pata_it821x.c
++++ b/drivers/ata/pata_it821x.c
+@@ -801,7 +801,7 @@ static struct scsi_host_template it821x_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20966,7 +21983,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_it821x.c linux-2.6.32.13/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  
  	.check_atapi_dma= it821x_check_atapi_dma,
-@@ -814,7 +814,7 @@ static struct ata_port_operations it821x
+@@ -815,7 +815,7 @@ static struct ata_port_operations it821x_smart_port_ops = {
  	.port_start	= it821x_port_start,
  };
  
@@ -20975,7 +21992,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_it821x.c linux-2.6.32.13/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  
  	.check_atapi_dma= it821x_check_atapi_dma,
-@@ -830,7 +830,7 @@ static struct ata_port_operations it821x
+@@ -831,7 +831,7 @@ static struct ata_port_operations it821x_passthru_port_ops = {
  	.port_start	= it821x_port_start,
  };
  
@@ -20984,10 +22001,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_it821x.c linux-2.6.32.13/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  
  	.check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c	2010-05-15 13:21:14.498954899 -0400
-@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
+diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
+index ba54b08..4b952b7 100644
+--- a/drivers/ata/pata_ixp4xx_cf.c
++++ b/drivers/ata/pata_ixp4xx_cf.c
+@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -20996,10 +22014,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.13/drivers/
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ixp4xx_mmio_data_xfer,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_jmicron.c linux-2.6.32.13/drivers/ata/pata_jmicron.c
---- linux-2.6.32.13/drivers/ata/pata_jmicron.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_jmicron.c	2010-05-15 13:21:14.502920623 -0400
-@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
+diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
+index cb3babb..6770bd8 100644
+--- a/drivers/ata/pata_jmicron.c
++++ b/drivers/ata/pata_jmicron.c
+@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21008,10 +22027,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_jmicron.c linux-2.6.32.13/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.prereset		= jmicron_pre_reset,
  };
-diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata/pata_legacy.c
---- linux-2.6.32.13/drivers/ata/pata_legacy.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_legacy.c	2010-05-15 13:21:14.502920623 -0400
-@@ -106,7 +106,7 @@ struct legacy_probe {
+diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
+index 9df1ff7..b570efd 100644
+--- a/drivers/ata/pata_legacy.c
++++ b/drivers/ata/pata_legacy.c
+@@ -113,7 +113,7 @@ struct legacy_probe {
  
  struct legacy_controller {
  	const char *name;
@@ -21020,7 +22040,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata
  	unsigned int pio_mask;
  	unsigned int flags;
  	unsigned int pflags;
-@@ -223,12 +223,12 @@ static const struct ata_port_operations 
+@@ -230,12 +230,12 @@ static const struct ata_port_operations legacy_base_port_ops = {
   *	pio_mask as well.
   */
  
@@ -21035,7 +22055,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata
  	.inherits	= &legacy_base_port_ops,
  	.sff_data_xfer	= ata_sff_data_xfer_noirq,
  	.set_mode	= legacy_set_mode,
-@@ -324,7 +324,7 @@ static unsigned int pdc_data_xfer_vlb(st
+@@ -331,7 +331,7 @@ static unsigned int pdc_data_xfer_vlb(struct ata_device *dev,
  	return buflen;
  }
  
@@ -21044,7 +22064,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata
  	.inherits	= &legacy_base_port_ops,
  	.set_piomode	= pdc20230_set_piomode,
  	.sff_data_xfer	= pdc_data_xfer_vlb,
-@@ -357,7 +357,7 @@ static void ht6560a_set_piomode(struct a
+@@ -364,7 +364,7 @@ static void ht6560a_set_piomode(struct ata_port *ap, struct ata_device *adev)
  	ioread8(ap->ioaddr.status_addr);
  }
  
@@ -21053,7 +22073,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata
  	.inherits	= &legacy_base_port_ops,
  	.set_piomode	= ht6560a_set_piomode,
  };
-@@ -400,7 +400,7 @@ static void ht6560b_set_piomode(struct a
+@@ -407,7 +407,7 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev)
  	ioread8(ap->ioaddr.status_addr);
  }
  
@@ -21062,7 +22082,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata
  	.inherits	= &legacy_base_port_ops,
  	.set_piomode	= ht6560b_set_piomode,
  };
-@@ -499,7 +499,7 @@ static void opti82c611a_set_piomode(stru
+@@ -506,7 +506,7 @@ static void opti82c611a_set_piomode(struct ata_port *ap,
  }
  
  
@@ -21071,7 +22091,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata
  	.inherits	= &legacy_base_port_ops,
  	.set_piomode	= opti82c611a_set_piomode,
  };
-@@ -609,7 +609,7 @@ static unsigned int opti82c46x_qc_issue(
+@@ -616,7 +616,7 @@ static unsigned int opti82c46x_qc_issue(struct ata_queued_cmd *qc)
  	return ata_sff_qc_issue(qc);
  }
  
@@ -21080,7 +22100,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata
  	.inherits	= &legacy_base_port_ops,
  	.set_piomode	= opti82c46x_set_piomode,
  	.qc_issue	= opti82c46x_qc_issue,
-@@ -771,20 +771,20 @@ static int qdi_port(struct platform_devi
+@@ -778,20 +778,20 @@ static int qdi_port(struct platform_device *dev,
  	return 0;
  }
  
@@ -21103,8 +22123,8 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata
 +static const struct ata_port_operations qdi6580dp_port_ops = {
  	.inherits	= &legacy_base_port_ops,
  	.set_piomode	= qdi6580dp_set_piomode,
- 	.sff_data_xfer	= vlb32_data_xfer,
-@@ -855,7 +855,7 @@ static int winbond_port(struct platform_
+ 	.qc_issue	= qdi_qc_issue,
+@@ -863,7 +863,7 @@ static int winbond_port(struct platform_device *dev,
  	return 0;
  }
  
@@ -21113,7 +22133,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata
  	.inherits	= &legacy_base_port_ops,
  	.set_piomode	= winbond_set_piomode,
  	.sff_data_xfer	= vlb32_data_xfer,
-@@ -978,7 +978,7 @@ static __init int legacy_init_one(struct
+@@ -986,7 +986,7 @@ static __init int legacy_init_one(struct legacy_probe *probe)
  	int pio_modes = controller->pio_mask;
  	unsigned long io = probe->port;
  	u32 mask = (1 << probe->slot);
@@ -21122,10 +22142,26 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata
  	struct legacy_data *ld = &legacy_data[probe->slot];
  	struct ata_host *host = NULL;
  	struct ata_port *ap;
-diff -urNp linux-2.6.32.13/drivers/ata/pata_marvell.c linux-2.6.32.13/drivers/ata/pata_marvell.c
---- linux-2.6.32.13/drivers/ata/pata_marvell.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_marvell.c	2010-05-15 13:21:14.502920623 -0400
-@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
+diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
+index 75b49d0..9fa605b 100644
+--- a/drivers/ata/pata_macio.c
++++ b/drivers/ata/pata_macio.c
+@@ -918,9 +918,8 @@ static struct scsi_host_template pata_macio_sht = {
+ 	.slave_configure	= pata_macio_slave_config,
+ };
+ 
+-static struct ata_port_operations pata_macio_ops = {
++static const struct ata_port_operations pata_macio_ops = {
+ 	.inherits		= &ata_bmdma_port_ops,
+-
+ 	.freeze			= pata_macio_freeze,
+ 	.set_piomode		= pata_macio_set_timings,
+ 	.set_dmamode		= pata_macio_set_timings,
+diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
+index dd38083..b73db04 100644
+--- a/drivers/ata/pata_marvell.c
++++ b/drivers/ata/pata_marvell.c
+@@ -100,7 +100,7 @@ static struct scsi_host_template marvell_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21134,10 +22170,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_marvell.c linux-2.6.32.13/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= marvell_cable_detect,
  	.prereset		= marvell_pre_reset,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_mpc52xx.c linux-2.6.32.13/drivers/ata/pata_mpc52xx.c
---- linux-2.6.32.13/drivers/ata/pata_mpc52xx.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_mpc52xx.c	2010-05-15 13:21:14.515739682 -0400
-@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
+diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
+index f087ab5..8074223 100644
+--- a/drivers/ata/pata_mpc52xx.c
++++ b/drivers/ata/pata_mpc52xx.c
+@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx_ata_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -21146,10 +22183,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_mpc52xx.c linux-2.6.32.13/drivers/at
  	.inherits		= &ata_sff_port_ops,
  	.sff_dev_select		= mpc52xx_ata_dev_select,
  	.set_piomode		= mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_mpiix.c linux-2.6.32.13/drivers/ata/pata_mpiix.c
---- linux-2.6.32.13/drivers/ata/pata_mpiix.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_mpiix.c	2010-05-15 13:21:14.515739682 -0400
-@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
+diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
+index b21f002..0a27e7f 100644
+--- a/drivers/ata/pata_mpiix.c
++++ b/drivers/ata/pata_mpiix.c
+@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -21158,10 +22196,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_mpiix.c linux-2.6.32.13/drivers/ata/
  	.inherits	= &ata_sff_port_ops,
  	.qc_issue	= mpiix_qc_issue,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_netcell.c linux-2.6.32.13/drivers/ata/pata_netcell.c
---- linux-2.6.32.13/drivers/ata/pata_netcell.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_netcell.c	2010-05-15 13:21:14.515739682 -0400
-@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
+diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
+index 3eb921c..c167317 100644
+--- a/drivers/ata/pata_netcell.c
++++ b/drivers/ata/pata_netcell.c
+@@ -34,7 +34,7 @@ static struct scsi_host_template netcell_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21170,10 +22209,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_netcell.c linux-2.6.32.13/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_80wire,
  	.read_id	= netcell_read_id,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_ninja32.c linux-2.6.32.13/drivers/ata/pata_ninja32.c
---- linux-2.6.32.13/drivers/ata/pata_ninja32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_ninja32.c	2010-05-15 13:21:14.515739682 -0400
-@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
+diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
+index cc50bd0..123fe21 100644
+--- a/drivers/ata/pata_ninja32.c
++++ b/drivers/ata/pata_ninja32.c
+@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21182,10 +22222,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ninja32.c linux-2.6.32.13/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.sff_dev_select = ninja32_dev_select,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87410.c linux-2.6.32.13/drivers/ata/pata_ns87410.c
---- linux-2.6.32.13/drivers/ata/pata_ns87410.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_ns87410.c	2010-05-15 13:21:14.515739682 -0400
-@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
+diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
+index 2110863..6144b43 100644
+--- a/drivers/ata/pata_ns87410.c
++++ b/drivers/ata/pata_ns87410.c
+@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -21194,10 +22235,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87410.c linux-2.6.32.13/drivers/at
  	.inherits	= &ata_sff_port_ops,
  	.qc_issue	= ns87410_qc_issue,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87415.c linux-2.6.32.13/drivers/ata/pata_ns87415.c
---- linux-2.6.32.13/drivers/ata/pata_ns87415.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_ns87415.c	2010-05-15 13:21:14.515739682 -0400
-@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
+diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
+index 605f198..f5fee2f 100644
+--- a/drivers/ata/pata_ns87415.c
++++ b/drivers/ata/pata_ns87415.c
+@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct ata_port *ap)
  }
  #endif		/* 87560 SuperIO Support */
  
@@ -21206,7 +22248,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87415.c linux-2.6.32.13/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  
  	.check_atapi_dma	= ns87415_check_atapi_dma,
-@@ -313,7 +313,7 @@ static struct ata_port_operations ns8741
+@@ -313,7 +313,7 @@ static struct ata_port_operations ns87415_pata_ops = {
  };
  
  #if defined(CONFIG_SUPERIO)
@@ -21215,10 +22257,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87415.c linux-2.6.32.13/drivers/at
  	.inherits		= &ns87415_pata_ops,
  	.sff_tf_read		= ns87560_tf_read,
  	.sff_check_status	= ns87560_check_status,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_octeon_cf.c linux-2.6.32.13/drivers/ata/pata_octeon_cf.c
---- linux-2.6.32.13/drivers/ata/pata_octeon_cf.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_octeon_cf.c	2010-05-15 13:21:14.515739682 -0400
-@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
+diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
+index 06ddd91..1d28cb6 100644
+--- a/drivers/ata/pata_octeon_cf.c
++++ b/drivers/ata/pata_octeon_cf.c
+@@ -782,6 +782,7 @@ static unsigned int octeon_cf_qc_issue(struct ata_queued_cmd *qc)
  	return 0;
  }
  
@@ -21226,10 +22269,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_octeon_cf.c linux-2.6.32.13/drivers/
  static struct ata_port_operations octeon_cf_ops = {
  	.inherits		= &ata_sff_port_ops,
  	.check_atapi_dma	= octeon_cf_check_atapi_dma,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_oldpiix.c linux-2.6.32.13/drivers/ata/pata_oldpiix.c
---- linux-2.6.32.13/drivers/ata/pata_oldpiix.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_oldpiix.c	2010-05-15 13:21:14.515739682 -0400
-@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
+diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
+index b811c16..e23051e 100644
+--- a/drivers/ata/pata_oldpiix.c
++++ b/drivers/ata/pata_oldpiix.c
+@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21238,10 +22282,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_oldpiix.c linux-2.6.32.13/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_issue		= oldpiix_qc_issue,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_opti.c linux-2.6.32.13/drivers/ata/pata_opti.c
---- linux-2.6.32.13/drivers/ata/pata_opti.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_opti.c	2010-05-15 13:21:14.515739682 -0400
-@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
+diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
+index 00c5a02..b486a97 100644
+--- a/drivers/ata/pata_opti.c
++++ b/drivers/ata/pata_opti.c
+@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -21250,10 +22295,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_opti.c linux-2.6.32.13/drivers/ata/p
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= opti_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_optidma.c linux-2.6.32.13/drivers/ata/pata_optidma.c
---- linux-2.6.32.13/drivers/ata/pata_optidma.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_optidma.c	2010-05-15 13:21:14.518593102 -0400
-@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
+diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
+index 0852cd0..62f6a68 100644
+--- a/drivers/ata/pata_optidma.c
++++ b/drivers/ata/pata_optidma.c
+@@ -337,7 +337,7 @@ static struct scsi_host_template optidma_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21262,7 +22308,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_optidma.c linux-2.6.32.13/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= optidma_set_pio_mode,
-@@ -346,7 +346,7 @@ static struct ata_port_operations optidm
+@@ -346,7 +346,7 @@ static struct ata_port_operations optidma_port_ops = {
  	.prereset	= optidma_pre_reset,
  };
  
@@ -21271,10 +22317,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_optidma.c linux-2.6.32.13/drivers/at
  	.inherits	= &optidma_port_ops,
  	.set_piomode	= optiplus_set_pio_mode,
  	.set_dmamode	= optiplus_set_dma_mode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_palmld.c linux-2.6.32.13/drivers/ata/pata_palmld.c
---- linux-2.6.32.13/drivers/ata/pata_palmld.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_palmld.c	2010-05-15 13:21:14.518593102 -0400
-@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
+diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c
+index 11fb4cc..1a14022 100644
+--- a/drivers/ata/pata_palmld.c
++++ b/drivers/ata/pata_palmld.c
+@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -21283,10 +22330,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_palmld.c linux-2.6.32.13/drivers/ata
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ata_sff_data_xfer_noirq,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_pcmcia.c linux-2.6.32.13/drivers/ata/pata_pcmcia.c
---- linux-2.6.32.13/drivers/ata/pata_pcmcia.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_pcmcia.c	2010-05-15 13:21:14.522920519 -0400
-@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
+diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
+index 118c28e..e025309 100644
+--- a/drivers/ata/pata_pcmcia.c
++++ b/drivers/ata/pata_pcmcia.c
+@@ -153,14 +153,14 @@ static struct scsi_host_template pcmcia_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -21303,19 +22351,20 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_pcmcia.c linux-2.6.32.13/drivers/ata
  	.inherits	= &ata_sff_port_ops,
  	.sff_data_xfer	= ata_data_xfer_8bit,
  	.cable_detect	= ata_cable_40wire,
-@@ -256,7 +256,7 @@ static int pcmcia_init_one(struct pcmcia
+@@ -243,7 +243,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
  	unsigned long io_base, ctl_base;
  	void __iomem *io_addr, *ctl_addr;
  	int n_ports = 1;
 -	struct ata_port_operations *ops = &pcmcia_port_ops;
 +	const struct ata_port_operations *ops = &pcmcia_port_ops;
  
- 	info = kzalloc(sizeof(*info), GFP_KERNEL);
- 	if (info == NULL)
-diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc2027x.c linux-2.6.32.13/drivers/ata/pata_pdc2027x.c
---- linux-2.6.32.13/drivers/ata/pata_pdc2027x.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_pdc2027x.c	2010-05-15 13:21:14.522920519 -0400
-@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
+ 	/* Set up attributes in order to probe card and get resources */
+ 	pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
+index b183511..c3ee285 100644
+--- a/drivers/ata/pata_pdc2027x.c
++++ b/drivers/ata/pata_pdc2027x.c
+@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027x_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21332,10 +22381,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc2027x.c linux-2.6.32.13/drivers/a
  	.inherits		= &pdc2027x_pata100_ops,
  	.mode_filter		= pdc2027x_mode_filter,
  	.set_piomode		= pdc2027x_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c	2010-05-15 13:21:14.522920519 -0400
-@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
+diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
+index c39f213..13968a7 100644
+--- a/drivers/ata/pata_pdc202xx_old.c
++++ b/drivers/ata/pata_pdc202xx_old.c
+@@ -274,7 +274,7 @@ static struct scsi_host_template pdc202xx_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21344,8 +22394,8 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.13/drive
  	.inherits		= &ata_bmdma_port_ops,
  
  	.cable_detect		= ata_cable_40wire,
-@@ -273,7 +273,7 @@ static struct ata_port_operations pdc202
- 	.set_dmamode		= pdc202xx_set_dmamode,
+@@ -284,7 +284,7 @@ static struct ata_port_operations pdc2024x_port_ops = {
+ 	.sff_exec_command	= pdc202xx_exec_command,
  };
  
 -static struct ata_port_operations pdc2026x_port_ops = {
@@ -21353,10 +22403,24 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.13/drive
  	.inherits		= &pdc2024x_port_ops,
  
  	.check_atapi_dma	= pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_platform.c linux-2.6.32.13/drivers/ata/pata_platform.c
---- linux-2.6.32.13/drivers/ata/pata_platform.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_platform.c	2010-05-15 13:21:14.522920519 -0400
-@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
+diff --git a/drivers/ata/pata_piccolo.c b/drivers/ata/pata_piccolo.c
+index cb01bf9..3eb315d 100644
+--- a/drivers/ata/pata_piccolo.c
++++ b/drivers/ata/pata_piccolo.c
+@@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sht = {
+ 	ATA_BMDMA_SHT(DRV_NAME),
+ };
+ 
+-static struct ata_port_operations tosh_port_ops = {
++static const struct ata_port_operations tosh_port_ops = {
+ 	.inherits	= &ata_bmdma_port_ops,
+ 	.cable_detect	= ata_cable_unknown,
+ 	.set_piomode	= tosh_set_piomode,
+diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
+index 50400fa..8af063f 100644
+--- a/drivers/ata/pata_platform.c
++++ b/drivers/ata/pata_platform.c
+@@ -48,7 +48,7 @@ static struct scsi_host_template pata_platform_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -21365,10 +22429,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_platform.c linux-2.6.32.13/drivers/a
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ata_sff_data_xfer_noirq,
  	.cable_detect		= ata_cable_unknown,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_qdi.c linux-2.6.32.13/drivers/ata/pata_qdi.c
---- linux-2.6.32.13/drivers/ata/pata_qdi.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_qdi.c	2010-05-15 13:21:14.526754945 -0400
-@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
+diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
+index 45879dc..165a9f9 100644
+--- a/drivers/ata/pata_qdi.c
++++ b/drivers/ata/pata_qdi.c
+@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -21377,7 +22442,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_qdi.c linux-2.6.32.13/drivers/ata/pa
  	.inherits	= &ata_sff_port_ops,
  	.qc_issue	= qdi_qc_issue,
  	.sff_data_xfer	= qdi_data_xfer,
-@@ -165,7 +165,7 @@ static struct ata_port_operations qdi650
+@@ -165,7 +165,7 @@ static struct ata_port_operations qdi6500_port_ops = {
  	.set_piomode	= qdi6500_set_piomode,
  };
  
@@ -21386,10 +22451,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_qdi.c linux-2.6.32.13/drivers/ata/pa
  	.inherits	= &qdi6500_port_ops,
  	.set_piomode	= qdi6580_set_piomode,
  };
-diff -urNp linux-2.6.32.13/drivers/ata/pata_radisys.c linux-2.6.32.13/drivers/ata/pata_radisys.c
---- linux-2.6.32.13/drivers/ata/pata_radisys.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_radisys.c	2010-05-15 13:21:14.526754945 -0400
-@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
+diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
+index 8574b31..53789fe 100644
+--- a/drivers/ata/pata_radisys.c
++++ b/drivers/ata/pata_radisys.c
+@@ -187,7 +187,7 @@ static struct scsi_host_template radisys_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21398,10 +22464,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_radisys.c linux-2.6.32.13/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_issue		= radisys_qc_issue,
  	.cable_detect		= ata_cable_unknown,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_rb532_cf.c linux-2.6.32.13/drivers/ata/pata_rb532_cf.c
---- linux-2.6.32.13/drivers/ata/pata_rb532_cf.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_rb532_cf.c	2010-05-15 13:21:14.526754945 -0400
-@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
+diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
+index 0ffd631..7c6c78d 100644
+--- a/drivers/ata/pata_rb532_cf.c
++++ b/drivers/ata/pata_rb532_cf.c
+@@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handler(int irq, void *dev_instance)
  	return IRQ_HANDLED;
  }
  
@@ -21410,10 +22477,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_rb532_cf.c linux-2.6.32.13/drivers/a
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ata_sff_data_xfer32,
  };
-diff -urNp linux-2.6.32.13/drivers/ata/pata_rdc.c linux-2.6.32.13/drivers/ata/pata_rdc.c
---- linux-2.6.32.13/drivers/ata/pata_rdc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_rdc.c	2010-05-15 13:21:14.530928469 -0400
-@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
+diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c
+index 5fbe9b1..1d0cdc0 100644
+--- a/drivers/ata/pata_rdc.c
++++ b/drivers/ata/pata_rdc.c
+@@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_port *ap, struct ata_device *adev)
  	pci_write_config_byte(dev, 0x48, udma_enable);
  }
  
@@ -21422,10 +22490,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_rdc.c linux-2.6.32.13/drivers/ata/pa
  	.inherits		= &ata_bmdma32_port_ops,
  	.cable_detect		= rdc_pata_cable_detect,
  	.set_piomode		= rdc_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_rz1000.c linux-2.6.32.13/drivers/ata/pata_rz1000.c
---- linux-2.6.32.13/drivers/ata/pata_rz1000.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_rz1000.c	2010-05-15 13:21:14.530928469 -0400
-@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
+diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
+index 4a454a8..b95ac1a 100644
+--- a/drivers/ata/pata_rz1000.c
++++ b/drivers/ata/pata_rz1000.c
+@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -21434,22 +22503,24 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_rz1000.c linux-2.6.32.13/drivers/ata
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_mode	= rz1000_set_mode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_sc1200.c linux-2.6.32.13/drivers/ata/pata_sc1200.c
---- linux-2.6.32.13/drivers/ata/pata_sc1200.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_sc1200.c	2010-05-15 13:21:14.530928469 -0400
-@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
+diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
+index e2c1825..9b54b46 100644
+--- a/drivers/ata/pata_sc1200.c
++++ b/drivers/ata/pata_sc1200.c
+@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_sht = {
  	.sg_tablesize	= LIBATA_DUMB_MAX_PRD,
  };
  
 -static struct ata_port_operations sc1200_port_ops = {
 +static const struct ata_port_operations sc1200_port_ops = {
  	.inherits	= &ata_bmdma_port_ops,
- 	.qc_prep 	= ata_sff_dumb_qc_prep,
+ 	.qc_prep 	= ata_bmdma_dumb_qc_prep,
  	.qc_issue	= sc1200_qc_issue,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_scc.c linux-2.6.32.13/drivers/ata/pata_scc.c
---- linux-2.6.32.13/drivers/ata/pata_scc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_scc.c	2010-05-15 13:21:14.530928469 -0400
-@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
+diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
+index d9db3f8..30b8b63 100644
+--- a/drivers/ata/pata_scc.c
++++ b/drivers/ata/pata_scc.c
+@@ -927,7 +927,7 @@ static struct scsi_host_template scc_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21458,10 +22529,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_scc.c linux-2.6.32.13/drivers/ata/pa
  	.inherits		= &ata_bmdma_port_ops,
  
  	.set_piomode		= scc_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_sch.c linux-2.6.32.13/drivers/ata/pata_sch.c
---- linux-2.6.32.13/drivers/ata/pata_sch.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_sch.c	2010-05-15 13:21:14.534836180 -0400
-@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
+diff --git a/drivers/ata/pata_sch.c b/drivers/ata/pata_sch.c
+index e97b32f..464f5a5 100644
+--- a/drivers/ata/pata_sch.c
++++ b/drivers/ata/pata_sch.c
+@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21470,10 +22542,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sch.c linux-2.6.32.13/drivers/ata/pa
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= ata_cable_unknown,
  	.set_piomode		= sch_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_serverworks.c linux-2.6.32.13/drivers/ata/pata_serverworks.c
---- linux-2.6.32.13/drivers/ata/pata_serverworks.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_serverworks.c	2010-05-15 13:21:14.534836180 -0400
-@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
+diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
+index 86dd714..ac4a72d 100644
+--- a/drivers/ata/pata_serverworks.c
++++ b/drivers/ata/pata_serverworks.c
+@@ -300,7 +300,7 @@ static struct scsi_host_template serverworks_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21482,7 +22555,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_serverworks.c linux-2.6.32.13/driver
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= serverworks_cable_detect,
  	.mode_filter	= serverworks_osb4_filter,
-@@ -307,7 +307,7 @@ static struct ata_port_operations server
+@@ -308,7 +308,7 @@ static struct ata_port_operations serverworks_osb4_port_ops = {
  	.set_dmamode	= serverworks_set_dmamode,
  };
  
@@ -21491,22 +22564,25 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_serverworks.c linux-2.6.32.13/driver
  	.inherits	= &serverworks_osb4_port_ops,
  	.mode_filter	= serverworks_csb_filter,
  };
-diff -urNp linux-2.6.32.13/drivers/ata/pata_sil680.c linux-2.6.32.13/drivers/ata/pata_sil680.c
---- linux-2.6.32.13/drivers/ata/pata_sil680.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_sil680.c	2010-05-15 13:21:14.538682329 -0400
-@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
+diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
+index d3190d7..68dc724 100644
+--- a/drivers/ata/pata_sil680.c
++++ b/drivers/ata/pata_sil680.c
+@@ -214,8 +214,7 @@ static struct scsi_host_template sil680_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
+-
 -static struct ata_port_operations sil680_port_ops = {
 +static const struct ata_port_operations sil680_port_ops = {
- 	.inherits	= &ata_bmdma32_port_ops,
- 	.cable_detect	= sil680_cable_detect,
- 	.set_piomode	= sil680_set_piomode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_sis.c linux-2.6.32.13/drivers/ata/pata_sis.c
---- linux-2.6.32.13/drivers/ata/pata_sis.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_sis.c	2010-05-15 13:21:14.538682329 -0400
-@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
+ 	.inherits		= &ata_bmdma32_port_ops,
+ 	.sff_exec_command	= sil680_sff_exec_command,
+ 	.cable_detect		= sil680_cable_detect,
+diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
+index 60cea13..048e50e 100644
+--- a/drivers/ata/pata_sis.c
++++ b/drivers/ata/pata_sis.c
+@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21561,10 +22637,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sis.c linux-2.6.32.13/drivers/ata/pa
  	.inherits		= &sis_base_ops,
  	.set_piomode		= sis_old_set_piomode,
  	.set_dmamode		= sis_old_set_dmamode,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_sl82c105.c linux-2.6.32.13/drivers/ata/pata_sl82c105.c
---- linux-2.6.32.13/drivers/ata/pata_sl82c105.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_sl82c105.c	2010-05-15 13:21:14.538682329 -0400
-@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
+diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
+index 98548f6..1939a5f 100644
+--- a/drivers/ata/pata_sl82c105.c
++++ b/drivers/ata/pata_sl82c105.c
+@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c105_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21573,10 +22650,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sl82c105.c linux-2.6.32.13/drivers/a
  	.inherits	= &ata_bmdma_port_ops,
  	.qc_defer	= sl82c105_qc_defer,
  	.bmdma_start 	= sl82c105_bmdma_start,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_triflex.c linux-2.6.32.13/drivers/ata/pata_triflex.c
---- linux-2.6.32.13/drivers/ata/pata_triflex.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_triflex.c	2010-05-15 13:21:14.538682329 -0400
-@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
+diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
+index 0d1f89e..581bdb1 100644
+--- a/drivers/ata/pata_triflex.c
++++ b/drivers/ata/pata_triflex.c
+@@ -178,7 +178,7 @@ static struct scsi_host_template triflex_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21585,10 +22663,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_triflex.c linux-2.6.32.13/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.bmdma_start 	= triflex_bmdma_start,
  	.bmdma_stop	= triflex_bmdma_stop,
-diff -urNp linux-2.6.32.13/drivers/ata/pata_via.c linux-2.6.32.13/drivers/ata/pata_via.c
---- linux-2.6.32.13/drivers/ata/pata_via.c	2010-04-29 17:49:37.709698369 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_via.c	2010-05-15 13:21:14.538682329 -0400
-@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
+diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
+index ac8d7d9..9d02ee8 100644
+--- a/drivers/ata/pata_via.c
++++ b/drivers/ata/pata_via.c
+@@ -441,7 +441,7 @@ static struct scsi_host_template via_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21597,8 +22676,8 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_via.c linux-2.6.32.13/drivers/ata/pa
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= via_cable_detect,
  	.set_piomode	= via_set_piomode,
-@@ -429,7 +429,7 @@ static struct ata_port_operations via_po
- 	.port_start	= via_port_start,
+@@ -452,7 +452,7 @@ static struct ata_port_operations via_port_ops = {
+ 	.mode_filter	= via_mode_filter,
  };
  
 -static struct ata_port_operations via_port_ops_noirq = {
@@ -21606,10 +22685,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_via.c linux-2.6.32.13/drivers/ata/pa
  	.inherits	= &via_port_ops,
  	.sff_data_xfer	= ata_sff_data_xfer_noirq,
  };
-diff -urNp linux-2.6.32.13/drivers/ata/pata_winbond.c linux-2.6.32.13/drivers/ata/pata_winbond.c
---- linux-2.6.32.13/drivers/ata/pata_winbond.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pata_winbond.c	2010-05-15 13:21:14.538682329 -0400
-@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
+diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
+index 6d8619b..ad511c4 100644
+--- a/drivers/ata/pata_winbond.c
++++ b/drivers/ata/pata_winbond.c
+@@ -125,7 +125,7 @@ static struct scsi_host_template winbond_sht = {
  	ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -21618,10 +22698,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_winbond.c linux-2.6.32.13/drivers/at
  	.inherits	= &ata_sff_port_ops,
  	.sff_data_xfer	= winbond_data_xfer,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.32.13/drivers/ata/pdc_adma.c linux-2.6.32.13/drivers/ata/pdc_adma.c
---- linux-2.6.32.13/drivers/ata/pdc_adma.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/pdc_adma.c	2010-05-15 13:21:14.538682329 -0400
-@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
+diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
+index adbe042..c13c7b7 100644
+--- a/drivers/ata/pdc_adma.c
++++ b/drivers/ata/pdc_adma.c
+@@ -146,7 +146,7 @@ static struct scsi_host_template adma_ata_sht = {
  	.dma_boundary		= ADMA_DMA_BOUNDARY,
  };
  
@@ -21630,10 +22711,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/pdc_adma.c linux-2.6.32.13/drivers/ata/pd
  	.inherits		= &ata_sff_port_ops,
  
  	.lost_interrupt		= ATA_OP_NULL,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_fsl.c linux-2.6.32.13/drivers/ata/sata_fsl.c
---- linux-2.6.32.13/drivers/ata/sata_fsl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_fsl.c	2010-05-15 13:21:14.542941562 -0400
-@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
+diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
+index 61c89b5..b92a38a 100644
+--- a/drivers/ata/sata_fsl.c
++++ b/drivers/ata/sata_fsl.c
+@@ -1261,7 +1261,7 @@ static struct scsi_host_template sata_fsl_sht = {
  	.dma_boundary = ATA_DMA_BOUNDARY,
  };
  
@@ -21642,10 +22724,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_fsl.c linux-2.6.32.13/drivers/ata/sa
  	.inherits		= &sata_pmp_port_ops,
  
  	.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_inic162x.c linux-2.6.32.13/drivers/ata/sata_inic162x.c
---- linux-2.6.32.13/drivers/ata/sata_inic162x.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_inic162x.c	2010-05-15 13:21:14.542941562 -0400
-@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
+diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
+index a36149e..645288b 100644
+--- a/drivers/ata/sata_inic162x.c
++++ b/drivers/ata/sata_inic162x.c
+@@ -705,7 +705,7 @@ static int inic_port_start(struct ata_port *ap)
  	return 0;
  }
  
@@ -21654,10 +22737,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_inic162x.c linux-2.6.32.13/drivers/a
  	.inherits		= &sata_port_ops,
  
  	.check_atapi_dma	= inic_check_atapi_dma,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_mv.c linux-2.6.32.13/drivers/ata/sata_mv.c
---- linux-2.6.32.13/drivers/ata/sata_mv.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_mv.c	2010-05-15 13:21:14.567430978 -0400
-@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
+diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
+index d57f6eb..d14b001 100644
+--- a/drivers/ata/sata_mv.c
++++ b/drivers/ata/sata_mv.c
+@@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht = {
  	.dma_boundary		= MV_DMA_BOUNDARY,
  };
  
@@ -21666,17 +22750,17 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_mv.c linux-2.6.32.13/drivers/ata/sat
  	.inherits		= &ata_sff_port_ops,
  
  	.lost_interrupt		= ATA_OP_NULL,
-@@ -678,7 +678,7 @@ static struct ata_port_operations mv5_op
+@@ -683,7 +683,7 @@ static struct ata_port_operations mv5_ops = {
  	.port_stop		= mv_port_stop,
  };
  
 -static struct ata_port_operations mv6_ops = {
 +static const struct ata_port_operations mv6_ops = {
- 	.inherits		= &mv5_ops,
- 	.dev_config             = mv6_dev_config,
- 	.scr_read		= mv_scr_read,
-@@ -698,7 +698,7 @@ static struct ata_port_operations mv6_op
- 	.bmdma_status		= mv_bmdma_status,
+ 	.inherits		= &ata_bmdma_port_ops,
+ 
+ 	.lost_interrupt		= ATA_OP_NULL,
+@@ -717,7 +717,7 @@ static struct ata_port_operations mv6_ops = {
+ 	.port_stop		= mv_port_stop,
  };
  
 -static struct ata_port_operations mv_iie_ops = {
@@ -21684,10 +22768,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_mv.c linux-2.6.32.13/drivers/ata/sat
  	.inherits		= &mv6_ops,
  	.dev_config		= ATA_OP_NULL,
  	.qc_prep		= mv_qc_prep_iie,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_nv.c linux-2.6.32.13/drivers/ata/sata_nv.c
---- linux-2.6.32.13/drivers/ata/sata_nv.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_nv.c	2010-05-15 13:21:14.570612236 -0400
-@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
+diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
+index 2116113..7441a40 100644
+--- a/drivers/ata/sata_nv.c
++++ b/drivers/ata/sata_nv.c
+@@ -465,7 +465,7 @@ static struct scsi_host_template nv_swncq_sht = {
   * cases.  Define nv_hardreset() which only kicks in for post-boot
   * probing and use it for all variants.
   */
@@ -21696,7 +22781,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_nv.c linux-2.6.32.13/drivers/ata/sat
  	.inherits		= &ata_bmdma_port_ops,
  	.lost_interrupt		= ATA_OP_NULL,
  	.scr_read		= nv_scr_read,
-@@ -472,20 +472,20 @@ static struct ata_port_operations nv_gen
+@@ -473,20 +473,20 @@ static struct ata_port_operations nv_generic_ops = {
  	.hardreset		= nv_hardreset,
  };
  
@@ -21720,7 +22805,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_nv.c linux-2.6.32.13/drivers/ata/sat
  	.inherits		= &nv_ck804_ops,
  
  	.check_atapi_dma	= nv_adma_check_atapi_dma,
-@@ -509,7 +509,7 @@ static struct ata_port_operations nv_adm
+@@ -510,7 +510,7 @@ static struct ata_port_operations nv_adma_ops = {
  	.host_stop		= nv_adma_host_stop,
  };
  
@@ -21729,10 +22814,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_nv.c linux-2.6.32.13/drivers/ata/sat
  	.inherits		= &nv_generic_ops,
  
  	.qc_defer		= ata_std_qc_defer,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_promise.c linux-2.6.32.13/drivers/ata/sata_promise.c
---- linux-2.6.32.13/drivers/ata/sata_promise.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_promise.c	2010-05-15 13:21:14.570612236 -0400
-@@ -195,7 +195,7 @@ static const struct ata_port_operations 
+diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
+index f03ad48..4b0fc9e 100644
+--- a/drivers/ata/sata_promise.c
++++ b/drivers/ata/sata_promise.c
+@@ -196,7 +196,7 @@ static const struct ata_port_operations pdc_common_ops = {
  	.error_handler		= pdc_error_handler,
  };
  
@@ -21741,7 +22827,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_promise.c linux-2.6.32.13/drivers/at
  	.inherits		= &pdc_common_ops,
  	.cable_detect		= pdc_sata_cable_detect,
  	.freeze			= pdc_sata_freeze,
-@@ -208,14 +208,14 @@ static struct ata_port_operations pdc_sa
+@@ -209,14 +209,14 @@ static struct ata_port_operations pdc_sata_ops = {
  
  /* First-generation chips need a more restrictive ->check_atapi_dma op,
     and ->freeze/thaw that ignore the hotplug controls. */
@@ -21758,10 +22844,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_promise.c linux-2.6.32.13/drivers/at
  	.inherits		= &pdc_common_ops,
  	.cable_detect		= pdc_pata_cable_detect,
  	.freeze			= pdc_freeze,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_qstor.c linux-2.6.32.13/drivers/ata/sata_qstor.c
---- linux-2.6.32.13/drivers/ata/sata_qstor.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_qstor.c	2010-05-15 13:21:14.570612236 -0400
-@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
+diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
+index daeebf1..64fdbb8 100644
+--- a/drivers/ata/sata_qstor.c
++++ b/drivers/ata/sata_qstor.c
+@@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_sht = {
  	.dma_boundary		= QS_DMA_BOUNDARY,
  };
  
@@ -21770,22 +22857,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_qstor.c linux-2.6.32.13/drivers/ata/
  	.inherits		= &ata_sff_port_ops,
  
  	.check_atapi_dma	= qs_check_atapi_dma,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_sil24.c linux-2.6.32.13/drivers/ata/sata_sil24.c
---- linux-2.6.32.13/drivers/ata/sata_sil24.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_sil24.c	2010-05-15 13:21:14.570612236 -0400
-@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
- 	.dma_boundary		= ATA_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations sil24_ops = {
-+static const struct ata_port_operations sil24_ops = {
- 	.inherits		= &sata_pmp_port_ops,
- 
- 	.qc_defer		= sil24_qc_defer,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_sil.c linux-2.6.32.13/drivers/ata/sata_sil.c
---- linux-2.6.32.13/drivers/ata/sata_sil.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_sil.c	2010-05-15 13:21:14.570612236 -0400
-@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
+diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
+index 3a4f842..24382d6 100644
+--- a/drivers/ata/sata_sil.c
++++ b/drivers/ata/sata_sil.c
+@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht = {
  	.sg_tablesize		= ATA_MAX_PRD
  };
  
@@ -21794,10 +22870,24 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_sil.c linux-2.6.32.13/drivers/ata/sa
  	.inherits		= &ata_bmdma32_port_ops,
  	.dev_config		= sil_dev_config,
  	.set_mode		= sil_set_mode,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_sis.c linux-2.6.32.13/drivers/ata/sata_sis.c
---- linux-2.6.32.13/drivers/ata/sata_sis.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_sis.c	2010-05-15 13:21:14.578938263 -0400
-@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
+diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
+index be7726d..cbaee83 100644
+--- a/drivers/ata/sata_sil24.c
++++ b/drivers/ata/sata_sil24.c
+@@ -389,7 +389,7 @@ static struct scsi_host_template sil24_sht = {
+ 	.dma_boundary		= ATA_DMA_BOUNDARY,
+ };
+ 
+-static struct ata_port_operations sil24_ops = {
++static const struct ata_port_operations sil24_ops = {
+ 	.inherits		= &sata_pmp_port_ops,
+ 
+ 	.qc_defer		= sil24_qc_defer,
+diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
+index 2bfe3ae..c80f777 100644
+--- a/drivers/ata/sata_sis.c
++++ b/drivers/ata/sata_sis.c
+@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21806,10 +22896,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_sis.c linux-2.6.32.13/drivers/ata/sa
  	.inherits		= &ata_bmdma_port_ops,
  	.scr_read		= sis_scr_read,
  	.scr_write		= sis_scr_write,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_svw.c linux-2.6.32.13/drivers/ata/sata_svw.c
---- linux-2.6.32.13/drivers/ata/sata_svw.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_svw.c	2010-05-15 13:21:14.578938263 -0400
-@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
+diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
+index 7d9db4a..0954357 100644
+--- a/drivers/ata/sata_svw.c
++++ b/drivers/ata/sata_svw.c
+@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata_sht = {
  };
  
  
@@ -21818,10 +22909,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_svw.c linux-2.6.32.13/drivers/ata/sa
  	.inherits		= &ata_bmdma_port_ops,
  	.sff_tf_load		= k2_sata_tf_load,
  	.sff_tf_read		= k2_sata_tf_read,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_sx4.c linux-2.6.32.13/drivers/ata/sata_sx4.c
---- linux-2.6.32.13/drivers/ata/sata_sx4.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_sx4.c	2010-05-15 13:21:14.594941059 -0400
-@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
+diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
+index bedd518..feb4028 100644
+--- a/drivers/ata/sata_sx4.c
++++ b/drivers/ata/sata_sx4.c
+@@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sata_sht = {
  };
  
  /* TODO: inherit from base port_ops after converting to new EH */
@@ -21830,10 +22922,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_sx4.c linux-2.6.32.13/drivers/ata/sa
  	.inherits		= &ata_sff_port_ops,
  
  	.check_atapi_dma	= pdc_check_atapi_dma,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_uli.c linux-2.6.32.13/drivers/ata/sata_uli.c
---- linux-2.6.32.13/drivers/ata/sata_uli.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_uli.c	2010-05-15 13:21:14.594941059 -0400
-@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
+diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
+index b8578c3..41e5c92 100644
+--- a/drivers/ata/sata_uli.c
++++ b/drivers/ata/sata_uli.c
+@@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21842,10 +22935,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_uli.c linux-2.6.32.13/drivers/ata/sa
  	.inherits		= &ata_bmdma_port_ops,
  	.scr_read		= uli_scr_read,
  	.scr_write		= uli_scr_write,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_via.c linux-2.6.32.13/drivers/ata/sata_via.c
---- linux-2.6.32.13/drivers/ata/sata_via.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_via.c	2010-05-15 13:21:14.599908388 -0400
-@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
+diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
+index c51b8d2..1a305a3 100644
+--- a/drivers/ata/sata_via.c
++++ b/drivers/ata/sata_via.c
+@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21860,6 +22954,7 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_via.c linux-2.6.32.13/drivers/ata/sa
  	.inherits		= &svia_base_ops,
  	.freeze			= svia_noop_freeze,
  	.prereset		= vt6420_prereset,
+ 	.bmdma_start		= vt6420_bmdma_start,
  };
  
 -static struct ata_port_operations vt6421_pata_ops = {
@@ -21882,10 +22977,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_via.c linux-2.6.32.13/drivers/ata/sa
  	.inherits		= &svia_base_ops,
  	.hardreset		= sata_std_hardreset,
  	.scr_read		= vt8251_scr_read,
-diff -urNp linux-2.6.32.13/drivers/ata/sata_vsc.c linux-2.6.32.13/drivers/ata/sata_vsc.c
---- linux-2.6.32.13/drivers/ata/sata_vsc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ata/sata_vsc.c	2010-05-15 13:21:14.606569540 -0400
-@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
+diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
+index b777176..f39a85b 100644
+--- a/drivers/ata/sata_vsc.c
++++ b/drivers/ata/sata_vsc.c
+@@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sata_sht = {
  };
  
  
@@ -21894,10 +22990,11 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_vsc.c linux-2.6.32.13/drivers/ata/sa
  	.inherits		= &ata_bmdma_port_ops,
  	/* The IRQ handling is not quite standard SFF behaviour so we
  	   cannot use the default lost interrupt handler */
-diff -urNp linux-2.6.32.13/drivers/atm/adummy.c linux-2.6.32.13/drivers/atm/adummy.c
---- linux-2.6.32.13/drivers/atm/adummy.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/adummy.c	2010-05-15 13:21:14.606569540 -0400
-@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 
+diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
+index 6d44f07..46bd3fe 100644
+--- a/drivers/atm/adummy.c
++++ b/drivers/atm/adummy.c
+@@ -78,7 +78,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
  		vcc->pop(vcc, skb);
  	else
  		dev_kfree_skb_any(skb);
@@ -21906,10 +23003,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/adummy.c linux-2.6.32.13/drivers/atm/adum
  
  	return 0;
  }
-diff -urNp linux-2.6.32.13/drivers/atm/ambassador.c linux-2.6.32.13/drivers/atm/ambassador.c
---- linux-2.6.32.13/drivers/atm/ambassador.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/ambassador.c	2010-05-15 13:21:14.622930740 -0400
-@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 
+diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
+index 9d18644..59f2c35 100644
+--- a/drivers/atm/ambassador.c
++++ b/drivers/atm/ambassador.c
+@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
    PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
    
    // VC layer stats
@@ -21918,7 +23016,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/ambassador.c linux-2.6.32.13/drivers/atm/
    
    // free the descriptor
    kfree (tx_descr);
-@@ -494,7 +494,7 @@ static void rx_complete (amb_dev * dev, 
+@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
  	  dump_skb ("<<<", vc, skb);
  	  
  	  // VC layer stats
@@ -21927,7 +23025,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/ambassador.c linux-2.6.32.13/drivers/atm/
  	  __net_timestamp(skb);
  	  // end of our responsability
  	  atm_vcc->push (atm_vcc, skb);
-@@ -509,7 +509,7 @@ static void rx_complete (amb_dev * dev, 
+@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
        } else {
        	PRINTK (KERN_INFO, "dropped over-size frame");
  	// should we count this?
@@ -21936,7 +23034,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/ambassador.c linux-2.6.32.13/drivers/atm/
        }
        
      } else {
-@@ -1341,7 +1341,7 @@ static int amb_send (struct atm_vcc * at
+@@ -1342,7 +1342,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
    }
    
    if (check_area (skb->data, skb->len)) {
@@ -21945,10 +23043,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/ambassador.c linux-2.6.32.13/drivers/atm/
      return -ENOMEM; // ?
    }
    
-diff -urNp linux-2.6.32.13/drivers/atm/atmtcp.c linux-2.6.32.13/drivers/atm/atmtcp.c
---- linux-2.6.32.13/drivers/atm/atmtcp.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/atmtcp.c	2010-05-15 13:21:14.626657707 -0400
-@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 
+diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
+index b910181..7e24995 100644
+--- a/drivers/atm/atmtcp.c
++++ b/drivers/atm/atmtcp.c
+@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
  		if (vcc->pop) vcc->pop(vcc,skb);
  		else dev_kfree_skb(skb);
  		if (dev_data) return 0;
@@ -21957,7 +23056,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/atmtcp.c linux-2.6.32.13/drivers/atm/atmt
  		return -ENOLINK;
  	}
  	size = skb->len+sizeof(struct atmtcp_hdr);
-@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc 
+@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
  	if (!new_skb) {
  		if (vcc->pop) vcc->pop(vcc,skb);
  		else dev_kfree_skb(skb);
@@ -21966,7 +23065,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/atmtcp.c linux-2.6.32.13/drivers/atm/atmt
  		return -ENOBUFS;
  	}
  	hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
-@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc 
+@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
  	if (vcc->pop) vcc->pop(vcc,skb);
  	else dev_kfree_skb(skb);
  	out_vcc->push(out_vcc,new_skb);
@@ -21977,7 +23076,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/atmtcp.c linux-2.6.32.13/drivers/atm/atmt
  	return 0;
  }
  
-@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc 
+@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
  	out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
  	read_unlock(&vcc_sklist_lock);
  	if (!out_vcc) {
@@ -21986,7 +23085,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/atmtcp.c linux-2.6.32.13/drivers/atm/atmt
  		goto done;
  	}
  	skb_pull(skb,sizeof(struct atmtcp_hdr));
-@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc 
+@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
  	__net_timestamp(new_skb);
  	skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
  	out_vcc->push(out_vcc,new_skb);
@@ -21997,10 +23096,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/atmtcp.c linux-2.6.32.13/drivers/atm/atmt
  done:
  	if (vcc->pop) vcc->pop(vcc,skb);
  	else dev_kfree_skb(skb);
-diff -urNp linux-2.6.32.13/drivers/atm/eni.c linux-2.6.32.13/drivers/atm/eni.c
---- linux-2.6.32.13/drivers/atm/eni.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/eni.c	2010-05-15 13:21:14.634928336 -0400
-@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
+diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
+index 90a5a7c..e4a0947 100644
+--- a/drivers/atm/eni.c
++++ b/drivers/atm/eni.c
+@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
  		DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
  		    vcc->dev->number);
  		length = 0;
@@ -22009,7 +23109,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/eni.c linux-2.6.32.13/drivers/atm/eni.c
  	}
  	else {
  		length = ATM_CELL_SIZE-1; /* no HEC */
-@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
+@@ -581,7 +581,7 @@ static int rx_aal5(struct atm_vcc *vcc)
  			    size);
  		}
  		eff = length = 0;
@@ -22018,7 +23118,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/eni.c linux-2.6.32.13/drivers/atm/eni.c
  	}
  	else {
  		size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
-@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
+@@ -598,7 +598,7 @@ static int rx_aal5(struct atm_vcc *vcc)
  			    "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
  			    vcc->dev->number,vcc->vci,length,size << 2,descr);
  			length = eff = 0;
@@ -22027,7 +23127,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/eni.c linux-2.6.32.13/drivers/atm/eni.c
  		}
  	}
  	skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
-@@ -770,7 +770,7 @@ rx_dequeued++;
+@@ -771,7 +771,7 @@ rx_dequeued++;
  			vcc->push(vcc,skb);
  			pushed++;
  		}
@@ -22036,7 +23136,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/eni.c linux-2.6.32.13/drivers/atm/eni.c
  	}
  	wake_up(&eni_dev->rx_wait);
  }
-@@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *d
+@@ -1228,7 +1228,7 @@ static void dequeue_tx(struct atm_dev *dev)
  		    PCI_DMA_TODEVICE);
  		if (vcc->pop) vcc->pop(vcc,skb);
  		else dev_kfree_skb_irq(skb);
@@ -22045,10 +23145,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/eni.c linux-2.6.32.13/drivers/atm/eni.c
  		wake_up(&eni_dev->tx_wait);
  dma_complete++;
  	}
-diff -urNp linux-2.6.32.13/drivers/atm/firestream.c linux-2.6.32.13/drivers/atm/firestream.c
---- linux-2.6.32.13/drivers/atm/firestream.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/firestream.c	2010-05-15 13:21:14.647057643 -0400
-@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
+diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
+index 6e600af..9c2485b 100644
+--- a/drivers/atm/firestream.c
++++ b/drivers/atm/firestream.c
+@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
  				}
  			}
  
@@ -22057,7 +23158,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/firestream.c linux-2.6.32.13/drivers/atm/
  
  			fs_dprintk (FS_DEBUG_TXMEM, "i");
  			fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
-@@ -815,7 +815,7 @@ static void process_incoming (struct fs_
+@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
  #endif
  				skb_put (skb, qe->p1 & 0xffff); 
  				ATM_SKB(skb)->vcc = atm_vcc;
@@ -22066,7 +23167,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/firestream.c linux-2.6.32.13/drivers/atm/
  				__net_timestamp(skb);
  				fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
  				atm_vcc->push (atm_vcc, skb);
-@@ -836,12 +836,12 @@ static void process_incoming (struct fs_
+@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
  				kfree (pe);
  			}
  			if (atm_vcc)
@@ -22081,10 +23182,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/firestream.c linux-2.6.32.13/drivers/atm/
  			break;
  		default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
  			printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 
-diff -urNp linux-2.6.32.13/drivers/atm/fore200e.c linux-2.6.32.13/drivers/atm/fore200e.c
---- linux-2.6.32.13/drivers/atm/fore200e.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/fore200e.c	2010-05-15 13:21:14.676169638 -0400
-@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
+diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
+index da8f176..aa78cc6 100644
+--- a/drivers/atm/fore200e.c
++++ b/drivers/atm/fore200e.c
+@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
  #endif
  		/* check error condition */
  		if (*entry->status & STATUS_ERROR)
@@ -22096,7 +23198,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/fore200e.c linux-2.6.32.13/drivers/atm/fo
  	    }
  	}
  
-@@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore2
+@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
      if (skb == NULL) {
  	DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
  
@@ -22105,7 +23207,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/fore200e.c linux-2.6.32.13/drivers/atm/fo
  	return -ENOMEM;
      } 
  
-@@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore2
+@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
  
  	dev_kfree_skb_any(skb);
  
@@ -22122,7 +23224,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/fore200e.c linux-2.6.32.13/drivers/atm/fo
  
      ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
  
-@@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200
+@@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
  		DPRINTK(2, "damaged PDU on %d.%d.%d\n",
  			fore200e->atm_dev->number,
  			entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
@@ -22131,7 +23233,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/fore200e.c linux-2.6.32.13/drivers/atm/fo
  	    }
  	}
  
-@@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struc
+@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
  		goto retry_here;
  	    }
  
@@ -22140,10 +23242,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/fore200e.c linux-2.6.32.13/drivers/atm/fo
  
  	    fore200e->tx_sat++;
  	    DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c
---- linux-2.6.32.13/drivers/atm/he.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/he.c	2010-05-15 13:21:14.691446990 -0400
-@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
+diff --git a/drivers/atm/he.c b/drivers/atm/he.c
+index 56c2e99..73cb44b 100644
+--- a/drivers/atm/he.c
++++ b/drivers/atm/he.c
+@@ -1770,7 +1770,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
  
  		if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
  			hprintk("HBUF_ERR!  (cid 0x%x)\n", cid);
@@ -22152,7 +23255,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c
  			goto return_host_buffers;
  		}
  
-@@ -1802,7 +1802,7 @@ he_service_rbrq(struct he_dev *he_dev, i
+@@ -1803,7 +1803,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
  				RBRQ_LEN_ERR(he_dev->rbrq_head)
  							? "LEN_ERR" : "",
  							vcc->vpi, vcc->vci);
@@ -22161,7 +23264,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c
  			goto return_host_buffers;
  		}
  
-@@ -1861,7 +1861,7 @@ he_service_rbrq(struct he_dev *he_dev, i
+@@ -1862,7 +1862,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
  		vcc->push(vcc, skb);
  		spin_lock(&he_dev->global_lock);
  
@@ -22170,7 +23273,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c
  
  return_host_buffers:
  		++pdus_assembled;
-@@ -2206,7 +2206,7 @@ __enqueue_tpd(struct he_dev *he_dev, str
+@@ -2207,7 +2207,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
  					tpd->vcc->pop(tpd->vcc, tpd->skb);
  				else
  					dev_kfree_skb_any(tpd->skb);
@@ -22179,7 +23282,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c
  			}
  			pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
  			return;
-@@ -2618,7 +2618,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2619,7 +2619,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  			vcc->pop(vcc, skb);
  		else
  			dev_kfree_skb_any(skb);
@@ -22188,7 +23291,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c
  		return -EINVAL;
  	}
  
-@@ -2629,7 +2629,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2630,7 +2630,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  			vcc->pop(vcc, skb);
  		else
  			dev_kfree_skb_any(skb);
@@ -22197,7 +23300,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c
  		return -EINVAL;
  	}
  #endif
-@@ -2641,7 +2641,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2642,7 +2642,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  			vcc->pop(vcc, skb);
  		else
  			dev_kfree_skb_any(skb);
@@ -22206,7 +23309,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c
  		spin_unlock_irqrestore(&he_dev->global_lock, flags);
  		return -ENOMEM;
  	}
-@@ -2683,7 +2683,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2684,7 +2684,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  					vcc->pop(vcc, skb);
  				else
  					dev_kfree_skb_any(skb);
@@ -22215,7 +23318,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c
  				spin_unlock_irqrestore(&he_dev->global_lock, flags);
  				return -ENOMEM;
  			}
-@@ -2714,7 +2714,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2715,7 +2715,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  	__enqueue_tpd(he_dev, tpd, cid);
  	spin_unlock_irqrestore(&he_dev->global_lock, flags);
  
@@ -22224,10 +23327,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c
  
  	return 0;
  }
-diff -urNp linux-2.6.32.13/drivers/atm/horizon.c linux-2.6.32.13/drivers/atm/horizon.c
---- linux-2.6.32.13/drivers/atm/horizon.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/horizon.c	2010-05-15 13:21:14.706969618 -0400
-@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 
+diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
+index 54720ba..a1cd73f 100644
+--- a/drivers/atm/horizon.c
++++ b/drivers/atm/horizon.c
+@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
  	{
  	  struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
  	  // VC layer stats
@@ -22236,7 +23340,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/horizon.c linux-2.6.32.13/drivers/atm/hor
  	  __net_timestamp(skb);
  	  // end of our responsability
  	  vcc->push (vcc, skb);
-@@ -1185,7 +1185,7 @@ static void tx_schedule (hrz_dev * const
+@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
  	dev->tx_iovec = NULL;
  	
  	// VC layer stats
@@ -22245,10 +23349,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/horizon.c linux-2.6.32.13/drivers/atm/hor
  	
  	// free the skb
  	hrz_kfree_skb (skb);
-diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/idt77252.c
---- linux-2.6.32.13/drivers/atm/idt77252.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/idt77252.c	2010-05-15 13:21:14.706969618 -0400
-@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
+diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
+index 98657a6..50d4a30 100644
+--- a/drivers/atm/idt77252.c
++++ b/drivers/atm/idt77252.c
+@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
  		else
  			dev_kfree_skb(skb);
  
@@ -22257,7 +23362,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  	}
  
  	atomic_dec(&scq->used);
-@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1074,13 +1074,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
  			if ((sb = dev_alloc_skb(64)) == NULL) {
  				printk("%s: Can't allocate buffers for aal0.\n",
  				       card->name);
@@ -22273,7 +23378,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  				dev_kfree_skb(sb);
  				break;
  			}
-@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1097,7 +1097,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
  			ATM_SKB(sb)->vcc = vcc;
  			__net_timestamp(sb);
  			vcc->push(vcc, sb);
@@ -22282,7 +23387,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  
  			cell += ATM_CELL_PAYLOAD;
  		}
-@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1134,13 +1134,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
  			         "(CDC: %08x)\n",
  			         card->name, len, rpp->len, readl(SAR_REG_CDC));
  			recycle_rx_pool_skb(card, rpp);
@@ -22298,7 +23403,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  			return;
  		}
  		if (skb_queue_len(&rpp->queue) > 1) {
-@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1151,7 +1151,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
  				RXPRINTK("%s: Can't alloc RX skb.\n",
  					 card->name);
  				recycle_rx_pool_skb(card, rpp);
@@ -22307,7 +23412,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  				return;
  			}
  			if (!atm_charge(vcc, skb->truesize)) {
-@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1170,7 +1170,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
  			__net_timestamp(skb);
  
  			vcc->push(vcc, skb);
@@ -22316,7 +23421,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  
  			return;
  		}
-@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1192,7 +1192,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
  		__net_timestamp(skb);
  
  		vcc->push(vcc, skb);
@@ -22325,7 +23430,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  
  		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 *card)
  		if (vcc->qos.aal != ATM_AAL0) {
  			RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
  				card->name, vpi, vci);
@@ -22342,7 +23447,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  			goto drop;
  		}
  
-@@ -1329,7 +1329,7 @@ idt77252_rx_raw(struct idt77252_dev *car
+@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
  		ATM_SKB(sb)->vcc = vcc;
  		__net_timestamp(sb);
  		vcc->push(vcc, sb);
@@ -22351,7 +23456,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  
  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, struct sk_buff *skb, int oam)
  
  	if (vc == NULL) {
  		printk("%s: NULL connection in send().\n", card->name);
@@ -22367,7 +23472,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  		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, struct sk_buff *skb, int oam)
  		break;
  	default:
  		printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
@@ -22384,7 +23489,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  		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, struct sk_buff *skb, int oam)
  
  	err = queue_skb(card, vc, skb, oam);
  	if (err) {
@@ -22393,7 +23498,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  		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, void *cell, int flags)
  	skb = dev_alloc_skb(64);
  	if (!skb) {
  		printk("%s: Out of memory in send_oam().\n", card->name);
@@ -22402,10 +23507,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id
  		return -ENOMEM;
  	}
  	atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/iphase.c
---- linux-2.6.32.13/drivers/atm/iphase.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/iphase.c	2010-05-15 13:21:14.750617431 -0400
-@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)  
+diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
+index ee9ddeb..357368e 100644
+--- a/drivers/atm/iphase.c
++++ b/drivers/atm/iphase.c
+@@ -1124,7 +1124,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))  
  	{  
@@ -22414,7 +23520,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/ipha
  		IF_ERR(printk("IA: bad packet, dropping it");)  
                  if (status & RX_CER) { 
                      IF_ERR(printk(" cause: packet CRC error\n");)
-@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)  
+@@ -1147,7 +1147,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);
@@ -22423,7 +23529,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/ipha
  	   goto out_free_desc;
          }
  		  
-@@ -1296,7 +1296,7 @@ static void rx_dle_intr(struct atm_dev *
+@@ -1297,7 +1297,7 @@ static void rx_dle_intr(struct atm_dev *dev)
            ia_vcc = INPH_IA_VCC(vcc);
            if (ia_vcc == NULL)
            {
@@ -22432,7 +23538,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/ipha
               dev_kfree_skb_any(skb);
               atm_return(vcc, atm_guess_pdu2truesize(len));
               goto INCR_DLE;
-@@ -1308,7 +1308,7 @@ static void rx_dle_intr(struct atm_dev *
+@@ -1309,7 +1309,7 @@ static void rx_dle_intr(struct atm_dev *dev)
            if ((length > iadev->rx_buf_sz) || (length > 
                                (skb->len - sizeof(struct cpcs_trailer))))
            {
@@ -22441,7 +23547,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/ipha
               IF_ERR(printk("rx_dle_intr: Bad  AAL5 trailer %d (skb len %d)", 
                                                              length, skb->len);)
               dev_kfree_skb_any(skb);
-@@ -1324,7 +1324,7 @@ static void rx_dle_intr(struct atm_dev *
+@@ -1325,7 +1325,7 @@ static void rx_dle_intr(struct atm_dev *dev)
  
  	  IF_RX(printk("rx_dle_intr: skb push");)  
  	  vcc->push(vcc,skb);  
@@ -22450,7 +23556,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/ipha
            iadev->rx_pkt_cnt++;
        }  
  INCR_DLE:
-@@ -2806,15 +2806,15 @@ static int ia_ioctl(struct atm_dev *dev,
+@@ -2807,15 +2807,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
           {
               struct k_sonet_stats *stats;
               stats = &PRIV(_ia_dev[board])->sonet_stats;
@@ -22475,7 +23581,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/ipha
           }
              ia_cmds.status = 0;
              break;
-@@ -2919,7 +2919,7 @@ static int ia_pkt_tx (struct atm_vcc *vc
+@@ -2920,7 +2920,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
  	if ((desc == 0) || (desc > iadev->num_tx_desc))  
  	{  
  		IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);) 
@@ -22484,7 +23590,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/ipha
  		if (vcc->pop)   
  		    vcc->pop(vcc, skb);   
  		else  
-@@ -3024,14 +3024,14 @@ static int ia_pkt_tx (struct atm_vcc *vc
+@@ -3025,14 +3025,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
          ATM_DESC(skb) = vcc->vci;
          skb_queue_tail(&iadev->tx_dma_q, skb);
  
@@ -22501,10 +23607,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/ipha
            if (iavcc->vc_desc_cnt > 10) {
               vcc->tx_quota =  vcc->tx_quota * 3 / 4;
              printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-2.6.32.13/drivers/atm/lanai.c linux-2.6.32.13/drivers/atm/lanai.c
---- linux-2.6.32.13/drivers/atm/lanai.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/lanai.c	2010-05-15 13:21:14.750617431 -0400
-@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
+diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
+index cbe15a8..9b6f726 100644
+--- a/drivers/atm/lanai.c
++++ b/drivers/atm/lanai.c
+@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
  	vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
  	lanai_endtx(lanai, lvcc);
  	lanai_free_skb(lvcc->tx.atmvcc, skb);
@@ -22513,7 +23620,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/lanai.c linux-2.6.32.13/drivers/atm/lanai
  }
  
  /* Try to fill the buffer - don't call unless there is backlog */
-@@ -1428,7 +1428,7 @@ static void vcc_rx_aal5(struct lanai_vcc
+@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
  	ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
  	__net_timestamp(skb);
  	lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
@@ -22522,7 +23629,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/lanai.c linux-2.6.32.13/drivers/atm/lanai
      out:
  	lvcc->rx.buf.ptr = end;
  	cardvcc_write(lvcc, endptr, vcc_rxreadptr);
-@@ -1670,7 +1670,7 @@ static int handle_service(struct lanai_d
+@@ -1668,7 +1668,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
  		DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
  		    "vcc %d\n", lanai->number, (unsigned int) s, vci);
  		lanai->stats.service_rxnotaal5++;
@@ -22531,7 +23638,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/lanai.c linux-2.6.32.13/drivers/atm/lanai
  		return 0;
  	}
  	if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
-@@ -1682,7 +1682,7 @@ static int handle_service(struct lanai_d
+@@ -1680,7 +1680,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
  		int bytes;
  		read_unlock(&vcc_sklist_lock);
  		DPRINTK("got trashed rx pdu on vci %d\n", vci);
@@ -22540,7 +23647,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/lanai.c linux-2.6.32.13/drivers/atm/lanai
  		lvcc->stats.x.aal5.service_trash++;
  		bytes = (SERVICE_GET_END(s) * 16) -
  		    (((unsigned long) lvcc->rx.buf.ptr) -
-@@ -1694,7 +1694,7 @@ static int handle_service(struct lanai_d
+@@ -1692,7 +1692,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
  	}
  	if (s & SERVICE_STREAM) {
  		read_unlock(&vcc_sklist_lock);
@@ -22549,7 +23656,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/lanai.c linux-2.6.32.13/drivers/atm/lanai
  		lvcc->stats.x.aal5.service_stream++;
  		printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
  		    "PDU on VCI %d!\n", lanai->number, vci);
-@@ -1702,7 +1702,7 @@ static int handle_service(struct lanai_d
+@@ -1700,7 +1700,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
  		return 0;
  	}
  	DPRINTK("got rx crc error on vci %d\n", vci);
@@ -22558,10 +23665,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/lanai.c linux-2.6.32.13/drivers/atm/lanai
  	lvcc->stats.x.aal5.service_rxcrc++;
  	lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
  	cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nicstar.c
---- linux-2.6.32.13/drivers/atm/nicstar.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/nicstar.c	2010-05-15 13:21:14.787751803 -0400
-@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 
+diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
+index b7473a6..3736ea4 100644
+--- a/drivers/atm/nicstar.c
++++ b/drivers/atm/nicstar.c
+@@ -1722,7 +1722,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
     if ((vc = (vc_map *) vcc->dev_data) == NULL)
     {
        printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n", card->index);
@@ -22570,7 +23678,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
        dev_kfree_skb_any(skb);
        return -EINVAL;
     }
-@@ -1731,7 +1731,7 @@ static int ns_send(struct atm_vcc *vcc, 
+@@ -1730,7 +1730,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
     if (!vc->tx)
     {
        printk("nicstar%d: Trying to transmit on a non-tx VC.\n", card->index);
@@ -22579,7 +23687,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
        dev_kfree_skb_any(skb);
        return -EINVAL;
     }
-@@ -1739,7 +1739,7 @@ static int ns_send(struct atm_vcc *vcc, 
+@@ -1738,7 +1738,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
     if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0)
     {
        printk("nicstar%d: Only AAL0 and AAL5 are supported.\n", card->index);
@@ -22588,7 +23696,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
        dev_kfree_skb_any(skb);
        return -EINVAL;
     }
-@@ -1747,7 +1747,7 @@ static int ns_send(struct atm_vcc *vcc, 
+@@ -1746,7 +1746,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
     if (skb_shinfo(skb)->nr_frags != 0)
     {
        printk("nicstar%d: No scatter-gather yet.\n", card->index);
@@ -22597,7 +23705,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
        dev_kfree_skb_any(skb);
        return -EINVAL;
     }
-@@ -1792,11 +1792,11 @@ static int ns_send(struct atm_vcc *vcc, 
+@@ -1791,11 +1791,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
  
     if (push_scqe(card, vc, scq, &scqe, skb) != 0)
     {
@@ -22611,7 +23719,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
  
     return 0;
  }
-@@ -2111,14 +2111,14 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2110,14 +2110,14 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
           {
              printk("nicstar%d: Can't allocate buffers for aal0.\n",
                     card->index);
@@ -22628,7 +23736,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
              dev_kfree_skb_any(sb);
              break;
           }
-@@ -2133,7 +2133,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2132,7 +2132,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
           ATM_SKB(sb)->vcc = vcc;
  	 __net_timestamp(sb);
           vcc->push(vcc, sb);
@@ -22637,7 +23745,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
           cell += ATM_CELL_PAYLOAD;
        }
  
-@@ -2152,7 +2152,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
  	 if (iovb == NULL)
  	 {
  	    printk("nicstar%d: Out of iovec buffers.\n", card->index);
@@ -22646,7 +23754,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
              recycle_rx_buf(card, skb);
              return;
  	 }
-@@ -2182,7 +2182,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2181,7 +2181,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
     else if (NS_SKB(iovb)->iovcnt >= NS_MAX_IOVECS)
     {
        printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
@@ -22655,7 +23763,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
        recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, NS_MAX_IOVECS);
        NS_SKB(iovb)->iovcnt = 0;
        iovb->len = 0;
-@@ -2202,7 +2202,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2201,7 +2201,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
           printk("nicstar%d: Expected a small buffer, and this is not one.\n",
  	        card->index);
           which_list(card, skb);
@@ -22664,7 +23772,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
           recycle_rx_buf(card, skb);
           vc->rx_iov = NULL;
           recycle_iov_buf(card, iovb);
-@@ -2216,7 +2216,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2215,7 +2215,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
           printk("nicstar%d: Expected a large buffer, and this is not one.\n",
  	        card->index);
           which_list(card, skb);
@@ -22673,7 +23781,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
           recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
  	                       NS_SKB(iovb)->iovcnt);
           vc->rx_iov = NULL;
-@@ -2240,7 +2240,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
              printk(" - PDU size mismatch.\n");
           else
              printk(".\n");
@@ -22682,7 +23790,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
           recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
  	   NS_SKB(iovb)->iovcnt);
  	 vc->rx_iov = NULL;
-@@ -2256,7 +2256,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2255,7 +2255,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
           if (!atm_charge(vcc, skb->truesize))
           {
              push_rxbufs(card, skb);
@@ -22691,7 +23799,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
           }
           else
  	 {
-@@ -2268,7 +2268,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2267,7 +2267,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
              ATM_SKB(skb)->vcc = vcc;
  	    __net_timestamp(skb);
              vcc->push(vcc, skb);
@@ -22700,7 +23808,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
           }
        }
        else if (NS_SKB(iovb)->iovcnt == 2)	/* One small plus one large buffer */
-@@ -2283,7 +2283,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2282,7 +2282,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
              if (!atm_charge(vcc, sb->truesize))
              {
                 push_rxbufs(card, sb);
@@ -22709,7 +23817,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
              }
              else
  	    {
-@@ -2295,7 +2295,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2294,7 +2294,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
                 ATM_SKB(sb)->vcc = vcc;
  	       __net_timestamp(sb);
                 vcc->push(vcc, sb);
@@ -22718,7 +23826,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
              }
  
              push_rxbufs(card, skb);
-@@ -2306,7 +2306,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2305,7 +2305,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
              if (!atm_charge(vcc, skb->truesize))
              {
                 push_rxbufs(card, skb);
@@ -22727,7 +23835,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
              }
              else
              {
-@@ -2320,7 +2320,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2319,7 +2319,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
                 ATM_SKB(skb)->vcc = vcc;
  	       __net_timestamp(skb);
                 vcc->push(vcc, skb);
@@ -22736,7 +23844,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
              }
  
              push_rxbufs(card, sb);
-@@ -2342,7 +2342,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
              if (hb == NULL)
              {
                 printk("nicstar%d: Out of huge buffers.\n", card->index);
@@ -22745,7 +23853,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
                 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
  	                             NS_SKB(iovb)->iovcnt);
                 vc->rx_iov = NULL;
-@@ -2393,7 +2393,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2392,7 +2392,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
              }
  	    else
  	       dev_kfree_skb_any(hb);
@@ -22754,7 +23862,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
           }
           else
  	 {
-@@ -2427,7 +2427,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2426,7 +2426,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
  #endif /* NS_USE_DESTRUCTORS */
  	    __net_timestamp(hb);
              vcc->push(vcc, hb);
@@ -22763,10 +23871,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic
           }
        }
  
-diff -urNp linux-2.6.32.13/drivers/atm/solos-pci.c linux-2.6.32.13/drivers/atm/solos-pci.c
---- linux-2.6.32.13/drivers/atm/solos-pci.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/solos-pci.c	2010-05-15 13:21:14.815606670 -0400
-@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
+diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
+index 3613422..99624fe 100644
+--- a/drivers/atm/solos-pci.c
++++ b/drivers/atm/solos-pci.c
+@@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg)
  				}
  				atm_charge(vcc, skb->truesize);
  				vcc->push(vcc, skb);
@@ -22775,7 +23884,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/solos-pci.c linux-2.6.32.13/drivers/atm/s
  				break;
  
  			case PKT_STATUS:
-@@ -1011,7 +1011,7 @@ static uint32_t fpga_tx(struct solos_car
+@@ -1023,7 +1023,7 @@ static uint32_t fpga_tx(struct solos_card *card)
  			vcc = SKB_CB(oldskb)->vcc;
  
  			if (vcc) {
@@ -22784,10 +23893,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/solos-pci.c linux-2.6.32.13/drivers/atm/s
  				solos_pop(vcc, oldskb);
  			} else
  				dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.32.13/drivers/atm/suni.c linux-2.6.32.13/drivers/atm/suni.c
---- linux-2.6.32.13/drivers/atm/suni.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/suni.c	2010-05-15 13:21:14.815606670 -0400
-@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
+diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
+index da4b91f..79150c9 100644
+--- a/drivers/atm/suni.c
++++ b/drivers/atm/suni.c
+@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
  #define ADD_LIMITED(s,v) \
@@ -22798,10 +23908,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/suni.c linux-2.6.32.13/drivers/atm/suni.c
  
  
  static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.32.13/drivers/atm/uPD98402.c linux-2.6.32.13/drivers/atm/uPD98402.c
---- linux-2.6.32.13/drivers/atm/uPD98402.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/uPD98402.c	2010-05-15 13:21:14.815606670 -0400
-@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
+diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
+index c45ae05..ed6f0c4 100644
+--- a/drivers/atm/uPD98402.c
++++ b/drivers/atm/uPD98402.c
+@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
  	struct sonet_stats tmp;
   	int error = 0;
  
@@ -22810,7 +23921,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/uPD98402.c linux-2.6.32.13/drivers/atm/uP
  	sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
  	if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
  	if (zero && !error) {
-@@ -160,9 +160,9 @@ static int uPD98402_ioctl(struct atm_dev
+@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
  
  
  #define ADD_LIMITED(s,v) \
@@ -22823,7 +23934,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/uPD98402.c linux-2.6.32.13/drivers/atm/uP
  
  
  static void stat_event(struct atm_dev *dev)
-@@ -193,7 +193,7 @@ static void uPD98402_int(struct atm_dev 
+@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
  		if (reason & uPD98402_INT_PFM) stat_event(dev);
  		if (reason & uPD98402_INT_PCO) {
  			(void) GET(PCOCR); /* clear interrupt cause */
@@ -22832,7 +23943,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/uPD98402.c linux-2.6.32.13/drivers/atm/uP
  			    &PRIV(dev)->sonet_stats.uncorr_hcs);
  		}
  		if ((reason & uPD98402_INT_RFO) && 
-@@ -221,9 +221,9 @@ static int uPD98402_start(struct atm_dev
+@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
  	PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
  	  uPD98402_INT_LOS),PIMR); /* enable them */
  	(void) fetch_stats(dev,NULL,1); /* clear kernel counters */
@@ -22845,10 +23956,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/uPD98402.c linux-2.6.32.13/drivers/atm/uP
  	return 0;
  }
  
-diff -urNp linux-2.6.32.13/drivers/atm/zatm.c linux-2.6.32.13/drivers/atm/zatm.c
---- linux-2.6.32.13/drivers/atm/zatm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/atm/zatm.c	2010-05-15 13:21:14.815606670 -0400
-@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
+diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
+index 702acce..c13b134 100644
+--- a/drivers/atm/zatm.c
++++ b/drivers/atm/zatm.c
+@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
  		}
  		if (!size) {
  			dev_kfree_skb_irq(skb);
@@ -22857,7 +23969,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/zatm.c linux-2.6.32.13/drivers/atm/zatm.c
  			continue;
  		}
  		if (!atm_charge(vcc,skb->truesize)) {
-@@ -468,7 +468,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
+@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
  		skb->len = size;
  		ATM_SKB(skb)->vcc = vcc;
  		vcc->push(vcc,skb);
@@ -22866,7 +23978,7 @@ diff -urNp linux-2.6.32.13/drivers/atm/zatm.c linux-2.6.32.13/drivers/atm/zatm.c
  	}
  	zout(pos & 0xffff,MTA(mbx));
  #if 0 /* probably a stupid idea */
-@@ -732,7 +732,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD
+@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
  			skb_queue_head(&zatm_vcc->backlog,skb);
  			break;
  		}
@@ -22875,118 +23987,11 @@ diff -urNp linux-2.6.32.13/drivers/atm/zatm.c linux-2.6.32.13/drivers/atm/zatm.c
  	wake_up(&zatm_vcc->tx_wait);
  }
  
-diff -urNp linux-2.6.32.13/drivers/base/bus.c linux-2.6.32.13/drivers/base/bus.c
---- linux-2.6.32.13/drivers/base/bus.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/base/bus.c	2010-05-15 13:21:14.831148567 -0400
-@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
- 	return ret;
- }
- 
--static struct sysfs_ops driver_sysfs_ops = {
-+static const struct sysfs_ops driver_sysfs_ops = {
- 	.show	= drv_attr_show,
- 	.store	= drv_attr_store,
- };
-@@ -115,7 +115,7 @@ static ssize_t bus_attr_store(struct kob
- 	return ret;
- }
- 
--static struct sysfs_ops bus_sysfs_ops = {
-+static const struct sysfs_ops bus_sysfs_ops = {
- 	.show	= bus_attr_show,
- 	.store	= bus_attr_store,
- };
-@@ -154,7 +154,7 @@ static int bus_uevent_filter(struct kset
- 	return 0;
- }
- 
--static struct kset_uevent_ops bus_uevent_ops = {
-+static const struct kset_uevent_ops bus_uevent_ops = {
- 	.filter = bus_uevent_filter,
- };
- 
-diff -urNp linux-2.6.32.13/drivers/base/class.c linux-2.6.32.13/drivers/base/class.c
---- linux-2.6.32.13/drivers/base/class.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/base/class.c	2010-05-15 13:21:14.874164060 -0400
-@@ -63,7 +63,7 @@ static void class_release(struct kobject
- 	kfree(cp);
- }
- 
--static struct sysfs_ops class_sysfs_ops = {
-+static const struct sysfs_ops class_sysfs_ops = {
- 	.show	= class_attr_show,
- 	.store	= class_attr_store,
- };
-diff -urNp linux-2.6.32.13/drivers/base/core.c linux-2.6.32.13/drivers/base/core.c
---- linux-2.6.32.13/drivers/base/core.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/base/core.c	2010-05-15 13:21:14.878954723 -0400
-@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
- 	return ret;
- }
- 
--static struct sysfs_ops dev_sysfs_ops = {
-+static const struct sysfs_ops dev_sysfs_ops = {
- 	.show	= dev_attr_show,
- 	.store	= dev_attr_store,
- };
-@@ -252,7 +252,7 @@ static int dev_uevent(struct kset *kset,
- 	return retval;
- }
- 
--static struct kset_uevent_ops device_uevent_ops = {
-+static const struct kset_uevent_ops device_uevent_ops = {
- 	.filter =	dev_uevent_filter,
- 	.name =		dev_uevent_name,
- 	.uevent =	dev_uevent,
-diff -urNp linux-2.6.32.13/drivers/base/memory.c linux-2.6.32.13/drivers/base/memory.c
---- linux-2.6.32.13/drivers/base/memory.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/base/memory.c	2010-05-15 13:21:14.882954278 -0400
-@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
- 	return retval;
- }
- 
--static struct kset_uevent_ops memory_uevent_ops = {
-+static const struct kset_uevent_ops memory_uevent_ops = {
- 	.name		= memory_uevent_name,
- 	.uevent		= memory_uevent,
- };
-diff -urNp linux-2.6.32.13/drivers/base/sys.c linux-2.6.32.13/drivers/base/sys.c
---- linux-2.6.32.13/drivers/base/sys.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/base/sys.c	2010-05-15 13:21:14.890945998 -0400
-@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
- 	return -EIO;
- }
- 
--static struct sysfs_ops sysfs_ops = {
-+static const struct sysfs_ops sysfs_ops = {
- 	.show	= sysdev_show,
- 	.store	= sysdev_store,
- };
-@@ -104,7 +104,7 @@ static ssize_t sysdev_class_store(struct
- 	return -EIO;
- }
- 
--static struct sysfs_ops sysfs_class_ops = {
-+static const struct sysfs_ops sysfs_class_ops = {
- 	.show	= sysdev_class_show,
- 	.store	= sysdev_class_store,
- };
-diff -urNp linux-2.6.32.13/drivers/block/pktcdvd.c linux-2.6.32.13/drivers/block/pktcdvd.c
---- linux-2.6.32.13/drivers/block/pktcdvd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/block/pktcdvd.c	2010-05-15 13:21:14.919938646 -0400
-@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
- 	return len;
- }
- 
--static struct sysfs_ops kobj_pkt_ops = {
-+static const struct sysfs_ops kobj_pkt_ops = {
- 	.show = kobj_pkt_show,
- 	.store = kobj_pkt_store
- };
-diff -urNp linux-2.6.32.13/drivers/char/agp/frontend.c linux-2.6.32.13/drivers/char/agp/frontend.c
---- linux-2.6.32.13/drivers/char/agp/frontend.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/agp/frontend.c	2010-05-15 13:21:14.919938646 -0400
-@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
+diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
+index 43412c0..3db9a62 100644
+--- a/drivers/char/agp/frontend.c
++++ b/drivers/char/agp/frontend.c
+@@ -818,7 +818,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
  	if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
  		return -EFAULT;
  
@@ -22995,31 +24000,33 @@ diff -urNp linux-2.6.32.13/drivers/char/agp/frontend.c linux-2.6.32.13/drivers/c
  		return -EFAULT;
  
  	client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.32.13/drivers/char/agp/intel-agp.c linux-2.6.32.13/drivers/char/agp/intel-agp.c
---- linux-2.6.32.13/drivers/char/agp/intel-agp.c	2010-04-29 17:49:37.777981896 -0400
-+++ linux-2.6.32.13/drivers/char/agp/intel-agp.c	2010-05-15 13:21:14.919938646 -0400
-@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc
- 	ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
- 	ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
- 	ID(PCI_DEVICE_ID_INTEL_IGDNG_MC2_HB),
+diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
+index e38fe2be..64355e5 100644
+--- a/drivers/char/agp/intel-agp.c
++++ b/drivers/char/agp/intel-agp.c
+@@ -1056,7 +1056,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
+ 	ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB),
+ 	ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB),
+ 	ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB),
 -	{ }
 +	{ 0, 0, 0, 0, 0, 0, 0 }
  };
  
  MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
-diff -urNp linux-2.6.32.13/drivers/char/hpet.c linux-2.6.32.13/drivers/char/hpet.c
---- linux-2.6.32.13/drivers/char/hpet.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/hpet.c	2010-05-15 13:21:14.922737516 -0400
-@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
+diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
+index f8e7d89..5b17903 100644
+--- a/drivers/char/hpet.c
++++ b/drivers/char/hpet.c
+@@ -429,7 +429,7 @@ static int hpet_release(struct inode *inode, struct file *file)
  	return 0;
  }
  
 -static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
 +static int hpet_ioctl_common(struct hpet_dev *, unsigned int, unsigned long, int);
  
- static int
- hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-@@ -550,7 +550,7 @@ static inline unsigned long hpet_time_di
+ static long hpet_ioctl(struct file *file, unsigned int cmd,
+ 			unsigned long arg)
+@@ -568,7 +568,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
  }
  
  static int
@@ -23028,7 +24035,21 @@ diff -urNp linux-2.6.32.13/drivers/char/hpet.c linux-2.6.32.13/drivers/char/hpet
  {
  	struct hpet_timer __iomem *timer;
  	struct hpet __iomem *hpet;
-@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv
+@@ -611,11 +611,11 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
+ 		{
+ 			struct hpet_info info;
+ 
++			memset(&info, 0, sizeof(info));
++
+ 			if (devp->hd_ireqfreq)
+ 				info.hi_ireqfreq =
+ 					hpet_time_div(hpetp, devp->hd_ireqfreq);
+-			else
+-				info.hi_ireqfreq = 0;
+ 			info.hi_flags =
+ 			    readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
+ 			info.hi_hpet = hpetp->hp_which;
+@@ -1015,7 +1015,7 @@ static struct acpi_driver hpet_acpi_driver = {
  		},
  };
  
@@ -23037,114 +24058,23 @@ diff -urNp linux-2.6.32.13/drivers/char/hpet.c linux-2.6.32.13/drivers/char/hpet
  
  static int __init hpet_init(void)
  {
-diff -urNp linux-2.6.32.13/drivers/char/hvc_beat.c linux-2.6.32.13/drivers/char/hvc_beat.c
---- linux-2.6.32.13/drivers/char/hvc_beat.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/hvc_beat.c	2010-05-15 13:21:14.922737516 -0400
-@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
- 	return cnt;
- }
- 
--static struct hv_ops hvc_beat_get_put_ops = {
-+static const struct hv_ops hvc_beat_get_put_ops = {
- 	.get_chars = hvc_beat_get_chars,
- 	.put_chars = hvc_beat_put_chars,
- };
-diff -urNp linux-2.6.32.13/drivers/char/hvc_console.c linux-2.6.32.13/drivers/char/hvc_console.c
---- linux-2.6.32.13/drivers/char/hvc_console.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/hvc_console.c	2010-05-15 13:21:14.922737516 -0400
-@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
-  * console interfaces but can still be used as a tty device.  This has to be
-  * static because kmalloc will not work during early console init.
-  */
--static struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES];
-+static const struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES];
- static uint32_t vtermnos[MAX_NR_HVC_CONSOLES] =
- 	{[0 ... MAX_NR_HVC_CONSOLES - 1] = -1};
- 
-@@ -247,7 +247,7 @@ static void destroy_hvc_struct(struct kr
-  * vty adapters do NOT get an hvc_instantiate() callback since they
-  * appear after early console init.
-  */
--int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops)
-+int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
- {
- 	struct hvc_struct *hp;
- 
-@@ -749,7 +749,7 @@ static const struct tty_operations hvc_o
- };
- 
- struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data,
--					struct hv_ops *ops, int outbuf_size)
-+					const struct hv_ops *ops, int outbuf_size)
- {
- 	struct hvc_struct *hp;
- 	int i;
-diff -urNp linux-2.6.32.13/drivers/char/hvc_console.h linux-2.6.32.13/drivers/char/hvc_console.h
---- linux-2.6.32.13/drivers/char/hvc_console.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/hvc_console.h	2010-05-15 13:21:14.922737516 -0400
-@@ -55,7 +55,7 @@ struct hvc_struct {
- 	int outbuf_size;
- 	int n_outbuf;
- 	uint32_t vtermno;
--	struct hv_ops *ops;
-+	const struct hv_ops *ops;
- 	int irq_requested;
- 	int data;
- 	struct winsize ws;
-@@ -76,11 +76,11 @@ struct hv_ops {
- };
- 
- /* Register a vterm and a slot index for use as a console (console_init) */
--extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
-+extern int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops);
- 
+diff --git a/drivers/char/hvc_console.h b/drivers/char/hvc_console.h
+index 54381eba..41e362b 100644
+--- a/drivers/char/hvc_console.h
++++ b/drivers/char/hvc_console.h
+@@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vtermno, int index,
  /* register a vterm for hvc tty operation (module_init or hotplug add) */
- extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int data,
--				struct hv_ops *ops, int outbuf_size);
-+				const struct hv_ops *ops, int outbuf_size);
+ extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data,
+ 				     const struct hv_ops *ops, int outbuf_size);
++
  /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
  extern int hvc_remove(struct hvc_struct *hp);
  
-diff -urNp linux-2.6.32.13/drivers/char/hvc_iseries.c linux-2.6.32.13/drivers/char/hvc_iseries.c
---- linux-2.6.32.13/drivers/char/hvc_iseries.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/hvc_iseries.c	2010-05-15 13:21:14.922737516 -0400
-@@ -197,7 +197,7 @@ done:
- 	return sent;
- }
- 
--static struct hv_ops hvc_get_put_ops = {
-+static const struct hv_ops hvc_get_put_ops = {
- 	.get_chars = get_chars,
- 	.put_chars = put_chars,
- 	.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.13/drivers/char/hvc_iucv.c linux-2.6.32.13/drivers/char/hvc_iucv.c
---- linux-2.6.32.13/drivers/char/hvc_iucv.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/hvc_iucv.c	2010-05-15 13:21:14.922737516 -0400
-@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
- 
- 
- /* HVC operations */
--static struct hv_ops hvc_iucv_ops = {
-+static const struct hv_ops hvc_iucv_ops = {
- 	.get_chars = hvc_iucv_get_chars,
- 	.put_chars = hvc_iucv_put_chars,
- 	.notifier_add = hvc_iucv_notifier_add,
-diff -urNp linux-2.6.32.13/drivers/char/hvc_rtas.c linux-2.6.32.13/drivers/char/hvc_rtas.c
---- linux-2.6.32.13/drivers/char/hvc_rtas.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/hvc_rtas.c	2010-05-15 13:21:14.922737516 -0400
-@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
- 	return i;
- }
- 
--static struct hv_ops hvc_rtas_get_put_ops = {
-+static const struct hv_ops hvc_rtas_get_put_ops = {
- 	.get_chars = hvc_rtas_read_console,
- 	.put_chars = hvc_rtas_write_console,
- };
-diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs.c
---- linux-2.6.32.13/drivers/char/hvcs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/hvcs.c	2010-05-15 13:21:14.967285135 -0400
-@@ -269,7 +269,7 @@ struct hvcs_struct {
+diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
+index bedc6c1..2269494 100644
+--- a/drivers/char/hvcs.c
++++ b/drivers/char/hvcs.c
+@@ -270,7 +270,7 @@ struct hvcs_struct {
  	unsigned int index;
  
  	struct tty_struct *tty;
@@ -23153,7 +24083,7 @@ diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs
  
  	/*
  	 * Used to tell the driver kernel_thread what operations need to take
-@@ -419,7 +419,7 @@ static ssize_t hvcs_vterm_state_store(st
+@@ -420,7 +420,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
  
  	spin_lock_irqsave(&hvcsd->lock, flags);
  
@@ -23162,7 +24092,7 @@ diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs
  		spin_unlock_irqrestore(&hvcsd->lock, flags);
  		printk(KERN_INFO "HVCS: vterm state unchanged.  "
  				"The hvcs device node is still in use.\n");
-@@ -1135,7 +1135,7 @@ static int hvcs_open(struct tty_struct *
+@@ -1136,7 +1136,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
  		if ((retval = hvcs_partner_connect(hvcsd)))
  			goto error_release;
  
@@ -23171,7 +24101,7 @@ diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs
  	hvcsd->tty = tty;
  	tty->driver_data = hvcsd;
  
-@@ -1169,7 +1169,7 @@ fast_open:
+@@ -1170,7 +1170,7 @@ fast_open:
  
  	spin_lock_irqsave(&hvcsd->lock, flags);
  	kref_get(&hvcsd->kref);
@@ -23180,7 +24110,7 @@ diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs
  	hvcsd->todo_mask |= HVCS_SCHED_READ;
  	spin_unlock_irqrestore(&hvcsd->lock, flags);
  
-@@ -1213,7 +1213,7 @@ static void hvcs_close(struct tty_struct
+@@ -1214,7 +1214,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
  	hvcsd = tty->driver_data;
  
  	spin_lock_irqsave(&hvcsd->lock, flags);
@@ -23189,7 +24119,7 @@ diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs
  
  		vio_disable_interrupts(hvcsd->vdev);
  
-@@ -1239,10 +1239,10 @@ static void hvcs_close(struct tty_struct
+@@ -1240,10 +1240,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
  		free_irq(irq, hvcsd);
  		kref_put(&hvcsd->kref, destroy_hvcs_struct);
  		return;
@@ -23202,7 +24132,7 @@ diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs
  	}
  
  	spin_unlock_irqrestore(&hvcsd->lock, flags);
-@@ -1258,7 +1258,7 @@ static void hvcs_hangup(struct tty_struc
+@@ -1259,7 +1259,7 @@ static void hvcs_hangup(struct tty_struct * tty)
  
  	spin_lock_irqsave(&hvcsd->lock, flags);
  	/* Preserve this so that we know how many kref refs to put */
@@ -23211,7 +24141,7 @@ diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs
  
  	/*
  	 * Don't kref put inside the spinlock because the destruction
-@@ -1273,7 +1273,7 @@ static void hvcs_hangup(struct tty_struc
+@@ -1274,7 +1274,7 @@ static void hvcs_hangup(struct tty_struct * tty)
  	hvcsd->tty->driver_data = NULL;
  	hvcsd->tty = NULL;
  
@@ -23220,7 +24150,7 @@ diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs
  
  	/* This will drop any buffered data on the floor which is OK in a hangup
  	 * scenario. */
-@@ -1344,7 +1344,7 @@ static int hvcs_write(struct tty_struct 
+@@ -1345,7 +1345,7 @@ static int hvcs_write(struct tty_struct *tty,
  	 * the middle of a write operation?  This is a crummy place to do this
  	 * but we want to keep it all in the spinlock.
  	 */
@@ -23229,7 +24159,7 @@ diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs
  		spin_unlock_irqrestore(&hvcsd->lock, flags);
  		return -ENODEV;
  	}
-@@ -1418,7 +1418,7 @@ static int hvcs_write_room(struct tty_st
+@@ -1419,7 +1419,7 @@ static int hvcs_write_room(struct tty_struct *tty)
  {
  	struct hvcs_struct *hvcsd = tty->driver_data;
  
@@ -23238,45 +24168,10 @@ diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs
  		return 0;
  
  	return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.32.13/drivers/char/hvc_udbg.c linux-2.6.32.13/drivers/char/hvc_udbg.c
---- linux-2.6.32.13/drivers/char/hvc_udbg.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/hvc_udbg.c	2010-05-15 13:21:14.967285135 -0400
-@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
- 	return i;
- }
- 
--static struct hv_ops hvc_udbg_ops = {
-+static const struct hv_ops hvc_udbg_ops = {
- 	.get_chars = hvc_udbg_get,
- 	.put_chars = hvc_udbg_put,
- };
-diff -urNp linux-2.6.32.13/drivers/char/hvc_vio.c linux-2.6.32.13/drivers/char/hvc_vio.c
---- linux-2.6.32.13/drivers/char/hvc_vio.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/hvc_vio.c	2010-05-15 13:21:14.967285135 -0400
-@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
- 	return got;
- }
- 
--static struct hv_ops hvc_get_put_ops = {
-+static const struct hv_ops hvc_get_put_ops = {
- 	.get_chars = filtered_get_chars,
- 	.put_chars = hvc_put_chars,
- 	.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.13/drivers/char/hvc_xen.c linux-2.6.32.13/drivers/char/hvc_xen.c
---- linux-2.6.32.13/drivers/char/hvc_xen.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/hvc_xen.c	2010-05-15 13:21:14.967285135 -0400
-@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
- 	return recv;
- }
- 
--static struct hv_ops hvc_ops = {
-+static const struct hv_ops hvc_ops = {
- 	.get_chars = read_console,
- 	.put_chars = write_console,
- 	.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c	2010-05-15 13:21:15.002974818 -0400
+diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
+index 4f3f8c9..3708979 100644
+--- a/drivers/char/ipmi/ipmi_msghandler.c
++++ b/drivers/char/ipmi/ipmi_msghandler.c
 @@ -414,7 +414,7 @@ struct ipmi_smi {
  	struct proc_dir_entry *proc_dir;
  	char                  proc_dir_name[10];
@@ -23298,7 +24193,7 @@ diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.13/d
  
  static int is_lan_addr(struct ipmi_addr *addr)
  {
-@@ -2808,7 +2808,7 @@ int ipmi_register_smi(struct ipmi_smi_ha
+@@ -2817,7 +2817,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
  	INIT_LIST_HEAD(&intf->cmd_rcvrs);
  	init_waitqueue_head(&intf->waitq);
  	for (i = 0; i < IPMI_NUM_STATS; i++)
@@ -23307,10 +24202,11 @@ diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.13/d
  
  	intf->proc_dir = NULL;
  
-diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c	2010-05-15 13:21:15.014624441 -0400
-@@ -277,7 +277,7 @@ struct smi_info {
+diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
+index b1a3014..50af3c6 100644
+--- a/drivers/char/ipmi/ipmi_si_intf.c
++++ b/drivers/char/ipmi/ipmi_si_intf.c
+@@ -286,7 +286,7 @@ struct smi_info {
  	unsigned char slave_addr;
  
  	/* Counters and things for the proc filesystem. */
@@ -23319,7 +24215,7 @@ diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.13/driv
  
  	struct task_struct *thread;
  
-@@ -285,9 +285,9 @@ struct smi_info {
+@@ -294,9 +294,9 @@ struct smi_info {
  };
  
  #define smi_inc_stat(smi, stat) \
@@ -23331,19 +24227,20 @@ diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.13/driv
  
  #define SI_MAX_PARMS 4
  
-@@ -2926,7 +2926,7 @@ static int try_smi_init(struct smi_info 
+@@ -3151,7 +3151,7 @@ static int try_smi_init(struct smi_info *new_smi)
  	atomic_set(&new_smi->req_events, 0);
  	new_smi->run_to_completion = 0;
  	for (i = 0; i < SI_NUM_STATS; i++)
 -		atomic_set(&new_smi->stats[i], 0);
 +		atomic_set_unchecked(&new_smi->stats[i], 0);
  
- 	new_smi->interrupt_disabled = 0;
+ 	new_smi->interrupt_disabled = 1;
  	atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.32.13/drivers/char/keyboard.c linux-2.6.32.13/drivers/char/keyboard.c
---- linux-2.6.32.13/drivers/char/keyboard.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/keyboard.c	2010-05-15 13:21:15.018564312 -0400
-@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
+diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
+index 54109dc..bb46541 100644
+--- a/drivers/char/keyboard.c
++++ b/drivers/char/keyboard.c
+@@ -640,6 +640,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
  	     kbd->kbdmode == VC_MEDIUMRAW) &&
  	     value != KVAL(K_SAK))
  		return;		/* SAK is allowed even in raw mode */
@@ -23360,7 +24257,7 @@ diff -urNp linux-2.6.32.13/drivers/char/keyboard.c linux-2.6.32.13/drivers/char/
  	fn_handler[value](vc);
  }
  
-@@ -1386,7 +1396,7 @@ static const struct input_device_id kbd_
+@@ -1392,7 +1402,7 @@ static const struct input_device_id kbd_ids[] = {
                  .evbit = { BIT_MASK(EV_SND) },
          },
  
@@ -23369,9 +24266,10 @@ diff -urNp linux-2.6.32.13/drivers/char/keyboard.c linux-2.6.32.13/drivers/char/
  };
  
  MODULE_DEVICE_TABLE(input, kbd_ids);
-diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c
---- linux-2.6.32.13/drivers/char/mem.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/mem.c	2010-05-15 13:21:15.018564312 -0400
+diff --git a/drivers/char/mem.c b/drivers/char/mem.c
+index 1f528fa..ab9048b 100644
+--- a/drivers/char/mem.c
++++ b/drivers/char/mem.c
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -23380,7 +24278,7 @@ diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c
  #include <linux/ptrace.h>
  #include <linux/device.h>
  #include <linux/highmem.h>
-@@ -35,6 +36,10 @@
+@@ -34,6 +35,10 @@
  # include <linux/efi.h>
  #endif
  
@@ -23391,7 +24289,40 @@ diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c
  static inline unsigned long size_inside_page(unsigned long start,
  					     unsigned long size)
  {
-@@ -205,6 +210,11 @@ static ssize_t write_mem(struct file * f
+@@ -120,6 +125,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
+ 
+ 	while (count > 0) {
+ 		unsigned long remaining;
++		char *temp;
+ 
+ 		sz = size_inside_page(p, count);
+ 
+@@ -135,7 +141,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
+ 		if (!ptr)
+ 			return -EFAULT;
+ 
+-		remaining = copy_to_user(buf, ptr, sz);
++#ifdef CONFIG_PAX_USERCOPY
++		temp = kmalloc(sz, GFP_KERNEL);
++		if (!temp) {
++			unxlate_dev_mem_ptr(p, ptr);
++			return -ENOMEM;
++		}
++		memcpy(temp, ptr, sz);
++#else
++		temp = ptr;
++#endif
++
++		remaining = copy_to_user(buf, temp, sz);
++
++#ifdef CONFIG_PAX_USERCOPY
++		kfree(temp);
++#endif
++
+ 		unxlate_dev_mem_ptr(p, ptr);
+ 		if (remaining)
+ 			return -EFAULT;
+@@ -161,6 +183,11 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
  	if (!valid_phys_addr_range(p, count))
  		return -EFAULT;
  
@@ -23403,7 +24334,7 @@ diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c
  	written = 0;
  
  #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
-@@ -337,6 +347,11 @@ static int mmap_mem(struct file * file, 
+@@ -316,6 +343,11 @@ static int mmap_mem(struct file *file, struct vm_area_struct *vma)
  						&vma->vm_page_prot))
  		return -EINVAL;
  
@@ -23415,7 +24346,51 @@ diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c
  	vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff,
  						 size,
  						 vma->vm_page_prot);
-@@ -560,6 +575,11 @@ static ssize_t write_kmem(struct file * 
+@@ -398,9 +430,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+ 			 size_t count, loff_t *ppos)
+ {
+ 	unsigned long p = *ppos;
+-	ssize_t low_count, read, sz;
++	ssize_t low_count, read, sz, err = 0;
+ 	char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
+-	int err = 0;
+ 
+ 	read = 0;
+ 	if (p < (unsigned long) high_memory) {
+@@ -422,6 +453,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+ 		}
+ #endif
+ 		while (low_count > 0) {
++			char *temp;
++
+ 			sz = size_inside_page(p, low_count);
+ 
+ 			/*
+@@ -431,7 +464,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+ 			 */
+ 			kbuf = xlate_dev_kmem_ptr((char *)p);
+ 
+-			if (copy_to_user(buf, kbuf, sz))
++#ifdef CONFIG_PAX_USERCOPY
++			temp = kmalloc(sz, GFP_KERNEL);
++			if (!temp)
++				return -ENOMEM;
++			memcpy(temp, kbuf, sz);
++#else
++			temp = kbuf;
++#endif
++
++			err = copy_to_user(buf, temp, sz);
++
++#ifdef CONFIG_PAX_USERCOPY
++			kfree(temp);
++#endif
++
++			if (err)
+ 				return -EFAULT;
+ 			buf += sz;
+ 			p += sz;
+@@ -530,6 +578,11 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
  	char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
  	int err = 0;
  
@@ -23425,9 +24400,9 @@ diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c
 +#endif
 +
  	if (p < (unsigned long) high_memory) {
- 
- 		wrote = count;
-@@ -765,6 +785,16 @@ static loff_t memory_lseek(struct file *
+ 		unsigned long to_write = min_t(unsigned long, count,
+ 					       (unsigned long)high_memory - p);
+@@ -731,6 +784,16 @@ static loff_t memory_lseek(struct file *file, loff_t offset, int orig)
  
  static int open_port(struct inode * inode, struct file * filp)
  {
@@ -23444,7 +24419,7 @@ diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c
  	return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
  }
  
-@@ -772,7 +802,6 @@ static int open_port(struct inode * inod
+@@ -738,7 +801,6 @@ static int open_port(struct inode * inode, struct file * filp)
  #define full_lseek      null_lseek
  #define write_zero	write_null
  #define read_full       read_zero
@@ -23452,7 +24427,7 @@ diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c
  #define open_kmem	open_mem
  #define open_oldmem	open_mem
  
-@@ -888,6 +917,9 @@ static const struct memdev {
+@@ -855,6 +917,9 @@ static const struct memdev {
  #ifdef CONFIG_CRASH_DUMP
  	[12] = { "oldmem", 0, &oldmem_fops, NULL },
  #endif
@@ -23462,10 +24437,33 @@ diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.32.13/drivers/char/nvram.c linux-2.6.32.13/drivers/char/nvram.c
---- linux-2.6.32.13/drivers/char/nvram.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/nvram.c	2010-05-15 13:21:15.018564312 -0400
-@@ -429,7 +429,10 @@ static const struct file_operations nvra
+diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
+index bdae832..5d17cfa 100644
+--- a/drivers/char/n_tty.c
++++ b/drivers/char/n_tty.c
+@@ -2105,6 +2105,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
+ {
+ 	*ops = tty_ldisc_N_TTY;
+ 	ops->owner = NULL;
+-	ops->refcount = ops->flags = 0;
++	atomic_set(&ops->refcount, 0);
++	ops->flags = 0;
+ }
+ EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
+diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
+index 66d2917..796ad19 100644
+--- a/drivers/char/nvram.c
++++ b/drivers/char/nvram.c
+@@ -245,7 +245,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
+ 
+ 	spin_unlock_irq(&rtc_lock);
+ 
+-	if (copy_to_user(buf, contents, tmp - contents))
++	if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
+ 		return -EFAULT;
+ 
+ 	*ppos = i;
+@@ -434,7 +434,10 @@ static const struct file_operations nvram_fops = {
  static struct miscdevice nvram_dev = {
  	NVRAM_MINOR,
  	"nvram",
@@ -23477,9 +24475,10 @@ diff -urNp linux-2.6.32.13/drivers/char/nvram.c linux-2.6.32.13/drivers/char/nvr
  };
  
  static int __init nvram_init(void)
-diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c	2010-05-15 13:21:15.018564312 -0400
+diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c
+index 1a2c2c3..8c15d4e 100644
+--- a/drivers/char/pcmcia/ipwireless/tty.c
++++ b/drivers/char/pcmcia/ipwireless/tty.c
 @@ -51,7 +51,7 @@ struct ipw_tty {
  	int tty_type;
  	struct ipw_network *network;
@@ -23489,7 +24488,7 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/
  	unsigned int control_lines;
  	struct mutex ipw_tty_mutex;
  	int tx_bytes_queued;
-@@ -127,10 +127,10 @@ static int ipw_open(struct tty_struct *l
+@@ -127,10 +127,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
  		mutex_unlock(&tty->ipw_tty_mutex);
  		return -ENODEV;
  	}
@@ -23502,7 +24501,7 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/
  
  	tty->linux_tty = linux_tty;
  	linux_tty->driver_data = tty;
-@@ -146,9 +146,7 @@ static int ipw_open(struct tty_struct *l
+@@ -146,9 +146,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
  
  static void do_ipw_close(struct ipw_tty *tty)
  {
@@ -23513,7 +24512,7 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/
  		struct tty_struct *linux_tty = tty->linux_tty;
  
  		if (linux_tty != NULL) {
-@@ -169,7 +167,7 @@ static void ipw_hangup(struct tty_struct
+@@ -169,7 +167,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
  		return;
  
  	mutex_lock(&tty->ipw_tty_mutex);
@@ -23522,7 +24521,7 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/
  		mutex_unlock(&tty->ipw_tty_mutex);
  		return;
  	}
-@@ -198,7 +196,7 @@ void ipwireless_tty_received(struct ipw_
+@@ -198,7 +196,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
  		return;
  	}
  
@@ -23531,7 +24530,7 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/
  		mutex_unlock(&tty->ipw_tty_mutex);
  		return;
  	}
-@@ -240,7 +238,7 @@ static int ipw_write(struct tty_struct *
+@@ -240,7 +238,7 @@ static int ipw_write(struct tty_struct *linux_tty,
  		return -ENODEV;
  
  	mutex_lock(&tty->ipw_tty_mutex);
@@ -23540,7 +24539,7 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/
  		mutex_unlock(&tty->ipw_tty_mutex);
  		return -EINVAL;
  	}
-@@ -280,7 +278,7 @@ static int ipw_write_room(struct tty_str
+@@ -280,7 +278,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
  	if (!tty)
  		return -ENODEV;
  
@@ -23549,7 +24548,7 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/
  		return -EINVAL;
  
  	room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
-@@ -322,7 +320,7 @@ static int ipw_chars_in_buffer(struct tt
+@@ -322,7 +320,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
  	if (!tty)
  		return 0;
  
@@ -23558,7 +24557,7 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/
  		return 0;
  
  	return tty->tx_bytes_queued;
-@@ -403,7 +401,7 @@ static int ipw_tiocmget(struct tty_struc
+@@ -403,7 +401,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty, struct file *file)
  	if (!tty)
  		return -ENODEV;
  
@@ -23567,7 +24566,7 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/
  		return -EINVAL;
  
  	return get_control_lines(tty);
-@@ -419,7 +417,7 @@ ipw_tiocmset(struct tty_struct *linux_tt
+@@ -419,7 +417,7 @@ ipw_tiocmset(struct tty_struct *linux_tty, struct file *file,
  	if (!tty)
  		return -ENODEV;
  
@@ -23576,7 +24575,7 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/
  		return -EINVAL;
  
  	return set_control_lines(tty, set, clear);
-@@ -433,7 +431,7 @@ static int ipw_ioctl(struct tty_struct *
+@@ -433,7 +431,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,
  	if (!tty)
  		return -ENODEV;
  
@@ -23585,7 +24584,7 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/
  		return -EINVAL;
  
  	/* FIXME: Exactly how is the tty object locked here .. */
-@@ -591,7 +589,7 @@ void ipwireless_tty_free(struct ipw_tty 
+@@ -582,7 +580,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
  				   against a parallel ioctl etc */
  				mutex_lock(&ttyj->ipw_tty_mutex);
  			}
@@ -23594,10 +24593,11 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/
  				do_ipw_close(ttyj);
  			ipwireless_disassociate_network_ttys(network,
  							     ttyj->channel_idx);
-diff -urNp linux-2.6.32.13/drivers/char/pty.c linux-2.6.32.13/drivers/char/pty.c
---- linux-2.6.32.13/drivers/char/pty.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/pty.c	2010-05-15 13:21:15.035728941 -0400
-@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
+diff --git a/drivers/char/pty.c b/drivers/char/pty.c
+index d83a431..37c0dff 100644
+--- a/drivers/char/pty.c
++++ b/drivers/char/pty.c
+@@ -677,7 +677,18 @@ static int ptmx_open(struct inode *inode, struct file *filp)
  	return ret;
  }
  
@@ -23617,7 +24617,7 @@ diff -urNp linux-2.6.32.13/drivers/char/pty.c linux-2.6.32.13/drivers/char/pty.c
  
  static void __init unix98_pty_init(void)
  {
-@@ -736,9 +747,6 @@ static void __init unix98_pty_init(void)
+@@ -731,9 +742,6 @@ static void __init unix98_pty_init(void)
  	register_sysctl_table(pty_root_table);
  
  	/* Now create the /dev/ptmx special device */
@@ -23627,9 +24627,10 @@ diff -urNp linux-2.6.32.13/drivers/char/pty.c linux-2.6.32.13/drivers/char/pty.c
  	cdev_init(&ptmx_cdev, &ptmx_fops);
  	if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
  	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
-diff -urNp linux-2.6.32.13/drivers/char/random.c linux-2.6.32.13/drivers/char/random.c
---- linux-2.6.32.13/drivers/char/random.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/random.c	2010-05-15 13:21:15.038954680 -0400
+diff --git a/drivers/char/random.c b/drivers/char/random.c
+index 8d85587..a534af7 100644
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
 @@ -254,8 +254,13 @@
  /*
   * Configuration information
@@ -23642,9 +24643,9 @@ diff -urNp linux-2.6.32.13/drivers/char/random.c linux-2.6.32.13/drivers/char/ra
  #define OUTPUT_POOL_WORDS 32
 +#endif
  #define SEC_XFER_SIZE 512
+ #define EXTRACT_SIZE 10
  
- /*
-@@ -292,10 +297,17 @@ static struct poolinfo {
+@@ -293,10 +298,17 @@ static struct poolinfo {
  	int poolwords;
  	int tap1, tap2, tap3, tap4, tap5;
  } poolinfo_table[] = {
@@ -23662,7 +24663,16 @@ diff -urNp linux-2.6.32.13/drivers/char/random.c linux-2.6.32.13/drivers/char/ra
  #if 0
  	/* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1  -- 115 */
  	{ 2048,	1638,	1231,	819,	411,	1 },
-@@ -1209,7 +1221,7 @@ EXPORT_SYMBOL(generate_random_uuid);
+@@ -902,7 +914,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
+ 
+ 		extract_buf(r, tmp);
+ 		i = min_t(int, nbytes, EXTRACT_SIZE);
+-		if (copy_to_user(buf, tmp, i)) {
++		if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
+ 			ret = -EFAULT;
+ 			break;
+ 		}
+@@ -1205,7 +1217,7 @@ EXPORT_SYMBOL(generate_random_uuid);
  #include <linux/sysctl.h>
  
  static int min_read_thresh = 8, min_write_thresh;
@@ -23671,9 +24681,10 @@ diff -urNp linux-2.6.32.13/drivers/char/random.c linux-2.6.32.13/drivers/char/ra
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff -urNp linux-2.6.32.13/drivers/char/sonypi.c linux-2.6.32.13/drivers/char/sonypi.c
---- linux-2.6.32.13/drivers/char/sonypi.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/sonypi.c	2010-05-15 13:21:15.038954680 -0400
+diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
+index 73f66d0..5d90cbc 100644
+--- a/drivers/char/sonypi.c
++++ b/drivers/char/sonypi.c
 @@ -491,7 +491,7 @@ static struct sonypi_device {
  	spinlock_t fifo_lock;
  	wait_queue_head_t fifo_proc_list;
@@ -23683,7 +24694,7 @@ diff -urNp linux-2.6.32.13/drivers/char/sonypi.c linux-2.6.32.13/drivers/char/so
  	int model;
  	struct input_dev *input_jog_dev;
  	struct input_dev *input_key_dev;
-@@ -895,7 +895,7 @@ static int sonypi_misc_fasync(int fd, st
+@@ -898,7 +898,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
  static int sonypi_misc_release(struct inode *inode, struct file *file)
  {
  	mutex_lock(&sonypi_device.lock);
@@ -23692,22 +24703,23 @@ diff -urNp linux-2.6.32.13/drivers/char/sonypi.c linux-2.6.32.13/drivers/char/so
  	mutex_unlock(&sonypi_device.lock);
  	return 0;
  }
-@@ -905,9 +905,9 @@ static int sonypi_misc_open(struct inode
- 	lock_kernel();
+@@ -907,9 +907,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
+ {
  	mutex_lock(&sonypi_device.lock);
  	/* Flush input queue on first open */
 -	if (!sonypi_device.open_count)
 +	if (!atomic_read(&sonypi_device.open_count))
- 		kfifo_reset(sonypi_device.fifo);
+ 		kfifo_reset(&sonypi_device.fifo);
 -	sonypi_device.open_count++;
 +	atomic_inc(&sonypi_device.open_count);
  	mutex_unlock(&sonypi_device.lock);
- 	unlock_kernel();
+ 
  	return 0;
-diff -urNp linux-2.6.32.13/drivers/char/tpm/tpm_bios.c linux-2.6.32.13/drivers/char/tpm/tpm_bios.c
---- linux-2.6.32.13/drivers/char/tpm/tpm_bios.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/tpm/tpm_bios.c	2010-05-15 13:21:15.042644897 -0400
-@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
+diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
+index 0636520..b29fde6 100644
+--- a/drivers/char/tpm/tpm_bios.c
++++ b/drivers/char/tpm/tpm_bios.c
+@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
  	event = addr;
  
  	if ((event->event_type == 0 && event->event_size == 0) ||
@@ -23716,7 +24728,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tpm/tpm_bios.c linux-2.6.32.13/drivers/c
  		return NULL;
  
  	return addr;
-@@ -197,7 +197,7 @@ static void *tpm_bios_measurements_next(
+@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
  		return NULL;
  
  	if ((event->event_type == 0 && event->event_size == 0) ||
@@ -23725,7 +24737,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tpm/tpm_bios.c linux-2.6.32.13/drivers/c
  		return NULL;
  
  	(*pos)++;
-@@ -290,7 +290,8 @@ static int tpm_binary_bios_measurements_
+@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
  	int i;
  
  	for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
@@ -23735,7 +24747,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tpm/tpm_bios.c linux-2.6.32.13/drivers/c
  
  	return 0;
  }
-@@ -409,6 +410,11 @@ static int read_log(struct tpm_bios_log 
+@@ -410,6 +411,11 @@ static int read_log(struct tpm_bios_log *log)
  	log->bios_event_log_end = log->bios_event_log + len;
  
  	virt = acpi_os_map_memory(start, len);
@@ -23747,10 +24759,11 @@ diff -urNp linux-2.6.32.13/drivers/char/tpm/tpm_bios.c linux-2.6.32.13/drivers/c
  
  	memcpy(log->bios_event_log, virt, len);
  
-diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tty_io.c
---- linux-2.6.32.13/drivers/char/tty_io.c	2010-04-29 17:49:37.826084348 -0400
-+++ linux-2.6.32.13/drivers/char/tty_io.c	2010-05-15 13:21:15.058626500 -0400
-@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers);			/* linked list
+diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
+index 507441a..53d5b60 100644
+--- a/drivers/char/tty_io.c
++++ b/drivers/char/tty_io.c
+@@ -136,20 +136,10 @@ LIST_HEAD(tty_drivers);			/* linked list of tty drivers */
  DEFINE_MUTEX(tty_mutex);
  EXPORT_SYMBOL(tty_mutex);
  
@@ -23760,7 +24773,6 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt
  							size_t, loff_t *);
 -static unsigned int tty_poll(struct file *, poll_table *);
  static int tty_open(struct inode *, struct file *);
--static int tty_release(struct inode *, struct file *);
  long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
 -#ifdef CONFIG_COMPAT
 -static long tty_compat_ioctl(struct file *file, unsigned int cmd,
@@ -23772,7 +24784,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt
  static void release_tty(struct tty_struct *tty, int idx);
  static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
  static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
-@@ -870,7 +859,7 @@ EXPORT_SYMBOL(start_tty);
+@@ -871,7 +861,7 @@ EXPORT_SYMBOL(start_tty);
   *	read calls may be outstanding in parallel.
   */
  
@@ -23781,7 +24793,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt
  			loff_t *ppos)
  {
  	int i;
-@@ -898,6 +887,8 @@ static ssize_t tty_read(struct file *fil
+@@ -899,6 +889,8 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
  	return i;
  }
  
@@ -23790,7 +24802,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt
  void tty_write_unlock(struct tty_struct *tty)
  {
  	mutex_unlock(&tty->atomic_write_lock);
-@@ -1045,7 +1036,7 @@ void tty_write_message(struct tty_struct
+@@ -1048,7 +1040,7 @@ void tty_write_message(struct tty_struct *tty, char *msg)
   *	write method will not be invoked in parallel for each device.
   */
  
@@ -23799,7 +24811,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt
  						size_t count, loff_t *ppos)
  {
  	struct tty_struct *tty;
-@@ -1072,6 +1063,8 @@ static ssize_t tty_write(struct file *fi
+@@ -1075,6 +1067,8 @@ static ssize_t tty_write(struct file *file, const char __user *buf,
  	return ret;
  }
  
@@ -23808,25 +24820,16 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt
  ssize_t redirected_tty_write(struct file *file, const char __user *buf,
  						size_t count, loff_t *ppos)
  {
-@@ -1867,7 +1860,7 @@ static int tty_open(struct inode *inode,
-  *		Takes bkl. See tty_release_dev
-  */
+@@ -1897,6 +1891,8 @@ got_driver:
+ 
  
--static int tty_release(struct inode *inode, struct file *filp)
-+int tty_release(struct inode *inode, struct file *filp)
- {
- 	lock_kernel();
- 	tty_release_dev(filp);
-@@ -1875,6 +1868,8 @@ static int tty_release(struct inode *ino
- 	return 0;
- }
  
 +EXPORT_SYMBOL(tty_release);
 +
  /**
   *	tty_poll	-	check tty status
   *	@filp: file being polled
-@@ -1887,7 +1882,7 @@ static int tty_release(struct inode *ino
+@@ -1909,7 +1905,7 @@ got_driver:
   *	may be re-entered freely by other callers.
   */
  
@@ -23835,7 +24838,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt
  {
  	struct tty_struct *tty;
  	struct tty_ldisc *ld;
-@@ -1904,7 +1899,9 @@ static unsigned int tty_poll(struct file
+@@ -1926,7 +1922,9 @@ static unsigned int tty_poll(struct file *filp, poll_table *wait)
  	return ret;
  }
  
@@ -23846,7 +24849,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt
  {
  	struct tty_struct *tty;
  	unsigned long flags;
-@@ -1948,6 +1945,8 @@ out:
+@@ -1970,6 +1968,8 @@ out:
  	return retval;
  }
  
@@ -23855,7 +24858,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt
  /**
   *	tiocsti			-	fake input character
   *	@tty: tty to fake input into
-@@ -2582,8 +2581,10 @@ long tty_ioctl(struct file *file, unsign
+@@ -2602,8 +2602,10 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
  	return retval;
  }
  
@@ -23867,16 +24870,17 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt
  				unsigned long arg)
  {
  	struct inode *inode = file->f_dentry->d_inode;
-@@ -2607,6 +2608,8 @@ static long tty_compat_ioctl(struct file
+@@ -2627,6 +2629,9 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd,
  
  	return retval;
  }
 +
 +EXPORT_SYMBOL(tty_compat_ioctl);
++
  #endif
  
  /*
-@@ -3050,11 +3053,6 @@ struct tty_struct *get_current_tty(void)
+@@ -3070,11 +3075,6 @@ struct tty_struct *get_current_tty(void)
  }
  EXPORT_SYMBOL_GPL(get_current_tty);
  
@@ -23888,10 +24892,11 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt
  /*
   * Initialize the console device. This is called *early*, so
   * we can't necessarily depend on lots of kernel help here.
-diff -urNp linux-2.6.32.13/drivers/char/tty_ldisc.c linux-2.6.32.13/drivers/char/tty_ldisc.c
---- linux-2.6.32.13/drivers/char/tty_ldisc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/tty_ldisc.c	2010-05-15 13:21:15.058626500 -0400
-@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc *
+diff --git a/drivers/char/tty_ldisc.c b/drivers/char/tty_ldisc.c
+index 236628f..235d0f9 100644
+--- a/drivers/char/tty_ldisc.c
++++ b/drivers/char/tty_ldisc.c
+@@ -76,7 +76,7 @@ static void put_ldisc(struct tty_ldisc *ld)
  	if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
  		struct tty_ldisc_ops *ldo = ld->ops;
  
@@ -23900,7 +24905,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_ldisc.c linux-2.6.32.13/drivers/char
  		module_put(ldo->owner);
  		spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  
-@@ -107,7 +107,7 @@ int tty_register_ldisc(int disc, struct 
+@@ -111,7 +111,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
  	spin_lock_irqsave(&tty_ldisc_lock, flags);
  	tty_ldiscs[disc] = new_ldisc;
  	new_ldisc->num = disc;
@@ -23909,7 +24914,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_ldisc.c linux-2.6.32.13/drivers/char
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  
  	return ret;
-@@ -135,7 +135,7 @@ int tty_unregister_ldisc(int disc)
+@@ -139,7 +139,7 @@ int tty_unregister_ldisc(int disc)
  		return -EINVAL;
  
  	spin_lock_irqsave(&tty_ldisc_lock, flags);
@@ -23918,7 +24923,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_ldisc.c linux-2.6.32.13/drivers/char
  		ret = -EBUSY;
  	else
  		tty_ldiscs[disc] = NULL;
-@@ -156,7 +156,7 @@ static struct tty_ldisc_ops *get_ldops(i
+@@ -160,7 +160,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
  	if (ldops) {
  		ret = ERR_PTR(-EAGAIN);
  		if (try_module_get(ldops->owner)) {
@@ -23927,7 +24932,7 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_ldisc.c linux-2.6.32.13/drivers/char
  			ret = ldops;
  		}
  	}
-@@ -169,7 +169,7 @@ static void put_ldops(struct tty_ldisc_o
+@@ -173,7 +173,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
  	unsigned long flags;
  
  	spin_lock_irqsave(&tty_ldisc_lock, flags);
@@ -23936,81 +24941,58 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_ldisc.c linux-2.6.32.13/drivers/char
  	module_put(ldops->owner);
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  }
-diff -urNp linux-2.6.32.13/drivers/char/virtio_console.c linux-2.6.32.13/drivers/char/virtio_console.c
---- linux-2.6.32.13/drivers/char/virtio_console.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/virtio_console.c	2010-05-15 13:21:15.058626500 -0400
-@@ -44,6 +44,7 @@ static unsigned int in_len;
- static char *in, *inbuf;
- 
- /* The operations for our console. */
-+/* cannot be const */
- static struct hv_ops virtio_cons;
+diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
+index 85cf230..156d86c 100644
+--- a/drivers/char/vt_ioctl.c
++++ b/drivers/char/vt_ioctl.c
+@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
+ 	if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
+ 		return -EFAULT;
  
- /* The hvc device */
-diff -urNp linux-2.6.32.13/drivers/char/vt_ioctl.c linux-2.6.32.13/drivers/char/vt_ioctl.c
---- linux-2.6.32.13/drivers/char/vt_ioctl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/char/vt_ioctl.c	2010-05-15 13:21:15.062960555 -0400
-@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
+-	if (!capable(CAP_SYS_TTY_CONFIG))
+-		perm = 0;
+-
+ 	switch (cmd) {
+ 	case KDGKBENT:
+ 		key_map = key_maps[s];
+@@ -224,8 +221,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
+ 		    val = (i ? K_HOLE : K_NOSUCHMAP);
+ 		return put_user(val, &user_kbe->kb_value);
  	case KDSKBENT:
++		if (!capable(CAP_SYS_TTY_CONFIG))
++			perm = 0;
++
  		if (!perm)
  			return -EPERM;
 +
-+#ifdef CONFIG_GRKERNSEC
-+		if (!capable(CAP_SYS_TTY_CONFIG))
-+			return -EPERM;
-+#endif
-+
  		if (!i && v == K_NOSUCHMAP) {
  			/* deallocate map */
  			key_map = key_maps[s];
-@@ -366,6 +372,13 @@ do_kdgkb_ioctl(int cmd, struct kbsentry 
- 			goto reterr;
- 		}
+@@ -325,9 +326,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
+ 	int i, j, k;
+ 	int ret;
  
-+#ifdef CONFIG_GRKERNSEC
-+		if (!capable(CAP_SYS_TTY_CONFIG)) {
-+			ret = -EPERM;
-+			goto reterr;
-+		}
-+#endif
+-	if (!capable(CAP_SYS_TTY_CONFIG))
+-		perm = 0;
+-
+ 	kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
+ 	if (!kbs) {
+ 		ret = -ENOMEM;
+@@ -361,6 +359,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
+ 		kfree(kbs);
+ 		return ((p && *p) ? -EOVERFLOW : 0);
+ 	case KDSKBSENT:
++		if (!capable(CAP_SYS_TTY_CONFIG))
++			perm = 0;
 +
- 		q = func_table[i];
- 		first_free = funcbufptr + (funcbufsize - funcbufleft);
- 		for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 
-diff -urNp linux-2.6.32.13/drivers/cpufreq/cpufreq.c linux-2.6.32.13/drivers/cpufreq/cpufreq.c
---- linux-2.6.32.13/drivers/cpufreq/cpufreq.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/cpufreq/cpufreq.c	2010-05-15 13:21:15.062960555 -0400
-@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
- 	complete(&policy->kobj_unregister);
- }
- 
--static struct sysfs_ops sysfs_ops = {
-+static const struct sysfs_ops sysfs_ops = {
- 	.show	= show,
- 	.store	= store,
- };
-diff -urNp linux-2.6.32.13/drivers/cpuidle/sysfs.c linux-2.6.32.13/drivers/cpuidle/sysfs.c
---- linux-2.6.32.13/drivers/cpuidle/sysfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/cpuidle/sysfs.c	2010-05-15 13:21:15.062960555 -0400
-@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
- 	return ret;
- }
- 
--static struct sysfs_ops cpuidle_sysfs_ops = {
-+static const struct sysfs_ops cpuidle_sysfs_ops = {
- 	.show = cpuidle_show,
- 	.store = cpuidle_store,
- };
-@@ -277,7 +277,7 @@ static ssize_t cpuidle_state_show(struct
- 	return ret;
- }
- 
--static struct sysfs_ops cpuidle_state_sysfs_ops = {
-+static const struct sysfs_ops cpuidle_state_sysfs_ops = {
- 	.show = cpuidle_state_show,
- };
- 
-@@ -294,7 +294,7 @@ static struct kobj_type ktype_state_cpui
+ 		if (!perm) {
+ 			ret = -EPERM;
+ 			goto reterr;
+diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
+index 0310ffa..be7917e 100644
+--- a/drivers/cpuidle/sysfs.c
++++ b/drivers/cpuidle/sysfs.c
+@@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpuidle = {
  	.release = cpuidle_state_sysfs_release,
  };
  
@@ -24019,34 +25001,11 @@ diff -urNp linux-2.6.32.13/drivers/cpuidle/sysfs.c linux-2.6.32.13/drivers/cpuid
  {
  	kobject_put(&device->kobjs[i]->kobj);
  	wait_for_completion(&device->kobjs[i]->kobj_unregister);
-diff -urNp linux-2.6.32.13/drivers/dma/ioat/dma.c linux-2.6.32.13/drivers/dma/ioat/dma.c
---- linux-2.6.32.13/drivers/dma/ioat/dma.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/dma/ioat/dma.c	2010-05-15 13:21:15.074651091 -0400
-@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
- 	return entry->show(&chan->common, page);
- }
- 
--struct sysfs_ops ioat_sysfs_ops = {
-+const struct sysfs_ops ioat_sysfs_ops = {
- 	.show	= ioat_attr_show,
- };
- 
-diff -urNp linux-2.6.32.13/drivers/dma/ioat/dma.h linux-2.6.32.13/drivers/dma/ioat/dma.h
---- linux-2.6.32.13/drivers/dma/ioat/dma.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/dma/ioat/dma.h	2010-05-15 13:21:15.090639890 -0400
-@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
- 			   unsigned long *phys_complete);
- void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
- void ioat_kobject_del(struct ioatdma_device *device);
--extern struct sysfs_ops ioat_sysfs_ops;
-+extern const struct sysfs_ops ioat_sysfs_ops;
- extern struct ioat_sysfs_entry ioat_version_attr;
- extern struct ioat_sysfs_entry ioat_cap_attr;
- #endif /* IOATDMA_H */
-diff -urNp linux-2.6.32.13/drivers/edac/edac_core.h linux-2.6.32.13/drivers/edac/edac_core.h
---- linux-2.6.32.13/drivers/edac/edac_core.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/edac/edac_core.h	2010-05-15 13:21:15.090639890 -0400
-@@ -99,11 +99,11 @@ extern int edac_debug_level;
+diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
+index efca934..dbdb52c 100644
+--- a/drivers/edac/edac_core.h
++++ b/drivers/edac/edac_core.h
+@@ -100,11 +100,11 @@ extern const char *edac_mem_types[];
  
  #else				/* !CONFIG_EDAC_DEBUG */
  
@@ -24063,82 +25022,24 @@ diff -urNp linux-2.6.32.13/drivers/edac/edac_core.h linux-2.6.32.13/drivers/edac
  
  #endif				/* !CONFIG_EDAC_DEBUG */
  
-diff -urNp linux-2.6.32.13/drivers/edac/edac_device_sysfs.c linux-2.6.32.13/drivers/edac/edac_device_sysfs.c
---- linux-2.6.32.13/drivers/edac/edac_device_sysfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/edac/edac_device_sysfs.c	2010-05-15 13:21:15.090639890 -0400
-@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
- }
- 
- /* edac_dev file operations for an 'ctl_info' */
--static struct sysfs_ops device_ctl_info_ops = {
-+static const struct sysfs_ops device_ctl_info_ops = {
- 	.show = edac_dev_ctl_info_show,
- 	.store = edac_dev_ctl_info_store
- };
-@@ -373,7 +373,7 @@ static ssize_t edac_dev_instance_store(s
- }
- 
- /* edac_dev file operations for an 'instance' */
--static struct sysfs_ops device_instance_ops = {
-+static const struct sysfs_ops device_instance_ops = {
- 	.show = edac_dev_instance_show,
- 	.store = edac_dev_instance_store
- };
-@@ -476,7 +476,7 @@ static ssize_t edac_dev_block_store(stru
- }
- 
- /* edac_dev file operations for a 'block' */
--static struct sysfs_ops device_block_ops = {
-+static const struct sysfs_ops device_block_ops = {
- 	.show = edac_dev_block_show,
- 	.store = edac_dev_block_store
- };
-diff -urNp linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c	2010-05-15 13:21:15.090639890 -0400
-@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
- 	return -EIO;
- }
- 
--static struct sysfs_ops csrowfs_ops = {
-+static const struct sysfs_ops csrowfs_ops = {
- 	.show = csrowdev_show,
- 	.store = csrowdev_store
- };
-@@ -575,7 +575,7 @@ static ssize_t mcidev_store(struct kobje
+diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
+index c200c2f..474f1ef 100644
+--- a/drivers/edac/edac_mc_sysfs.c
++++ b/drivers/edac/edac_mc_sysfs.c
+@@ -776,7 +776,7 @@ static void edac_inst_grp_release(struct kobject *kobj)
  }
  
  /* Intermediate show/store table */
--static struct sysfs_ops mci_ops = {
-+static const struct sysfs_ops mci_ops = {
- 	.show = mcidev_show,
- 	.store = mcidev_store
- };
-diff -urNp linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c
---- linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c	2010-05-15 13:21:15.090639890 -0400
-@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
- }
- 
- /* fs_ops table */
--static struct sysfs_ops pci_instance_ops = {
-+static const struct sysfs_ops pci_instance_ops = {
- 	.show = edac_pci_instance_show,
- 	.store = edac_pci_instance_store
- };
-@@ -261,7 +261,7 @@ static ssize_t edac_pci_dev_store(struct
- 	return -EIO;
- }
- 
--static struct sysfs_ops edac_pci_sysfs_ops = {
-+static const struct sysfs_ops edac_pci_sysfs_ops = {
- 	.show = edac_pci_dev_show,
- 	.store = edac_pci_dev_store
- };
-diff -urNp linux-2.6.32.13/drivers/firewire/core-cdev.c linux-2.6.32.13/drivers/firewire/core-cdev.c
---- linux-2.6.32.13/drivers/firewire/core-cdev.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/firewire/core-cdev.c	2010-05-15 13:21:15.094957471 -0400
-@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
+-static struct sysfs_ops inst_grp_ops = {
++static const struct sysfs_ops inst_grp_ops = {
+ 	.show = inst_grp_show,
+ 	.store = inst_grp_store
+ };
+diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
+index 5bf106b..3748455 100644
+--- a/drivers/firewire/core-cdev.c
++++ b/drivers/firewire/core-cdev.c
+@@ -1195,8 +1195,7 @@ static int init_iso_resource(struct client *client,
  	int ret;
  
  	if ((request->channels == 0 && request->bandwidth == 0) ||
@@ -24148,10 +25049,11 @@ diff -urNp linux-2.6.32.13/drivers/firewire/core-cdev.c linux-2.6.32.13/drivers/
  		return -EINVAL;
  
  	r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.32.13/drivers/firmware/dmi_scan.c linux-2.6.32.13/drivers/firmware/dmi_scan.c
---- linux-2.6.32.13/drivers/firmware/dmi_scan.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/firmware/dmi_scan.c	2010-05-15 13:21:15.094957471 -0400
-@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
+diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
+index d464672..c3d886d 100644
+--- a/drivers/firmware/dmi_scan.c
++++ b/drivers/firmware/dmi_scan.c
+@@ -387,11 +387,6 @@ void __init dmi_scan_machine(void)
  		}
  	}
  	else {
@@ -24163,70 +25065,37 @@ diff -urNp linux-2.6.32.13/drivers/firmware/dmi_scan.c linux-2.6.32.13/drivers/f
  		p = dmi_ioremap(0xF0000, 0x10000);
  		if (p == NULL)
  			goto error;
-diff -urNp linux-2.6.32.13/drivers/firmware/edd.c linux-2.6.32.13/drivers/firmware/edd.c
---- linux-2.6.32.13/drivers/firmware/edd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/firmware/edd.c	2010-05-15 13:21:15.094957471 -0400
-@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
- 	return ret;
- }
- 
--static struct sysfs_ops edd_attr_ops = {
-+static const struct sysfs_ops edd_attr_ops = {
- 	.show = edd_attr_show,
- };
- 
-diff -urNp linux-2.6.32.13/drivers/firmware/efivars.c linux-2.6.32.13/drivers/firmware/efivars.c
---- linux-2.6.32.13/drivers/firmware/efivars.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/firmware/efivars.c	2010-05-15 13:21:15.102953838 -0400
-@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 
- 	return ret;
- }
- 
--static struct sysfs_ops efivar_attr_ops = {
-+static const struct sysfs_ops efivar_attr_ops = {
- 	.show = efivar_attr_show,
- 	.store = efivar_attr_store,
- };
-diff -urNp linux-2.6.32.13/drivers/firmware/iscsi_ibft.c linux-2.6.32.13/drivers/firmware/iscsi_ibft.c
---- linux-2.6.32.13/drivers/firmware/iscsi_ibft.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/firmware/iscsi_ibft.c	2010-05-15 13:21:15.102953838 -0400
-@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
- 	return ret;
- }
- 
--static struct sysfs_ops ibft_attr_ops = {
-+static const struct sysfs_ops ibft_attr_ops = {
- 	.show = ibft_show_attribute,
- };
- 
-diff -urNp linux-2.6.32.13/drivers/firmware/memmap.c linux-2.6.32.13/drivers/firmware/memmap.c
---- linux-2.6.32.13/drivers/firmware/memmap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/firmware/memmap.c	2010-05-15 13:21:15.102953838 -0400
-@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
- 	NULL
- };
- 
--static struct sysfs_ops memmap_attr_ops = {
-+static const struct sysfs_ops memmap_attr_ops = {
- 	.show = memmap_attr_show,
- };
- 
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_drv.c linux-2.6.32.13/drivers/gpu/drm/drm_drv.c
---- linux-2.6.32.13/drivers/gpu/drm/drm_drv.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/drm_drv.c	2010-05-15 13:21:15.118645498 -0400
-@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
- 	char *kdata = NULL;
- 
+diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
+index 25d70d6..9ff22b2 100644
+--- a/drivers/gpu/drm/drm_crtc_helper.c
++++ b/drivers/gpu/drm/drm_crtc_helper.c
+@@ -262,7 +262,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
+ 	struct drm_crtc *tmp;
+ 	int crtc_mask = 1;
+ 
+-	WARN(!crtc, "checking null crtc?");
++	BUG_ON(!crtc);
+ 
+ 	dev = crtc->dev;
+ 
+diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
+index c9736ed..0ada3c8 100644
+--- a/drivers/gpu/drm/drm_drv.c
++++ b/drivers/gpu/drm/drm_drv.c
+@@ -449,7 +449,7 @@ long drm_ioctl(struct file *filp,
+ 
+ 	dev = file_priv->minor->dev;
  	atomic_inc(&dev->ioctl_count);
 -	atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
 +	atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
  	++file_priv->ioctl_count;
  
  	DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_fops.c linux-2.6.32.13/drivers/gpu/drm/drm_fops.c
---- linux-2.6.32.13/drivers/gpu/drm/drm_fops.c	2010-04-29 17:49:37.845185844 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/drm_fops.c	2010-05-15 13:21:15.130631389 -0400
-@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
+diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
+index e7aace2..b5b4f37 100644
+--- a/drivers/gpu/drm/drm_fops.c
++++ b/drivers/gpu/drm/drm_fops.c
+@@ -67,7 +67,7 @@ static int drm_setup(struct drm_device * dev)
  	}
  
  	for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
@@ -24235,7 +25104,7 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_fops.c linux-2.6.32.13/drivers/gp
  
  	dev->sigdata.lock = NULL;
  
-@@ -130,9 +130,9 @@ int drm_open(struct inode *inode, struct
+@@ -131,9 +131,9 @@ int drm_open(struct inode *inode, struct file *filp)
  
  	retcode = drm_open_helper(inode, filp, dev);
  	if (!retcode) {
@@ -24247,7 +25116,7 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_fops.c linux-2.6.32.13/drivers/gp
  			spin_unlock(&dev->count_lock);
  			retcode = drm_setup(dev);
  			goto out;
-@@ -435,7 +435,7 @@ int drm_release(struct inode *inode, str
+@@ -474,7 +474,7 @@ int drm_release(struct inode *inode, struct file *filp)
  
  	lock_kernel();
  
@@ -24256,7 +25125,7 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_fops.c linux-2.6.32.13/drivers/gp
  
  	if (dev->driver->preclose)
  		dev->driver->preclose(dev, file_priv);
-@@ -447,7 +447,7 @@ int drm_release(struct inode *inode, str
+@@ -486,7 +486,7 @@ int drm_release(struct inode *inode, struct file *filp)
  	DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
  		  task_pid_nr(current),
  		  (long)old_encode_dev(file_priv->minor->device),
@@ -24265,7 +25134,7 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_fops.c linux-2.6.32.13/drivers/gp
  
  	/* if the master has gone away we can't do anything with the lock */
  	if (file_priv->minor->master)
-@@ -524,9 +524,9 @@ int drm_release(struct inode *inode, str
+@@ -567,9 +567,9 @@ int drm_release(struct inode *inode, struct file *filp)
  	 * End inline drm_release
  	 */
  
@@ -24277,10 +25146,43 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_fops.c linux-2.6.32.13/drivers/gp
  		if (atomic_read(&dev->ioctl_count)) {
  			DRM_ERROR("Device busy: %d\n",
  				  atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c	2010-05-15 13:21:15.138734335 -0400
-@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
+diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
+index f0f6c6b..d31451d 100644
+--- a/drivers/gpu/drm/drm_info.c
++++ b/drivers/gpu/drm/drm_info.c
+@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
+ 	struct drm_local_map *map;
+ 	struct drm_map_list *r_list;
+ 
+-	/* Hardcoded from _DRM_FRAME_BUFFER,
+-	   _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
+-	   _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
+-	const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
++	static const char * const types[] = {
++		[_DRM_FRAME_BUFFER] = "FB",
++		[_DRM_REGISTERS] = "REG",
++		[_DRM_SHM] = "SHM",
++		[_DRM_AGP] = "AGP",
++		[_DRM_SCATTER_GATHER] = "SG",
++		[_DRM_CONSISTENT] = "PCI",
++		[_DRM_GEM] = "GEM" };
+ 	const char *type;
+ 	int i;
+ 
+@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
+ 		map = r_list->map;
+ 		if (!map)
+ 			continue;
+-		if (map->type < 0 || map->type > 5)
++		if (map->type >= ARRAY_SIZE(types))
+ 			type = "??";
+ 		else
+ 			type = types[map->type];
+diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
+index 9b9ff46..4ea724c 100644
+--- a/drivers/gpu/drm/drm_ioctl.c
++++ b/drivers/gpu/drm/drm_ioctl.c
+@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, void *data,
  			stats->data[i].value =
  			    (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
  		else
@@ -24289,10 +25191,11 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.13/drivers/g
  		stats->data[i].type = dev->types[i];
  	}
  
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_lock.c linux-2.6.32.13/drivers/gpu/drm/drm_lock.c
---- linux-2.6.32.13/drivers/gpu/drm/drm_lock.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/drm_lock.c	2010-05-15 13:21:15.138734335 -0400
-@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
+diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
+index e2f70a5..c703e86 100644
+--- a/drivers/gpu/drm/drm_lock.c
++++ b/drivers/gpu/drm/drm_lock.c
+@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
  		if (drm_lock_take(&master->lock, lock->context)) {
  			master->lock.file_priv = file_priv;
  			master->lock.lock_time = jiffies;
@@ -24301,7 +25204,7 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_lock.c linux-2.6.32.13/drivers/gp
  			break;	/* Got lock */
  		}
  
-@@ -165,7 +165,7 @@ int drm_unlock(struct drm_device *dev, v
+@@ -165,7 +165,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
  		return -EINVAL;
  	}
  
@@ -24310,10 +25213,11 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_lock.c linux-2.6.32.13/drivers/gp
  
  	/* kernel_context_switch isn't used by any of the x86 drm
  	 * modules but is required by the Sparc driver.
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c	2010-05-15 13:21:15.158669145 -0400
-@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
+diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
+index 997d917..34e6717 100644
+--- a/drivers/gpu/drm/i810/i810_dma.c
++++ b/drivers/gpu/drm/i810/i810_dma.c
+@@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
  				 dma->buflist[vertex->idx],
  				 vertex->discard, vertex->used);
  
@@ -24324,7 +25228,7 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.13/drive
  	sarea_priv->last_enqueue = dev_priv->counter - 1;
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
-@@ -1115,8 +1115,8 @@ static int i810_dma_mc(struct drm_device
+@@ -1116,8 +1116,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
  	i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
  			     mc->last_render);
  
@@ -24335,34 +25239,11 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.13/drive
  	sarea_priv->last_enqueue = dev_priv->counter - 1;
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c	2010-05-15 13:21:15.175041309 -0400
-@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
- 	}
- }
- 
--struct intel_dvo_dev_ops ch7017_ops = {
-+const struct intel_dvo_dev_ops ch7017_ops = {
- 	.init = ch7017_init,
- 	.detect = ch7017_detect,
- 	.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c	2010-05-15 13:21:15.175041309 -0400
-@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
- 	}
- }
- 
--struct intel_dvo_dev_ops ch7xxx_ops = {
-+const struct intel_dvo_dev_ops ch7xxx_ops = {
- 	.init = ch7xxx_init,
- 	.detect = ch7xxx_detect,
- 	.mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h	2010-05-15 13:21:15.175041309 -0400
-@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
+diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h
+index 0d6ff64..2743ae3 100644
+--- a/drivers/gpu/drm/i915/dvo.h
++++ b/drivers/gpu/drm/i915/dvo.h
+@@ -125,23 +125,23 @@ struct intel_dvo_dev_ops {
  	 *
  	 * \return singly-linked list of modes or NULL if no modes found.
  	 */
@@ -24394,10 +25275,37 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h linux-2.6.32.13/drivers/gp
 +extern const struct intel_dvo_dev_ops ch7017_ops;
  
  #endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c	2010-05-15 13:21:15.175041309 -0400
-@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
+diff --git a/drivers/gpu/drm/i915/dvo_ch7017.c b/drivers/gpu/drm/i915/dvo_ch7017.c
+index 14d5980..df7e908 100644
+--- a/drivers/gpu/drm/i915/dvo_ch7017.c
++++ b/drivers/gpu/drm/i915/dvo_ch7017.c
+@@ -402,7 +402,7 @@ static void ch7017_destroy(struct intel_dvo_device *dvo)
+ 	}
+ }
+ 
+-struct intel_dvo_dev_ops ch7017_ops = {
++const struct intel_dvo_dev_ops ch7017_ops = {
+ 	.init = ch7017_init,
+ 	.detect = ch7017_detect,
+ 	.mode_valid = ch7017_mode_valid,
+diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c
+index 6f1944b..b5d996d 100644
+--- a/drivers/gpu/drm/i915/dvo_ch7xxx.c
++++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c
+@@ -322,7 +322,7 @@ static void ch7xxx_destroy(struct intel_dvo_device *dvo)
+ 	}
+ }
+ 
+-struct intel_dvo_dev_ops ch7xxx_ops = {
++const struct intel_dvo_dev_ops ch7xxx_ops = {
+ 	.init = ch7xxx_init,
+ 	.detect = ch7xxx_detect,
+ 	.mode_valid = ch7xxx_mode_valid,
+diff --git a/drivers/gpu/drm/i915/dvo_ivch.c b/drivers/gpu/drm/i915/dvo_ivch.c
+index a2ec3f4..01bb226 100644
+--- a/drivers/gpu/drm/i915/dvo_ivch.c
++++ b/drivers/gpu/drm/i915/dvo_ivch.c
+@@ -412,7 +412,7 @@ static void ivch_destroy(struct intel_dvo_device *dvo)
  	}
  }
  
@@ -24405,11 +25313,12 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.13/drive
 +const struct intel_dvo_dev_ops ivch_ops= {
  	.init = ivch_init,
  	.dpms = ivch_dpms,
- 	.save = ivch_save,
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c	2010-05-15 13:21:15.175041309 -0400
-@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
+ 	.mode_valid = ivch_mode_valid,
+diff --git a/drivers/gpu/drm/i915/dvo_sil164.c b/drivers/gpu/drm/i915/dvo_sil164.c
+index 9b8e676..8600683 100644
+--- a/drivers/gpu/drm/i915/dvo_sil164.c
++++ b/drivers/gpu/drm/i915/dvo_sil164.c
+@@ -254,7 +254,7 @@ static void sil164_destroy(struct intel_dvo_device *dvo)
  	}
  }
  
@@ -24418,10 +25327,11 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.13/dri
  	.init = sil164_init,
  	.detect = sil164_detect,
  	.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c	2010-05-15 13:21:15.178966455 -0400
-@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
+diff --git a/drivers/gpu/drm/i915/dvo_tfp410.c b/drivers/gpu/drm/i915/dvo_tfp410.c
+index 56f6642..98fbcce 100644
+--- a/drivers/gpu/drm/i915/dvo_tfp410.c
++++ b/drivers/gpu/drm/i915/dvo_tfp410.c
+@@ -295,7 +295,7 @@ static void tfp410_destroy(struct intel_dvo_device *dvo)
  	}
  }
  
@@ -24430,22 +25340,94 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.13/dri
  	.init = tfp410_init,
  	.detect = tfp410_detect,
  	.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c	2010-05-15 13:21:15.178966455 -0400
-@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev)
- 	return i915_resume(dev);
+diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
+index bdd39fb..d35c5d1 100644
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -1348,7 +1348,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
+ 	bool can_switch;
+ 
+ 	spin_lock(&dev->count_lock);
+-	can_switch = (dev->open_count == 0);
++	can_switch = (atomic_read(&dev->open_count) == 0);
+ 	spin_unlock(&dev->count_lock);
+ 	return can_switch;
  }
+diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
+index 194e0c4..315bd7c 100644
+--- a/drivers/gpu/drm/i915/i915_drv.c
++++ b/drivers/gpu/drm/i915/i915_drv.c
+@@ -497,7 +497,7 @@ const struct dev_pm_ops i915_pm_ops = {
+      .restore = i915_pm_resume,
+ };
  
 -static struct vm_operations_struct i915_gem_vm_ops = {
 +static const struct vm_operations_struct i915_gem_vm_ops = {
  	.fault = i915_gem_fault,
  	.open = drm_gem_vm_open,
  	.close = drm_gem_vm_close,
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c	2010-05-15 13:21:15.190982657 -0400
-@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 
+diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
+index dc5d2ef..320b6f6 100644
+--- a/drivers/gpu/drm/i915/i915_gem.c
++++ b/drivers/gpu/drm/i915/i915_gem.c
+@@ -471,7 +471,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
+ 	}
+ 
+ 	if (!access_ok(VERIFY_WRITE,
+-		       (char __user *)(uintptr_t)args->data_ptr,
++		       (char __user *) (uintptr_t)args->data_ptr,
+ 		       args->size)) {
+ 		ret = -EFAULT;
+ 		goto err;
+@@ -939,7 +939,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
+ 	}
+ 
+ 	if (!access_ok(VERIFY_READ,
+-		       (char __user *)(uintptr_t)args->data_ptr,
++		       (char __user *) (uintptr_t)args->data_ptr,
+ 		       args->size)) {
+ 		ret = -EFAULT;
+ 		goto err;
+diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
+index 406228f..8933e98 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
++++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
+@@ -58,7 +58,7 @@ static int nv40_set_intensity(struct backlight_device *bd)
+ 	return 0;
+ }
+ 
+-static struct backlight_ops nv40_bl_ops = {
++static const struct backlight_ops nv40_bl_ops = {
+ 	.options = BL_CORE_SUSPENDRESUME,
+ 	.get_brightness = nv40_get_intensity,
+ 	.update_status = nv40_set_intensity,
+@@ -81,7 +81,7 @@ static int nv50_set_intensity(struct backlight_device *bd)
+ 	return 0;
+ }
+ 
+-static struct backlight_ops nv50_bl_ops = {
++static const struct backlight_ops nv50_bl_ops = {
+ 	.options = BL_CORE_SUSPENDRESUME,
+ 	.get_brightness = nv50_get_intensity,
+ 	.update_status = nv50_set_intensity,
+diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
+index b02a231..07087b0 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_state.c
++++ b/drivers/gpu/drm/nouveau/nouveau_state.c
+@@ -395,7 +395,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
+ 	bool can_switch;
+ 
+ 	spin_lock(&dev->count_lock);
+-	can_switch = (dev->open_count == 0);
++	can_switch = (atomic_read(&dev->open_count) == 0);
+ 	spin_unlock(&dev->count_lock);
+ 	return can_switch;
+ }
+diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
+index 607241c..54b4fe6 100644
+--- a/drivers/gpu/drm/radeon/mkregtable.c
++++ b/drivers/gpu/drm/radeon/mkregtable.c
+@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
  	regex_t mask_rex;
  	regmatch_t match[4];
  	char buf[1024];
@@ -24462,49 +25444,46 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.13/d
  
  	if (regcomp
  	    (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c	2010-05-15 13:21:15.194751236 -0400
-@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o
- 	}
- }
- 
--struct bios_connector {
-+static struct bios_connector {
- 	bool valid;
- 	uint16_t line_mux;
- 	uint16_t devices;
- 	int connector_type;
- 	struct radeon_i2c_bus_rec ddc_bus;
--};
-+} bios_connectors[ATOM_MAX_SUPPORTED_DEVICE];
- 
- bool radeon_get_atom_connector_info_from_supported_devices_table(struct
- 								 drm_device
-@@ -526,7 +526,6 @@ bool radeon_get_atom_connector_info_from
- 	uint8_t dac;
- 	union atom_supported_devices *supported_devices;
- 	int i, j;
--	struct bios_connector bios_connectors[ATOM_MAX_SUPPORTED_DEVICE];
- 
- 	atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
- 
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c	2010-05-15 13:21:15.198961996 -0400
-@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
- 
- 					if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
+diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
+index a718463..2569728 100644
+--- a/drivers/gpu/drm/radeon/radeon_device.c
++++ b/drivers/gpu/drm/radeon/radeon_device.c
+@@ -562,7 +562,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
+ 	bool can_switch;
+ 
+ 	spin_lock(&dev->count_lock);
+-	can_switch = (dev->open_count == 0);
++	can_switch = (atomic_read(&dev->open_count) == 0);
+ 	spin_unlock(&dev->count_lock);
+ 	return can_switch;
+ }
+diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
+index 2d95376..a65db3c 100644
+--- a/drivers/gpu/drm/radeon/radeon_display.c
++++ b/drivers/gpu/drm/radeon/radeon_display.c
+@@ -561,7 +561,7 @@ static void radeon_compute_pll_legacy(struct radeon_pll *pll,
+ 
+ 					if (pll->flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
  						error = freq - current_freq;
 -						error = error < 0 ? 0xffffffff : error;
 +						error = (int32_t)error < 0 ? 0xffffffff : error;
  					} else
  						error = abs(current_freq - freq);
  					vco_diff = abs(vco - best_vco);
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c	2010-05-15 13:21:15.206905040 -0400
-@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm
+diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
+index b3ba44c..a09abbf 100644
+--- a/drivers/gpu/drm/radeon/radeon_state.c
++++ b/drivers/gpu/drm/radeon/radeon_state.c
+@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
+ 	if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
+ 		sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
+ 
+-	if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
++	if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
+ 			       sarea_priv->nbox * sizeof(depth_boxes[0])))
+ 		return -EFAULT;
+ 
+@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
  {
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  	drm_radeon_getparam_t *param = data;
@@ -24513,38 +25492,50 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.13
  
  	DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c	2010-05-15 13:21:15.206905040 -0400
-@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
+diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
+index e9918d8..90f13b4 100644
+--- a/drivers/gpu/drm/radeon/radeon_ttm.c
++++ b/drivers/gpu/drm/radeon/radeon_ttm.c
+@@ -601,8 +601,9 @@ void radeon_ttm_fini(struct radeon_device *rdev)
  	DRM_INFO("radeon: ttm finalized\n");
  }
  
 -static struct vm_operations_struct radeon_ttm_vm_ops;
 -static const struct vm_operations_struct *ttm_vm_ops = NULL;
--
--static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
--{
--	struct ttm_buffer_object *bo;
--	int r;
--
--	bo = (struct ttm_buffer_object *)vma->vm_private_data;
++extern int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
++extern void ttm_bo_vm_open(struct vm_area_struct *vma);
++extern void ttm_bo_vm_close(struct vm_area_struct *vma);
+ 
+ static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+ {
+@@ -610,17 +611,22 @@ static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+ 	struct radeon_device *rdev;
+ 	int r;
+ 
+-	bo = (struct ttm_buffer_object *)vma->vm_private_data;	
 -	if (bo == NULL) {
--		return VM_FAULT_NOPAGE;
++	bo = (struct ttm_buffer_object *)vma->vm_private_data;
++	if (!bo)
+ 		return VM_FAULT_NOPAGE;
 -	}
+ 	rdev = radeon_get_rdev(bo->bdev);
+ 	mutex_lock(&rdev->vram_mutex);
 -	r = ttm_vm_ops->fault(vma, vmf);
--	return r;
--}
--
++	r = ttm_bo_vm_fault(vma, vmf);
+ 	mutex_unlock(&rdev->vram_mutex);
+ 	return r;
+ }
+ 
++static const struct vm_operations_struct radeon_ttm_vm_ops = {
++	.fault = radeon_ttm_fault,
++	.open = ttm_bo_vm_open,
++	.close = ttm_bo_vm_close
++};
++
  int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
  {
  	struct drm_file *file_priv;
- 	struct radeon_device *rdev;
--	int r;
- 
- 	if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) {
- 		return drm_mmap(filp, vma);
-@@ -563,20 +546,9 @@ int radeon_mmap(struct file *filp, struc
+@@ -633,18 +639,11 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
  
  	file_priv = (struct drm_file *)filp->private_data;
  	rdev = file_priv->minor->dev->dev_private;
@@ -24552,25 +25543,24 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.13/d
 +	if (!rdev)
  		return -EINVAL;
 -	}
--	r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
+ 	r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
 -	if (unlikely(r != 0)) {
--		return r;
++	if (r)
+ 		return r;
 -	}
 -	if (unlikely(ttm_vm_ops == NULL)) {
 -		ttm_vm_ops = vma->vm_ops;
 -		radeon_ttm_vm_ops = *ttm_vm_ops;
 -		radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
 -	}
--	vma->vm_ops = &radeon_ttm_vm_ops;
--	return 0;
-+	return ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
+ 	vma->vm_ops = &radeon_ttm_vm_ops;
+ 	return 0;
  }
- 
- 
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c	2010-05-15 13:21:15.206905040 -0400
-@@ -39,7 +39,7 @@
+diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
+index 555ebb1..ea14dea 100644
+--- a/drivers/gpu/drm/ttm/ttm_bo.c
++++ b/drivers/gpu/drm/ttm/ttm_bo.c
+@@ -47,7 +47,7 @@
  #include <linux/module.h>
  
  #define TTM_ASSERT_LOCKED(param)
@@ -24579,28 +25569,25 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.13/drivers/
  #define TTM_BO_HASH_ORDER 13
  
  static int ttm_bo_setup_vm(struct ttm_buffer_object *bo);
-@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a
- 	NULL
- };
- 
--static struct sysfs_ops ttm_bo_global_ops = {
-+static const struct sysfs_ops ttm_bo_global_ops = {
- 	.show = &ttm_bo_global_show
- };
+diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
+index fe6cb77..05e85a6 100644
+--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
++++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
+@@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_vm_lookup_rb(struct ttm_bo_device *bdev,
+ 	return best_bo;
+ }
  
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c	2010-05-15 13:21:15.206905040 -0400
-@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
+-static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
  {
  	struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
  	    vma->vm_private_data;
 -	struct ttm_bo_device *bdev = bo->bdev;
 +	struct ttm_bo_device *bdev;
- 	unsigned long bus_base;
- 	unsigned long bus_offset;
- 	unsigned long bus_size;
-@@ -88,6 +88,10 @@ static int ttm_bo_vm_fault(struct vm_are
+ 	unsigned long page_offset;
+ 	unsigned long page_last;
+ 	unsigned long pfn;
+@@ -84,6 +84,10 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
  	unsigned long address = (unsigned long)vmf->virtual_address;
  	int retval = VM_FAULT_NOPAGE;
  
@@ -24611,9 +25598,38 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.13/drive
  	/*
  	 * Work around locking order reversal in fault / nopfn
  	 * between mmap_sem and bo_reserve: Perform a trylock operation
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c
---- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c	2010-05-15 13:21:15.206905040 -0400
+@@ -212,22 +216,25 @@ out_unlock:
+ 	ttm_bo_unreserve(bo);
+ 	return retval;
+ }
++EXPORT_SYMBOL(ttm_bo_vm_fault);
+ 
+-static void ttm_bo_vm_open(struct vm_area_struct *vma)
++void ttm_bo_vm_open(struct vm_area_struct *vma)
+ {
+ 	struct ttm_buffer_object *bo =
+ 	    (struct ttm_buffer_object *)vma->vm_private_data;
+ 
+ 	(void)ttm_bo_reference(bo);
+ }
++EXPORT_SYMBOL(ttm_bo_vm_open);
+ 
+-static void ttm_bo_vm_close(struct vm_area_struct *vma)
++void ttm_bo_vm_close(struct vm_area_struct *vma)
+ {
+ 	struct ttm_buffer_object *bo = (struct ttm_buffer_object *)vma->vm_private_data;
+ 
+ 	ttm_bo_unref(&bo);
+ 	vma->vm_private_data = NULL;
+ }
++EXPORT_SYMBOL(ttm_bo_vm_close);
+ 
+ static const struct vm_operations_struct ttm_bo_vm_ops = {
+ 	.fault = ttm_bo_vm_fault,
+diff --git a/drivers/gpu/drm/ttm/ttm_global.c b/drivers/gpu/drm/ttm/ttm_global.c
+index b170071..28ae90e 100644
+--- a/drivers/gpu/drm/ttm/ttm_global.c
++++ b/drivers/gpu/drm/ttm/ttm_global.c
 @@ -36,7 +36,7 @@
  struct ttm_global_item {
  	struct mutex mutex;
@@ -24641,7 +25657,7 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.13/driv
  	}
  }
  
-@@ -70,7 +70,7 @@ int ttm_global_item_ref(struct ttm_globa
+@@ -70,7 +70,7 @@ int ttm_global_item_ref(struct ttm_global_reference *ref)
  	void *object;
  
  	mutex_lock(&item->mutex);
@@ -24650,7 +25666,7 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.13/driv
  		item->object = kzalloc(ref->size, GFP_KERNEL);
  		if (unlikely(item->object == NULL)) {
  			ret = -ENOMEM;
-@@ -83,7 +83,7 @@ int ttm_global_item_ref(struct ttm_globa
+@@ -83,7 +83,7 @@ int ttm_global_item_ref(struct ttm_global_reference *ref)
  			goto out_err;
  
  	}
@@ -24659,7 +25675,7 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.13/driv
  	ref->object = item->object;
  	object = item->object;
  	mutex_unlock(&item->mutex);
-@@ -100,9 +100,9 @@ void ttm_global_item_unref(struct ttm_gl
+@@ -100,9 +100,9 @@ void ttm_global_item_unref(struct ttm_global_reference *ref)
  	struct ttm_global_item *item = &glob[ref->global_type];
  
  	mutex_lock(&item->mutex);
@@ -24671,22 +25687,24 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.13/driv
  		ref->release(ref);
  		item->object = NULL;
  	}
-diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c
---- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c	2010-05-15 13:21:15.206905040 -0400
-@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
- 	NULL
- };
- 
--static struct sysfs_ops ttm_mem_zone_ops = {
-+static const struct sysfs_ops ttm_mem_zone_ops = {
- 	.show = &ttm_mem_zone_show,
- 	.store = &ttm_mem_zone_store
- };
-diff -urNp linux-2.6.32.13/drivers/hid/usbhid/hiddev.c linux-2.6.32.13/drivers/hid/usbhid/hiddev.c
---- linux-2.6.32.13/drivers/hid/usbhid/hiddev.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/hid/usbhid/hiddev.c	2010-05-15 13:21:15.206905040 -0400
-@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
+diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
+index 7dca2fa..3c4b2cd 100644
+--- a/drivers/hid/hidraw.c
++++ b/drivers/hid/hidraw.c
+@@ -252,7 +252,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,
+ 
+ 	mutex_lock(&minors_lock);
+ 	dev = hidraw_table[minor];
+-	if (!dev) {
++	if (dev == NULL) {
+ 		ret = -ENODEV;
+ 		goto out;
+ 	}
+diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
+index c24d2fa..9ae67a5 100644
+--- a/drivers/hid/usbhid/hiddev.c
++++ b/drivers/hid/usbhid/hiddev.c
+@@ -616,7 +616,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
  		return put_user(HID_VERSION, (int __user *)arg);
  
  	case HIDIOCAPPLICATION:
@@ -24695,58 +25713,63 @@ diff -urNp linux-2.6.32.13/drivers/hid/usbhid/hiddev.c linux-2.6.32.13/drivers/h
  			return -EINVAL;
  
  		for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.32.13/drivers/hwmon/k8temp.c linux-2.6.32.13/drivers/hwmon/k8temp.c
---- linux-2.6.32.13/drivers/hwmon/k8temp.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/hwmon/k8temp.c	2010-05-15 13:21:15.206905040 -0400
-@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
+diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
+index 8364932..e40d5a6 100644
+--- a/drivers/hwmon/k8temp.c
++++ b/drivers/hwmon/k8temp.c
+@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
  
- static struct pci_device_id k8temp_ids[] = {
+ static const struct pci_device_id k8temp_ids[] = {
  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
 -	{ 0 },
 +	{ 0, 0, 0, 0, 0, 0, 0 },
  };
  
  MODULE_DEVICE_TABLE(pci, k8temp_ids);
-diff -urNp linux-2.6.32.13/drivers/hwmon/sis5595.c linux-2.6.32.13/drivers/hwmon/sis5595.c
---- linux-2.6.32.13/drivers/hwmon/sis5595.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/hwmon/sis5595.c	2010-05-15 13:21:15.222963784 -0400
-@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
+diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
+index 79c2931..289a012 100644
+--- a/drivers/hwmon/sis5595.c
++++ b/drivers/hwmon/sis5595.c
+@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_update_device(struct device *dev)
  
- static struct pci_device_id sis5595_pci_ids[] = {
+ static const struct pci_device_id sis5595_pci_ids[] = {
  	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
 -	{ 0, }
 +	{ 0, 0, 0, 0, 0, 0, 0 }
  };
  
  MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
-diff -urNp linux-2.6.32.13/drivers/hwmon/via686a.c linux-2.6.32.13/drivers/hwmon/via686a.c
---- linux-2.6.32.13/drivers/hwmon/via686a.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/hwmon/via686a.c	2010-05-15 13:21:15.230602217 -0400
-@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
+diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
+index f397ce7..97dfbe6 100644
+--- a/drivers/hwmon/via686a.c
++++ b/drivers/hwmon/via686a.c
+@@ -769,7 +769,7 @@ static struct via686a_data *via686a_update_device(struct device *dev)
  
- static struct pci_device_id via686a_pci_ids[] = {
+ static const struct pci_device_id via686a_pci_ids[] = {
  	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) },
 -	{ 0, }
 +	{ 0, 0, 0, 0, 0, 0, 0 }
  };
  
  MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
-diff -urNp linux-2.6.32.13/drivers/hwmon/vt8231.c linux-2.6.32.13/drivers/hwmon/vt8231.c
---- linux-2.6.32.13/drivers/hwmon/vt8231.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/hwmon/vt8231.c	2010-05-15 13:21:15.230602217 -0400
-@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
+diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
+index e6078c9..8aae2d3 100644
+--- a/drivers/hwmon/vt8231.c
++++ b/drivers/hwmon/vt8231.c
+@@ -699,7 +699,7 @@ static struct platform_driver vt8231_driver = {
  
- static struct pci_device_id vt8231_pci_ids[] = {
+ static const struct pci_device_id vt8231_pci_ids[] = {
  	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231_4) },
 -	{ 0, }
 +	{ 0, 0, 0, 0, 0, 0, 0 }
  };
  
  MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
-diff -urNp linux-2.6.32.13/drivers/hwmon/w83791d.c linux-2.6.32.13/drivers/hwmon/w83791d.c
---- linux-2.6.32.13/drivers/hwmon/w83791d.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/hwmon/w83791d.c	2010-05-15 13:21:15.234719424 -0400
-@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
+diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
+index 400a88b..2392c35 100644
+--- a/drivers/hwmon/w83791d.c
++++ b/drivers/hwmon/w83791d.c
+@@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_client *client,
  			  struct i2c_board_info *info);
  static int w83791d_remove(struct i2c_client *client);
  
@@ -24757,10 +25780,11 @@ diff -urNp linux-2.6.32.13/drivers/hwmon/w83791d.c linux-2.6.32.13/drivers/hwmon
  static struct w83791d_data *w83791d_update_device(struct device *dev);
  
  #ifdef DEBUG
-diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c
---- linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c	2010-04-29 17:49:37.945518391 -0400
-+++ linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c	2010-05-15 13:21:15.234719424 -0400
-@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =
+diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
+index c600811..07bd389 100644
+--- a/drivers/i2c/busses/i2c-i801.c
++++ b/drivers/i2c/busses/i2c-i801.c
+@@ -592,7 +592,7 @@ static const struct pci_device_id i801_ids[] = {
  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
@@ -24768,11 +25792,12 @@ diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c linux-2.6.32.13/drivers
 +	{ 0, 0, 0, 0, 0, 0, 0 }
  };
  
- MODULE_DEVICE_TABLE (pci, i801_ids);
-diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c
---- linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c	2010-05-15 13:21:15.234719424 -0400
-@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
+ MODULE_DEVICE_TABLE(pci, i801_ids);
+diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
+index 6d14ac2..0d8f727 100644
+--- a/drivers/i2c/busses/i2c-piix4.c
++++ b/drivers/i2c/busses/i2c-piix4.c
+@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdata piix4_dmi_ibm[] = {
  		.ident = "IBM",
  		.matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
  	},
@@ -24781,7 +25806,7 @@ diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.13/driver
  };
  
  static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,
-@@ -491,7 +491,7 @@ static struct pci_device_id piix4_ids[] 
+@@ -491,7 +491,7 @@ static const struct pci_device_id piix4_ids[] = {
  		     PCI_DEVICE_ID_SERVERWORKS_HT1000SB) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
  		     PCI_DEVICE_ID_SERVERWORKS_HT1100LD) },
@@ -24790,11 +25815,12 @@ diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.13/driver
  };
  
  MODULE_DEVICE_TABLE (pci, piix4_ids);
-diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c
---- linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c	2010-05-15 13:21:15.234719424 -0400
-@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
- static struct pci_device_id sis630_ids[] __devinitdata = {
+diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
+index e6f539e..52f75f0 100644
+--- a/drivers/i2c/busses/i2c-sis630.c
++++ b/drivers/i2c/busses/i2c-sis630.c
+@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter = {
+ static const struct pci_device_id sis630_ids[] __devinitconst = {
  	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC) },
 -	{ 0, }
@@ -24802,22 +25828,24 @@ diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.13/drive
  };
  
  MODULE_DEVICE_TABLE (pci, sis630_ids);
-diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c
---- linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c	2010-05-15 13:21:15.234719424 -0400
-@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
+diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
+index 86837f0..bdd4822 100644
+--- a/drivers/i2c/busses/i2c-sis96x.c
++++ b/drivers/i2c/busses/i2c-sis96x.c
+@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter = {
  
- static struct pci_device_id sis96x_ids[] = {
+ static const struct pci_device_id sis96x_ids[] = {
  	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) },
 -	{ 0, }
 +	{ 0, 0, 0, 0, 0, 0, 0 }
  };
  
  MODULE_DEVICE_TABLE (pci, sis96x_ids);
-diff -urNp linux-2.6.32.13/drivers/ide/ide-cd.c linux-2.6.32.13/drivers/ide/ide-cd.c
---- linux-2.6.32.13/drivers/ide/ide-cd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ide/ide-cd.c	2010-05-15 13:21:15.234719424 -0400
-@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_
+diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
+index 2de76cc..74186a1 100644
+--- a/drivers/ide/ide-cd.c
++++ b/drivers/ide/ide-cd.c
+@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
  		alignment = queue_dma_alignment(q) | q->dma_pad_mask;
  		if ((unsigned long)buf & alignment
  		    || blk_rq_bytes(rq) & q->dma_pad_mask
@@ -24826,10 +25854,11 @@ diff -urNp linux-2.6.32.13/drivers/ide/ide-cd.c linux-2.6.32.13/drivers/ide/ide-
  			drive->dma = 0;
  	}
  }
-diff -urNp linux-2.6.32.13/drivers/ieee1394/dv1394.c linux-2.6.32.13/drivers/ieee1394/dv1394.c
---- linux-2.6.32.13/drivers/ieee1394/dv1394.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ieee1394/dv1394.c	2010-05-15 13:21:15.234719424 -0400
-@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
+diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
+index adaefab..a85984c 100644
+--- a/drivers/ieee1394/dv1394.c
++++ b/drivers/ieee1394/dv1394.c
+@@ -739,7 +739,7 @@ static void frame_prepare(struct video_card *video, unsigned int this_frame)
  	based upon DIF section and sequence
  */
  
@@ -24838,7 +25867,7 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/dv1394.c linux-2.6.32.13/drivers/iee
  frame_put_packet (struct frame *f, struct packet *p)
  {
  	int section_type = p->data[0] >> 5;           /* section type is in bits 5 - 7 */
-@@ -2178,7 +2178,7 @@ static const struct ieee1394_device_id d
+@@ -2179,7 +2179,7 @@ static const struct ieee1394_device_id dv1394_id_table[] = {
  		.specifier_id	= AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,
  		.version	= AVC_SW_VERSION_ENTRY & 0xffffff
  	},
@@ -24847,10 +25876,11 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/dv1394.c linux-2.6.32.13/drivers/iee
  };
  
  MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
-diff -urNp linux-2.6.32.13/drivers/ieee1394/eth1394.c linux-2.6.32.13/drivers/ieee1394/eth1394.c
---- linux-2.6.32.13/drivers/ieee1394/eth1394.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ieee1394/eth1394.c	2010-05-15 13:21:15.250965621 -0400
-@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
+diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
+index a4e9dcb..747d53d 100644
+--- a/drivers/ieee1394/eth1394.c
++++ b/drivers/ieee1394/eth1394.c
+@@ -446,7 +446,7 @@ static const struct ieee1394_device_id eth1394_id_table[] = {
  		.specifier_id =	ETHER1394_GASP_SPECIFIER_ID,
  		.version = ETHER1394_GASP_VERSION,
  	},
@@ -24859,10 +25889,11 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/eth1394.c linux-2.6.32.13/drivers/ie
  };
  
  MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
-diff -urNp linux-2.6.32.13/drivers/ieee1394/hosts.c linux-2.6.32.13/drivers/ieee1394/hosts.c
---- linux-2.6.32.13/drivers/ieee1394/hosts.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ieee1394/hosts.c	2010-05-15 13:21:15.250965621 -0400
-@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 
+diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
+index e947d8f..6a966b9 100644
+--- a/drivers/ieee1394/hosts.c
++++ b/drivers/ieee1394/hosts.c
+@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command,
  }
  
  static struct hpsb_host_driver dummy_driver = {
@@ -24870,10 +25901,11 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/hosts.c linux-2.6.32.13/drivers/ieee
  	.transmit_packet = dummy_transmit_packet,
  	.devctl =	   dummy_devctl,
  	.isoctl =	   dummy_isoctl
-diff -urNp linux-2.6.32.13/drivers/ieee1394/ohci1394.c linux-2.6.32.13/drivers/ieee1394/ohci1394.c
---- linux-2.6.32.13/drivers/ieee1394/ohci1394.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ieee1394/ohci1394.c	2010-05-15 13:21:15.283282671 -0400
-@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
+diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
+index d0dc1db..89ca24c 100644
+--- a/drivers/ieee1394/ohci1394.c
++++ b/drivers/ieee1394/ohci1394.c
+@@ -148,9 +148,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_DRIVER_NAME , ## args)
  printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
  
  /* Module Parameters */
@@ -24885,7 +25917,7 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/ohci1394.c linux-2.6.32.13/drivers/i
  
  static void dma_trm_tasklet(unsigned long data);
  static void dma_trm_reset(struct dma_trm_ctx *d);
-@@ -3449,7 +3449,7 @@ static struct pci_device_id ohci1394_pci
+@@ -3445,7 +3445,7 @@ static struct pci_device_id ohci1394_pci_tbl[] = {
  		.subvendor =	PCI_ANY_ID,
  		.subdevice =	PCI_ANY_ID,
  	},
@@ -24894,10 +25926,11 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/ohci1394.c linux-2.6.32.13/drivers/i
  };
  
  MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
-diff -urNp linux-2.6.32.13/drivers/ieee1394/raw1394.c linux-2.6.32.13/drivers/ieee1394/raw1394.c
---- linux-2.6.32.13/drivers/ieee1394/raw1394.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ieee1394/raw1394.c	2010-05-15 13:21:15.340016183 -0400
-@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
+diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
+index b563d5e..6e11ccb 100644
+--- a/drivers/ieee1394/raw1394.c
++++ b/drivers/ieee1394/raw1394.c
+@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id raw1394_id_table[] = {
  	 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
  	 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
  	 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff},
@@ -24906,10 +25939,11 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/raw1394.c linux-2.6.32.13/drivers/ie
  };
  
  MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
-diff -urNp linux-2.6.32.13/drivers/ieee1394/sbp2.c linux-2.6.32.13/drivers/ieee1394/sbp2.c
---- linux-2.6.32.13/drivers/ieee1394/sbp2.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ieee1394/sbp2.c	2010-05-15 13:21:15.374974502 -0400
-@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
+diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
+index 4565cb5..3833a2c 100644
+--- a/drivers/ieee1394/sbp2.c
++++ b/drivers/ieee1394/sbp2.c
+@@ -289,7 +289,7 @@ static const struct ieee1394_device_id sbp2_id_table[] = {
  	 .match_flags	= IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
  	 .specifier_id	= SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
  	 .version	= SBP2_SW_VERSION_ENTRY & 0xffffff},
@@ -24918,7 +25952,7 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/sbp2.c linux-2.6.32.13/drivers/ieee1
  };
  MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table);
  
-@@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot
+@@ -2110,7 +2110,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 protocol driver");
  MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME);
  MODULE_LICENSE("GPL");
  
@@ -24927,10 +25961,11 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/sbp2.c linux-2.6.32.13/drivers/ieee1
  {
  	int ret;
  
-diff -urNp linux-2.6.32.13/drivers/ieee1394/video1394.c linux-2.6.32.13/drivers/ieee1394/video1394.c
---- linux-2.6.32.13/drivers/ieee1394/video1394.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/ieee1394/video1394.c	2010-05-15 13:21:15.379405032 -0400
-@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
+diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
+index a42bd68..406d68f 100644
+--- a/drivers/ieee1394/video1394.c
++++ b/drivers/ieee1394/video1394.c
+@@ -1312,7 +1312,7 @@ static const struct ieee1394_device_id video1394_id_table[] = {
                  .specifier_id   = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
                  .version        = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
          },
@@ -24939,10 +25974,11 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/video1394.c linux-2.6.32.13/drivers/
  };
  
  MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
-diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/infiniband/core/cm.c
---- linux-2.6.32.13/drivers/infiniband/core/cm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/infiniband/core/cm.c	2010-05-15 13:21:15.390974340 -0400
-@@ -112,7 +112,7 @@ static char const counter_group_names[CM
+diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
+index ad63b79..d5b73ca 100644
+--- a/drivers/infiniband/core/cm.c
++++ b/drivers/infiniband/core/cm.c
+@@ -113,7 +113,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
  
  struct cm_counter_group {
  	struct kobject obj;
@@ -24951,7 +25987,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  };
  
  struct cm_counter_attribute {
-@@ -1386,7 +1386,7 @@ static void cm_dup_req_handler(struct cm
+@@ -1387,7 +1387,7 @@ static void cm_dup_req_handler(struct cm_work *work,
  	struct ib_mad_send_buf *msg = NULL;
  	int ret;
  
@@ -24960,7 +25996,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  			counter[CM_REQ_COUNTER]);
  
  	/* Quick state check to discard duplicate REQs. */
-@@ -1764,7 +1764,7 @@ static void cm_dup_rep_handler(struct cm
+@@ -1765,7 +1765,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
  	if (!cm_id_priv)
  		return;
  
@@ -24969,7 +26005,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  			counter[CM_REP_COUNTER]);
  	ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
  	if (ret)
-@@ -1931,7 +1931,7 @@ static int cm_rtu_handler(struct cm_work
+@@ -1932,7 +1932,7 @@ static int cm_rtu_handler(struct cm_work *work)
  	if (cm_id_priv->id.state != IB_CM_REP_SENT &&
  	    cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
  		spin_unlock_irq(&cm_id_priv->lock);
@@ -24978,7 +26014,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  				counter[CM_RTU_COUNTER]);
  		goto out;
  	}
-@@ -2110,7 +2110,7 @@ static int cm_dreq_handler(struct cm_wor
+@@ -2111,7 +2111,7 @@ static int cm_dreq_handler(struct cm_work *work)
  	cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
  				   dreq_msg->local_comm_id);
  	if (!cm_id_priv) {
@@ -24987,7 +26023,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  				counter[CM_DREQ_COUNTER]);
  		cm_issue_drep(work->port, work->mad_recv_wc);
  		return -EINVAL;
-@@ -2131,7 +2131,7 @@ static int cm_dreq_handler(struct cm_wor
+@@ -2132,7 +2132,7 @@ static int cm_dreq_handler(struct cm_work *work)
  	case IB_CM_MRA_REP_RCVD:
  		break;
  	case IB_CM_TIMEWAIT:
@@ -24996,7 +26032,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  				counter[CM_DREQ_COUNTER]);
  		if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
  			goto unlock;
-@@ -2145,7 +2145,7 @@ static int cm_dreq_handler(struct cm_wor
+@@ -2146,7 +2146,7 @@ static int cm_dreq_handler(struct cm_work *work)
  			cm_free_msg(msg);
  		goto deref;
  	case IB_CM_DREQ_RCVD:
@@ -25005,7 +26041,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  				counter[CM_DREQ_COUNTER]);
  		goto unlock;
  	default:
-@@ -2501,7 +2501,7 @@ static int cm_mra_handler(struct cm_work
+@@ -2502,7 +2502,7 @@ static int cm_mra_handler(struct cm_work *work)
  		    ib_modify_mad(cm_id_priv->av.port->mad_agent,
  				  cm_id_priv->msg, timeout)) {
  			if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
@@ -25014,7 +26050,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  						counter_group[CM_RECV_DUPLICATES].
  						counter[CM_MRA_COUNTER]);
  			goto out;
-@@ -2510,7 +2510,7 @@ static int cm_mra_handler(struct cm_work
+@@ -2511,7 +2511,7 @@ static int cm_mra_handler(struct cm_work *work)
  		break;
  	case IB_CM_MRA_REQ_RCVD:
  	case IB_CM_MRA_REP_RCVD:
@@ -25023,7 +26059,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  				counter[CM_MRA_COUNTER]);
  		/* fall through */
  	default:
-@@ -2672,7 +2672,7 @@ static int cm_lap_handler(struct cm_work
+@@ -2673,7 +2673,7 @@ static int cm_lap_handler(struct cm_work *work)
  	case IB_CM_LAP_IDLE:
  		break;
  	case IB_CM_MRA_LAP_SENT:
@@ -25032,7 +26068,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  				counter[CM_LAP_COUNTER]);
  		if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
  			goto unlock;
-@@ -2688,7 +2688,7 @@ static int cm_lap_handler(struct cm_work
+@@ -2689,7 +2689,7 @@ static int cm_lap_handler(struct cm_work *work)
  			cm_free_msg(msg);
  		goto deref;
  	case IB_CM_LAP_RCVD:
@@ -25041,7 +26077,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  				counter[CM_LAP_COUNTER]);
  		goto unlock;
  	default:
-@@ -2972,7 +2972,7 @@ static int cm_sidr_req_handler(struct cm
+@@ -2973,7 +2973,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
  	cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
  	if (cur_cm_id_priv) {
  		spin_unlock_irq(&cm.lock);
@@ -25050,7 +26086,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  				counter[CM_SIDR_REQ_COUNTER]);
  		goto out; /* Duplicate message. */
  	}
-@@ -3183,10 +3183,10 @@ static void cm_send_handler(struct ib_ma
+@@ -3184,10 +3184,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
  	if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
  		msg->retries = 1;
  
@@ -25063,7 +26099,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  				&port->counter_group[CM_XMIT_RETRIES].
  				counter[attr_index]);
  
-@@ -3396,7 +3396,7 @@ static void cm_recv_handler(struct ib_ma
+@@ -3397,7 +3397,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
  	}
  
  	attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
@@ -25072,7 +26108,7 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
  			counter[attr_id - CM_ATTR_ID_OFFSET]);
  
  	work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
-@@ -3594,10 +3594,10 @@ static ssize_t cm_show_counter(struct ko
+@@ -3595,7 +3595,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
  	cm_attr = container_of(attr, struct cm_counter_attribute, attr);
  
  	return sprintf(buf, "%ld\n",
@@ -25080,27 +26116,24 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/
 +		       atomic_long_read_unchecked(&group->counter[cm_attr->index]));
  }
  
--static struct sysfs_ops cm_counter_ops = {
-+static const struct sysfs_ops cm_counter_ops = {
- 	.show = cm_show_counter
- };
- 
-diff -urNp linux-2.6.32.13/drivers/infiniband/core/sysfs.c linux-2.6.32.13/drivers/infiniband/core/sysfs.c
---- linux-2.6.32.13/drivers/infiniband/core/sysfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/infiniband/core/sysfs.c	2010-05-15 13:21:15.420653417 -0400
-@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
- 	return port_attr->show(p, port_attr, buf);
- }
- 
--static struct sysfs_ops port_sysfs_ops = {
-+static const struct sysfs_ops port_sysfs_ops = {
- 	.show = port_attr_show
- };
+ static const struct sysfs_ops cm_counter_ops = {
+diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
+index 3593983..b29f22a 100644
+--- a/drivers/infiniband/hw/qib/qib.h
++++ b/drivers/infiniband/hw/qib/qib.h
+@@ -50,6 +50,7 @@
+ #include <linux/completion.h>
+ #include <linux/kref.h>
+ #include <linux/sched.h>
++#include <linux/slab.h>
  
-diff -urNp linux-2.6.32.13/drivers/input/keyboard/atkbd.c linux-2.6.32.13/drivers/input/keyboard/atkbd.c
---- linux-2.6.32.13/drivers/input/keyboard/atkbd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/input/keyboard/atkbd.c	2010-05-15 13:21:15.420653417 -0400
-@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
+ #include "qib_common.h"
+ #include "qib_verbs.h"
+diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
+index d358ef8..6ab4e78 100644
+--- a/drivers/input/keyboard/atkbd.c
++++ b/drivers/input/keyboard/atkbd.c
+@@ -1240,7 +1240,7 @@ static struct serio_device_id atkbd_serio_ids[] = {
  		.id	= SERIO_ANY,
  		.extra	= SERIO_ANY,
  	},
@@ -25109,10 +26142,11 @@ diff -urNp linux-2.6.32.13/drivers/input/keyboard/atkbd.c linux-2.6.32.13/driver
  };
  
  MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
-diff -urNp linux-2.6.32.13/drivers/input/mouse/lifebook.c linux-2.6.32.13/drivers/input/mouse/lifebook.c
---- linux-2.6.32.13/drivers/input/mouse/lifebook.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/input/mouse/lifebook.c	2010-05-15 13:21:15.420653417 -0400
-@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
+diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
+index c31ad11..d55f9df 100644
+--- a/drivers/input/mouse/lifebook.c
++++ b/drivers/input/mouse/lifebook.c
+@@ -123,7 +123,7 @@ static const struct dmi_system_id __initconst lifebook_dmi_table[] = {
  			DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
  		},
  	},
@@ -25120,11 +26154,12 @@ diff -urNp linux-2.6.32.13/drivers/input/mouse/lifebook.c linux-2.6.32.13/driver
 +	{ NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL}
  };
  
- static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
-diff -urNp linux-2.6.32.13/drivers/input/mouse/psmouse-base.c linux-2.6.32.13/drivers/input/mouse/psmouse-base.c
---- linux-2.6.32.13/drivers/input/mouse/psmouse-base.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/input/mouse/psmouse-base.c	2010-05-15 13:21:15.430620618 -0400
-@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se
+ void __init lifebook_module_init(void)
+diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
+index 979c502..274e9ee 100644
+--- a/drivers/input/mouse/psmouse-base.c
++++ b/drivers/input/mouse/psmouse-base.c
+@@ -1460,7 +1460,7 @@ static struct serio_device_id psmouse_serio_ids[] = {
  		.id	= SERIO_ANY,
  		.extra	= SERIO_ANY,
  	},
@@ -25133,10 +26168,11 @@ diff -urNp linux-2.6.32.13/drivers/input/mouse/psmouse-base.c linux-2.6.32.13/dr
  };
  
  MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
-diff -urNp linux-2.6.32.13/drivers/input/mouse/synaptics.c linux-2.6.32.13/drivers/input/mouse/synaptics.c
---- linux-2.6.32.13/drivers/input/mouse/synaptics.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/input/mouse/synaptics.c	2010-05-15 13:21:15.430620618 -0400
-@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index 705589d..a29c615 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -476,7 +476,7 @@ static void synaptics_process_packet(struct psmouse *psmouse)
  				break;
  			case 2:
  				if (SYN_MODEL_PEN(priv->model_id))
@@ -25145,15 +26181,15 @@ diff -urNp linux-2.6.32.13/drivers/input/mouse/synaptics.c linux-2.6.32.13/drive
  				break;
  			case 4 ... 15:
  				if (SYN_CAP_PALMDETECT(priv->capabilities))
-@@ -652,7 +652,6 @@ static const struct dmi_system_id toshib
+@@ -701,7 +701,6 @@ static const struct dmi_system_id __initconst toshiba_dmi_table[] = {
  			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
  			DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"),
  		},
 -
  	},
  	{
- 		.ident = "Toshiba Portege M300",
-@@ -661,9 +660,8 @@ static const struct dmi_system_id toshib
+ 		/* Toshiba Portege M300 */
+@@ -710,9 +709,8 @@ static const struct dmi_system_id __initconst toshiba_dmi_table[] = {
  			DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),
  			DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),
  		},
@@ -25161,13 +26197,23 @@ diff -urNp linux-2.6.32.13/drivers/input/mouse/synaptics.c linux-2.6.32.13/drive
  	},
 -	{ }
 +	{ NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL }
- };
  #endif
+ };
+ 
+diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
+index f34b22b..04ac86f 100644
+--- a/drivers/input/mousedev.c
++++ b/drivers/input/mousedev.c
+@@ -754,7 +754,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
+ 
+ 	spin_unlock_irq(&client->packet_lock);
+ 
+-	if (copy_to_user(buffer, data, count))
++	if (count > sizeof(data) || copy_to_user(buffer, data, count))
+ 		return -EFAULT;
  
-diff -urNp linux-2.6.32.13/drivers/input/mousedev.c linux-2.6.32.13/drivers/input/mousedev.c
---- linux-2.6.32.13/drivers/input/mousedev.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/input/mousedev.c	2010-05-15 13:21:15.435182881 -0400
-@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
+ 	return count;
+@@ -1051,7 +1051,7 @@ static struct input_handler mousedev_handler = {
  
  #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
  static struct miscdevice psaux_mouse = {
@@ -25176,10 +26222,11 @@ diff -urNp linux-2.6.32.13/drivers/input/mousedev.c linux-2.6.32.13/drivers/inpu
  };
  static int psaux_registered;
  #endif
-diff -urNp linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h
---- linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h	2010-04-04 20:41:49.956500002 -0400
-+++ linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h	2010-05-15 13:21:15.435182881 -0400
-@@ -172,7 +172,7 @@ static const struct dmi_system_id __init
+diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
+index 8c53926..5259b1e 100644
+--- a/drivers/input/serio/i8042-x86ia64io.h
++++ b/drivers/input/serio/i8042-x86ia64io.h
+@@ -183,7 +183,7 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = {
  			DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
  		},
  	},
@@ -25188,7 +26235,7 @@ diff -urNp linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.13
  };
  
  /*
-@@ -402,7 +402,7 @@ static const struct dmi_system_id __init
+@@ -420,7 +420,7 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = {
  			DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
  		},
  	},
@@ -25197,7 +26244,7 @@ diff -urNp linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.13
  };
  
  static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
-@@ -476,7 +476,7 @@ static const struct dmi_system_id __init
+@@ -494,7 +494,7 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
  			DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"),
  		},
  	},
@@ -25206,7 +26253,7 @@ diff -urNp linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.13
  };
  
  #ifdef CONFIG_PNP
-@@ -495,7 +495,7 @@ static const struct dmi_system_id __init
+@@ -513,7 +513,7 @@ static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = {
  			DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
  		},
  	},
@@ -25215,7 +26262,7 @@ diff -urNp linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.13
  };
  
  static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = {
-@@ -519,7 +519,7 @@ static const struct dmi_system_id __init
+@@ -537,7 +537,7 @@ static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = {
  			DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */
  		},
  	},
@@ -25224,7 +26271,7 @@ diff -urNp linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.13
  };
  #endif
  
-@@ -593,7 +593,7 @@ static const struct dmi_system_id __init
+@@ -611,7 +611,7 @@ static const struct dmi_system_id __initconst i8042_dmi_dritek_table[] = {
  			DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"),
  		},
  	},
@@ -25233,10 +26280,11 @@ diff -urNp linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.13
  };
  
  #endif /* CONFIG_X86 */
-diff -urNp linux-2.6.32.13/drivers/input/serio/serio_raw.c linux-2.6.32.13/drivers/input/serio/serio_raw.c
---- linux-2.6.32.13/drivers/input/serio/serio_raw.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/input/serio/serio_raw.c	2010-05-15 13:21:15.435182881 -0400
-@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
+diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
+index 9986648..08058a3 100644
+--- a/drivers/input/serio/serio_raw.c
++++ b/drivers/input/serio/serio_raw.c
+@@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_serio_ids[] = {
  		.id	= SERIO_ANY,
  		.extra	= SERIO_ANY,
  	},
@@ -25245,10 +26293,11 @@ diff -urNp linux-2.6.32.13/drivers/input/serio/serio_raw.c linux-2.6.32.13/drive
  };
  
  MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
-diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/common.c linux-2.6.32.13/drivers/isdn/gigaset/common.c
---- linux-2.6.32.13/drivers/isdn/gigaset/common.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/isdn/gigaset/common.c	2010-05-15 13:21:15.435182881 -0400
-@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct 
+diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
+index 5d4befb..260e186 100644
+--- a/drivers/isdn/gigaset/common.c
++++ b/drivers/isdn/gigaset/common.c
+@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
  	cs->commands_pending = 0;
  	cs->cur_at_seq = 0;
  	cs->gotfwver = -1;
@@ -25257,10 +26306,11 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/common.c linux-2.6.32.13/drivers
  	cs->dev = NULL;
  	cs->tty = NULL;
  	cs->tty_dev = NULL;
-diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h	2010-05-15 13:21:15.435182881 -0400
-@@ -446,7 +446,7 @@ struct cardstate {
+diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
+index 8738b08..0b5ebb9 100644
+--- a/drivers/isdn/gigaset/gigaset.h
++++ b/drivers/isdn/gigaset/gigaset.h
+@@ -442,7 +442,7 @@ struct cardstate {
  	spinlock_t cmdlock;
  	unsigned curlen, cmdbytes;
  
@@ -25269,11 +26319,12 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h linux-2.6.32.13/driver
  	struct tty_struct *tty;
  	struct tasklet_struct if_wake_tasklet;
  	unsigned control_state;
-diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/drivers/isdn/gigaset/interface.c
---- linux-2.6.32.13/drivers/isdn/gigaset/interface.c	2010-04-04 20:41:49.956500002 -0400
-+++ linux-2.6.32.13/drivers/isdn/gigaset/interface.c	2010-05-15 13:21:15.462977265 -0400
-@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
- 		return -ERESTARTSYS; // FIXME -EINTR?
+diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
+index c9f28dd..1fc34b8 100644
+--- a/drivers/isdn/gigaset/interface.c
++++ b/drivers/isdn/gigaset/interface.c
+@@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
+ 		return -ERESTARTSYS;
  	tty->driver_data = cs;
  
 -	++cs->open_count;
@@ -25283,7 +26334,7 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/driv
  		spin_lock_irqsave(&cs->lock, flags);
  		cs->tty = tty;
  		spin_unlock_irqrestore(&cs->lock, flags);
-@@ -195,10 +193,10 @@ static void if_close(struct tty_struct *
+@@ -190,10 +188,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
  
  	if (!cs->connected)
  		gig_dbg(DEBUG_IF, "not connected");	/* nothing to do */
@@ -25296,7 +26347,7 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/driv
  			spin_lock_irqsave(&cs->lock, flags);
  			cs->tty = NULL;
  			spin_unlock_irqrestore(&cs->lock, flags);
-@@ -233,7 +231,7 @@ static int if_ioctl(struct tty_struct *t
+@@ -228,7 +226,7 @@ static int if_ioctl(struct tty_struct *tty, struct file *file,
  	if (!cs->connected) {
  		gig_dbg(DEBUG_IF, "not connected");
  		retval = -ENODEV;
@@ -25305,7 +26356,7 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/driv
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  	else {
  		retval = 0;
-@@ -361,7 +359,7 @@ static int if_write(struct tty_struct *t
+@@ -355,7 +353,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
  	if (!cs->connected) {
  		gig_dbg(DEBUG_IF, "not connected");
  		retval = -ENODEV;
@@ -25314,7 +26365,7 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/driv
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  	else if (cs->mstate != MS_LOCKED) {
  		dev_warn(cs->dev, "can't write to unlocked device\n");
-@@ -395,7 +393,7 @@ static int if_write_room(struct tty_stru
+@@ -389,7 +387,7 @@ static int if_write_room(struct tty_struct *tty)
  	if (!cs->connected) {
  		gig_dbg(DEBUG_IF, "not connected");
  		retval = -ENODEV;
@@ -25323,7 +26374,7 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/driv
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  	else if (cs->mstate != MS_LOCKED) {
  		dev_warn(cs->dev, "can't write to unlocked device\n");
-@@ -425,7 +423,7 @@ static int if_chars_in_buffer(struct tty
+@@ -419,7 +417,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
  
  	if (!cs->connected)
  		gig_dbg(DEBUG_IF, "not connected");
@@ -25332,25 +26383,25 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/driv
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  	else if (cs->mstate != MS_LOCKED)
  		dev_warn(cs->dev, "can't write to unlocked device\n");
-@@ -453,7 +451,7 @@ static void if_throttle(struct tty_struc
+@@ -447,7 +445,7 @@ static void if_throttle(struct tty_struct *tty)
  
  	if (!cs->connected)
  		gig_dbg(DEBUG_IF, "not connected");	/* nothing to do */
 -	else if (!cs->open_count)
 +	else if (!atomic_read(&cs->open_count))
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
- 	else {
- 		//FIXME
-@@ -478,7 +476,7 @@ static void if_unthrottle(struct tty_str
+ 	else
+ 		gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
+@@ -471,7 +469,7 @@ static void if_unthrottle(struct tty_struct *tty)
  
  	if (!cs->connected)
  		gig_dbg(DEBUG_IF, "not connected");	/* nothing to do */
 -	else if (!cs->open_count)
 +	else if (!atomic_read(&cs->open_count))
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
- 	else {
- 		//FIXME
-@@ -510,7 +508,7 @@ static void if_set_termios(struct tty_st
+ 	else
+ 		gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
+@@ -502,7 +500,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
  		goto out;
  	}
  
@@ -25359,43 +26410,84 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/driv
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  		goto out;
  	}
-diff -urNp linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c	2010-05-15 13:21:15.462977265 -0400
-@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
+diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
+index 2a57da59..26d9859 100644
+--- a/drivers/isdn/hardware/avm/b1.c
++++ b/drivers/isdn/hardware/avm/b1.c
+@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file)
  	}
  	if (left) {
  		if (t4file->user) {
 -			if (copy_from_user(buf, dp, left))
-+			if (left > sizeof buf || copy_from_user(buf, dp, left))
++			if (left > sizeof(buf) || copy_from_user(buf, dp, left))
  				return -EFAULT;
  		} else {
  			memcpy(buf, dp, left);
-@@ -221,7 +221,7 @@ int b1_load_config(avmcard *card, capilo
+@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config)
  	}
  	if (left) {
  		if (config->user) {
 -			if (copy_from_user(buf, dp, left))
-+			if (left > sizeof buf || copy_from_user(buf, dp, left))
++			if (left > sizeof(buf) || copy_from_user(buf, dp, left))
  				return -EFAULT;
  		} else {
  			memcpy(buf, dp, left);
-diff -urNp linux-2.6.32.13/drivers/isdn/icn/icn.c linux-2.6.32.13/drivers/isdn/icn/icn.c
---- linux-2.6.32.13/drivers/isdn/icn/icn.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/isdn/icn/icn.c	2010-05-15 13:21:15.462977265 -0400
-@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
+diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
+index 2e847a9..16670ff 100644
+--- a/drivers/isdn/icn/icn.c
++++ b/drivers/isdn/icn/icn.c
+@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
  		if (count > len)
  			count = len;
  		if (user) {
 -			if (copy_from_user(msg, buf, count))
-+			if (count > sizeof msg || copy_from_user(msg, buf, count))
++			if (count > sizeof(msg) || copy_from_user(msg, buf, count))
  				return -EFAULT;
  		} else
  			memcpy(msg, buf, count);
-diff -urNp linux-2.6.32.13/drivers/lguest/core.c linux-2.6.32.13/drivers/lguest/core.c
---- linux-2.6.32.13/drivers/lguest/core.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/lguest/core.c	2010-05-15 13:21:15.466573931 -0400
-@@ -91,9 +91,17 @@ static __init int map_switcher(void)
+diff --git a/drivers/isdn/sc/interrupt.c b/drivers/isdn/sc/interrupt.c
+index 485be8b..f0225bc 100644
+--- a/drivers/isdn/sc/interrupt.c
++++ b/drivers/isdn/sc/interrupt.c
+@@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy, void *card_inst)
+ 			}
+ 			else if(callid>=0x0000 && callid<=0x7FFF)
+ 			{
++				int len;
++
+ 				pr_debug("%s: Got Incoming Call\n",
+ 						sc_adapter[card]->devicename);
+-				strcpy(setup.phone,&(rcvmsg.msg_data.byte_array[4]));
+-				strcpy(setup.eazmsn,
+-					sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn);
++				len = strlcpy(setup.phone, &(rcvmsg.msg_data.byte_array[4]),
++						sizeof(setup.phone));
++				if (len >= sizeof(setup.phone))
++					continue;
++				len = strlcpy(setup.eazmsn,
++						sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn,
++						sizeof(setup.eazmsn));
++				if (len >= sizeof(setup.eazmsn))
++					continue;
+ 				setup.si1 = 7;
+ 				setup.si2 = 0;
+ 				setup.plan = 0;
+@@ -176,7 +184,9 @@ irqreturn_t interrupt_handler(int dummy, void *card_inst)
+ 		 * Handle a GetMyNumber Rsp
+ 		 */
+ 		if (IS_CE_MESSAGE(rcvmsg,Call,0,GetMyNumber)){
+-			strcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn,rcvmsg.msg_data.byte_array);
++			strlcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn,
++				rcvmsg.msg_data.byte_array,
++				sizeof(rcvmsg.msg_data.byte_array));
+ 			continue;
+ 		}
+ 			
+diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
+index efa2024..110df57 100644
+--- a/drivers/lguest/core.c
++++ b/drivers/lguest/core.c
+@@ -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.
  	 */
@@ -25413,9 +26505,10 @@ diff -urNp linux-2.6.32.13/drivers/lguest/core.c linux-2.6.32.13/drivers/lguest/
  	if (!switcher_vma) {
  		err = -ENOMEM;
  		printk("lguest: could not map switcher pages high\n");
-diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c	2010-05-15 13:21:15.466573931 -0400
+diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c
+index 1cec02f..ade1e65 100644
+--- a/drivers/macintosh/via-pmu-backlight.c
++++ b/drivers/macintosh/via-pmu-backlight.c
 @@ -15,7 +15,7 @@
  
  #define MAX_PMU_LEVEL 0xFF
@@ -25425,7 +26518,7 @@ diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.13
  static DEFINE_SPINLOCK(pmu_backlight_lock);
  static int sleeping, uses_pmu_bl;
  static u8 bl_curve[FB_BACKLIGHT_LEVELS];
-@@ -115,7 +115,7 @@ static int pmu_backlight_get_brightness(
+@@ -115,7 +115,7 @@ static int pmu_backlight_get_brightness(struct backlight_device *bd)
  	return bd->props.brightness;
  }
  
@@ -25434,10 +26527,11 @@ diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.13
  	.get_brightness	= pmu_backlight_get_brightness,
  	.update_status	= pmu_backlight_update_status,
  
-diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu.c linux-2.6.32.13/drivers/macintosh/via-pmu.c
---- linux-2.6.32.13/drivers/macintosh/via-pmu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/macintosh/via-pmu.c	2010-05-15 13:21:15.488292870 -0400
-@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
+diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
+index 3d4fc0f..352bbd6 100644
+--- a/drivers/macintosh/via-pmu.c
++++ b/drivers/macintosh/via-pmu.c
+@@ -2254,7 +2254,7 @@ static int pmu_sleep_valid(suspend_state_t state)
  		&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
  }
  
@@ -25446,9 +26540,10 @@ diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu.c linux-2.6.32.13/drivers/m
  	.enter = powerbook_sleep,
  	.valid = pmu_sleep_valid,
  };
-diff -urNp linux-2.6.32.13/drivers/md/bitmap.c linux-2.6.32.13/drivers/md/bitmap.c
---- linux-2.6.32.13/drivers/md/bitmap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/md/bitmap.c	2010-05-15 13:21:15.498921900 -0400
+diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
+index 1742435..014d6d8 100644
+--- a/drivers/md/bitmap.c
++++ b/drivers/md/bitmap.c
 @@ -58,7 +58,7 @@
  #  if DEBUG > 0
  #    define PRINTK(x...) printk(KERN_DEBUG x)
@@ -25458,22 +26553,11 @@ diff -urNp linux-2.6.32.13/drivers/md/bitmap.c linux-2.6.32.13/drivers/md/bitmap
  #  endif
  #endif
  
-diff -urNp linux-2.6.32.13/drivers/md/dm-sysfs.c linux-2.6.32.13/drivers/md/dm-sysfs.c
---- linux-2.6.32.13/drivers/md/dm-sysfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/md/dm-sysfs.c	2010-05-15 13:21:15.498921900 -0400
-@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
- 	NULL,
- };
- 
--static struct sysfs_ops dm_sysfs_ops = {
-+static const struct sysfs_ops dm_sysfs_ops = {
- 	.show	= dm_attr_show,
- };
- 
-diff -urNp linux-2.6.32.13/drivers/md/dm-table.c linux-2.6.32.13/drivers/md/dm-table.c
---- linux-2.6.32.13/drivers/md/dm-table.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/md/dm-table.c	2010-05-15 13:21:15.498921900 -0400
-@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
+diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
+index 9924ea2..498330c 100644
+--- a/drivers/md/dm-table.c
++++ b/drivers/md/dm-table.c
+@@ -363,7 +363,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
  	if (!dev_size)
  		return 0;
  
@@ -25482,28 +26566,11 @@ diff -urNp linux-2.6.32.13/drivers/md/dm-table.c linux-2.6.32.13/drivers/md/dm-t
  		DMWARN("%s: %s too small for target: "
  		       "start=%llu, len=%llu, dev_size=%llu",
  		       dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-2.6.32.13/drivers/md/md.c linux-2.6.32.13/drivers/md/md.c
---- linux-2.6.32.13/drivers/md/md.c	2010-05-15 13:20:18.542567696 -0400
-+++ linux-2.6.32.13/drivers/md/md.c	2010-05-15 13:21:15.498921900 -0400
-@@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko
- 	mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
- 	kfree(rdev);
- }
--static struct sysfs_ops rdev_sysfs_ops = {
-+static const struct sysfs_ops rdev_sysfs_ops = {
- 	.show		= rdev_attr_show,
- 	.store		= rdev_attr_store,
- };
-@@ -3884,7 +3884,7 @@ static void md_free(struct kobject *ko)
- 	kfree(mddev);
- }
- 
--static struct sysfs_ops md_sysfs_ops = {
-+static const struct sysfs_ops md_sysfs_ops = {
- 	.show	= md_attr_show,
- 	.store	= md_attr_store,
- };
-@@ -6010,7 +6010,7 @@ static int md_seq_show(struct seq_file *
+diff --git a/drivers/md/md.c b/drivers/md/md.c
+index 7de96c2..d26e244 100644
+--- a/drivers/md/md.c
++++ b/drivers/md/md.c
+@@ -6352,7 +6352,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
  				chunk_kb ? "KB" : "B");
  			if (bitmap->file) {
  				seq_printf(seq, ", file: ");
@@ -25512,7 +26579,7 @@ diff -urNp linux-2.6.32.13/drivers/md/md.c linux-2.6.32.13/drivers/md/md.c
  			}
  
  			seq_printf(seq, "\n");
-@@ -6104,7 +6104,7 @@ static int is_mddev_idle(mddev_t *mddev,
+@@ -6446,7 +6446,7 @@ static int is_mddev_idle(mddev_t *mddev, int init)
  		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]) -
@@ -25521,10 +26588,11 @@ diff -urNp linux-2.6.32.13/drivers/md/md.c linux-2.6.32.13/drivers/md/md.c
  		/* sync IO will cause sync_io to increase before the disk_stats
  		 * as sync_io is counted when a request starts, and
  		 * disk_stats is counted when it completes.
-diff -urNp linux-2.6.32.13/drivers/md/md.h linux-2.6.32.13/drivers/md/md.h
---- linux-2.6.32.13/drivers/md/md.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/md/md.h	2010-05-15 13:21:15.507356136 -0400
-@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
+diff --git a/drivers/md/md.h b/drivers/md/md.h
+index 9ec208e..63622a4 100644
+--- a/drivers/md/md.h
++++ b/drivers/md/md.h
+@@ -334,7 +334,7 @@ static inline void rdev_dec_pending(mdk_rdev_t *rdev, mddev_t *mddev)
  
  static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
  {
@@ -25533,56 +26601,54 @@ diff -urNp linux-2.6.32.13/drivers/md/md.h linux-2.6.32.13/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c	2010-05-15 13:21:15.510998118 -0400
-@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
+diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
+index b915c39..2fad9b3 100644
+--- a/drivers/media/dvb/dvb-core/dvbdev.c
++++ b/drivers/media/dvb/dvb-core/dvbdev.c
+@@ -196,6 +196,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
  			const struct dvb_device *template, void *priv, int type)
  {
  	struct dvb_device *dvbdev;
-+	/* cannot be const */
++	/* cannot be const, see this function */
  	struct file_operations *dvbdevfops;
  	struct device *clsdev;
  	int minor;
-diff -urNp linux-2.6.32.13/drivers/media/radio/radio-cadet.c linux-2.6.32.13/drivers/media/radio/radio-cadet.c
---- linux-2.6.32.13/drivers/media/radio/radio-cadet.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/media/radio/radio-cadet.c	2010-05-15 13:21:15.510998118 -0400
-@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
+diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
+index 482d0f3..48cb07a 100644
+--- a/drivers/media/radio/radio-cadet.c
++++ b/drivers/media/radio/radio-cadet.c
+@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
  	while (i < count && dev->rdsin != dev->rdsout)
  		readbuf[i++] = dev->rdsbuf[dev->rdsout++];
  
 -	if (copy_to_user(data, readbuf, i))
-+	if (i > sizeof readbuf || copy_to_user(data, readbuf, i))
++	if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
  		return -EFAULT;
  	return i;
  }
-diff -urNp linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c
---- linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c	2010-05-15 13:21:15.526921305 -0400
-@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
- 	int error;
- 
- 	usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname));
--	strncat(cam->input_physname, "/input0", sizeof(cam->input_physname));
-+	strlcat(cam->input_physname, "/input0", sizeof(cam->input_physname));
- 
- 	cam->input = input_dev = input_allocate_device();
- 	if (!input_dev) {
-diff -urNp linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c
---- linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c	2010-05-15 13:21:15.526921305 -0400
-@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
- 	int error;
- 
- 	usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname));
--	strncat(cam->input_physname, "/input0", sizeof(cam->input_physname));
-+	strlcat(cam->input_physname, "/input0", sizeof(cam->input_physname));
+diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
+index a6a5701..89144e1 100644
+--- a/drivers/message/fusion/mptbase.c
++++ b/drivers/message/fusion/mptbase.c
+@@ -6715,8 +6715,14 @@ procmpt_iocinfo_read(char *buf, char **start, off_t offset, int request, int *eo
+ 	len += sprintf(buf+len, "  MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
+ 	len += sprintf(buf+len, "  MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
  
- 	cam->input = input_dev = input_allocate_device();
- 	if (!input_dev) {
-diff -urNp linux-2.6.32.13/drivers/message/fusion/mptdebug.h linux-2.6.32.13/drivers/message/fusion/mptdebug.h
---- linux-2.6.32.13/drivers/message/fusion/mptdebug.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/message/fusion/mptdebug.h	2010-05-15 13:21:15.526921305 -0400
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++	len += sprintf(buf+len, "  RequestFrames @ 0x%p (Dma @ 0x%p)\n",
++					NULL, NULL);
++#else
+ 	len += sprintf(buf+len, "  RequestFrames @ 0x%p (Dma @ 0x%p)\n",
+ 					(void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
++#endif
++
+ 	/*
+ 	 *  Rounding UP to nearest 4-kB boundary here...
+ 	 */
+diff --git a/drivers/message/fusion/mptdebug.h b/drivers/message/fusion/mptdebug.h
+index 28e4788..d701a42 100644
+--- a/drivers/message/fusion/mptdebug.h
++++ b/drivers/message/fusion/mptdebug.h
 @@ -71,7 +71,7 @@
  		CMD;						\
  }
@@ -25592,10 +26658,11 @@ diff -urNp linux-2.6.32.13/drivers/message/fusion/mptdebug.h linux-2.6.32.13/dri
  #endif
  
  
-diff -urNp linux-2.6.32.13/drivers/message/fusion/mptsas.c linux-2.6.32.13/drivers/message/fusion/mptsas.c
---- linux-2.6.32.13/drivers/message/fusion/mptsas.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/message/fusion/mptsas.c	2010-05-15 13:21:15.526921305 -0400
-@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
+diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
+index ac000e8..36b2d80 100644
+--- a/drivers/message/fusion/mptsas.c
++++ b/drivers/message/fusion/mptsas.c
+@@ -437,6 +437,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
  		return 0;
  }
  
@@ -25619,7 +26686,7 @@ diff -urNp linux-2.6.32.13/drivers/message/fusion/mptsas.c linux-2.6.32.13/drive
  /* no mutex */
  static void
  mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
-@@ -474,23 +491,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *p
+@@ -475,23 +492,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
  		return NULL;
  }
  
@@ -25643,10 +26710,40 @@ diff -urNp linux-2.6.32.13/drivers/message/fusion/mptsas.c linux-2.6.32.13/drive
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff -urNp linux-2.6.32.13/drivers/message/i2o/i2o_proc.c linux-2.6.32.13/drivers/message/i2o/i2o_proc.c
---- linux-2.6.32.13/drivers/message/i2o/i2o_proc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/message/i2o/i2o_proc.c	2010-05-15 13:21:15.526921305 -0400
-@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
+diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
+index 407cb84..92f14d2 100644
+--- a/drivers/message/fusion/mptscsih.c
++++ b/drivers/message/fusion/mptscsih.c
+@@ -1244,15 +1244,16 @@ mptscsih_info(struct Scsi_Host *SChost)
+ 
+ 	h = shost_priv(SChost);
+ 
+-	if (h) {
+-		if (h->info_kbuf == NULL)
+-			if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
+-				return h->info_kbuf;
+-		h->info_kbuf[0] = '\0';
++	if (!h)
++		return NULL;
+ 
+-		mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
+-		h->info_kbuf[size-1] = '\0';
+-	}
++	if (h->info_kbuf == NULL)
++		if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
++			return h->info_kbuf;
++	h->info_kbuf[0] = '\0';
++
++	mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
++	h->info_kbuf[size-1] = '\0';
+ 
+ 	return h->info_kbuf;
+ }
+diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
+index 07dbeaf..5533142 100644
+--- a/drivers/message/i2o/i2o_proc.c
++++ b/drivers/message/i2o/i2o_proc.c
+@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
  	"Array Controller Device"
  };
  
@@ -25660,7 +26757,7 @@ diff -urNp linux-2.6.32.13/drivers/message/i2o/i2o_proc.c linux-2.6.32.13/driver
  static int i2o_report_query_status(struct seq_file *seq, int block_status,
  				   char *group)
  {
-@@ -842,8 +835,7 @@ static int i2o_seq_show_ddm_table(struct
+@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
  
  		seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
  		seq_printf(seq, "%-#8x", ddm_table.module_id);
@@ -25670,7 +26767,7 @@ diff -urNp linux-2.6.32.13/drivers/message/i2o/i2o_proc.c linux-2.6.32.13/driver
  		seq_printf(seq, "%9d  ", ddm_table.data_size);
  		seq_printf(seq, "%8d", ddm_table.code_size);
  
-@@ -944,8 +936,8 @@ static int i2o_seq_show_drivers_stored(s
+@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
  
  		seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
  		seq_printf(seq, "%-#8x", dst->module_id);
@@ -25681,7 +26778,7 @@ diff -urNp linux-2.6.32.13/drivers/message/i2o/i2o_proc.c linux-2.6.32.13/driver
  		seq_printf(seq, "%8d ", dst->module_size);
  		seq_printf(seq, "%8d ", dst->mpb_size);
  		seq_printf(seq, "0x%04x", dst->module_flags);
-@@ -1276,14 +1268,10 @@ static int i2o_seq_show_dev_identity(str
+@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
  	seq_printf(seq, "Device Class  : %s\n", i2o_get_class_name(work16[0]));
  	seq_printf(seq, "Owner TID     : %0#5x\n", work16[2]);
  	seq_printf(seq, "Parent TID    : %0#5x\n", work16[3]);
@@ -25700,7 +26797,7 @@ diff -urNp linux-2.6.32.13/drivers/message/i2o/i2o_proc.c linux-2.6.32.13/driver
  
  	seq_printf(seq, "Serial number : ");
  	print_serial_number(seq, (u8 *) (work32 + 16),
-@@ -1328,10 +1316,8 @@ static int i2o_seq_show_ddm_identity(str
+@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
  	}
  
  	seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
@@ -25713,7 +26810,7 @@ diff -urNp linux-2.6.32.13/drivers/message/i2o/i2o_proc.c linux-2.6.32.13/driver
  
  	seq_printf(seq, "Serial number       : ");
  	print_serial_number(seq, result.serial_number, sizeof(result) - 36);
-@@ -1362,14 +1348,10 @@ static int i2o_seq_show_uinfo(struct seq
+@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
  		return 0;
  	}
  
@@ -25732,9 +26829,22 @@ diff -urNp linux-2.6.32.13/drivers/message/i2o/i2o_proc.c linux-2.6.32.13/driver
  
  	return 0;
  }
-diff -urNp linux-2.6.32.13/drivers/misc/kgdbts.c linux-2.6.32.13/drivers/misc/kgdbts.c
---- linux-2.6.32.13/drivers/misc/kgdbts.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/misc/kgdbts.c	2010-05-15 13:21:15.554995461 -0400
+diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
+index 9ed6307..1b31df6 100644
+--- a/drivers/mfd/janz-cmodio.c
++++ b/drivers/mfd/janz-cmodio.c
+@@ -13,6 +13,7 @@
+ 
+ #include <linux/kernel.h>
+ #include <linux/module.h>
++#include <linux/slab.h>
+ #include <linux/init.h>
+ #include <linux/pci.h>
+ #include <linux/interrupt.h>
+diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
+index 7245023..8e1c8b6 100644
+--- a/drivers/misc/kgdbts.c
++++ b/drivers/misc/kgdbts.c
 @@ -118,7 +118,7 @@
  	} while (0)
  #define MAX_CONFIG_LEN		40
@@ -25744,7 +26854,7 @@ diff -urNp linux-2.6.32.13/drivers/misc/kgdbts.c linux-2.6.32.13/drivers/misc/kg
  static char get_buf[BUFMAX];
  static int get_buf_cnt;
  static char put_buf[BUFMAX];
-@@ -1102,7 +1102,7 @@ static void kgdbts_post_exp_handler(void
+@@ -1114,7 +1114,7 @@ static void kgdbts_post_exp_handler(void)
  		module_put(THIS_MODULE);
  }
  
@@ -25753,23 +26863,25 @@ diff -urNp linux-2.6.32.13/drivers/misc/kgdbts.c linux-2.6.32.13/drivers/misc/kg
  	.name			= "kgdbts",
  	.read_char		= kgdbts_get_char,
  	.write_char		= kgdbts_put_char,
-diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c	2010-05-15 13:21:15.554995461 -0400
-@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
- 
- static void update_mcs_stats(enum mcs_op op, unsigned long clks)
- {
+diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
+index 2f30bad..c4c13d0 100644
+--- a/drivers/misc/sgi-gru/gruhandles.c
++++ b/drivers/misc/sgi-gru/gruhandles.c
+@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
+ 	unsigned long nsec;
+ 
+ 	nsec = CLKS2NSEC(clks);
 -	atomic_long_inc(&mcs_op_statistics[op].count);
--	atomic_long_add(clks, &mcs_op_statistics[op].total);
+-	atomic_long_add(nsec, &mcs_op_statistics[op].total);
 +	atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
-+	atomic_long_add_unchecked(clks, &mcs_op_statistics[op].total);
- 	if (mcs_op_statistics[op].max < clks)
- 		mcs_op_statistics[op].max = clks;
- }
-diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c	2010-05-15 13:21:15.554995461 -0400
++	atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
+ 	if (mcs_op_statistics[op].max < nsec)
+ 		mcs_op_statistics[op].max = nsec;
+ }
+diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
+index 7768b87..f8aac38 100644
+--- a/drivers/misc/sgi-gru/gruprocfs.c
++++ b/drivers/misc/sgi-gru/gruprocfs.c
 @@ -32,9 +32,9 @@
  
  #define printstat(s, f)		printstat_val(s, &gru_stats.f, #f)
@@ -25780,11 +26892,11 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.13/driv
 -	unsigned long val = atomic_long_read(v);
 +	unsigned long val = atomic_long_read_unchecked(v);
  
- 	if (val)
- 		seq_printf(s, "%16lu %s\n", val, id);
-@@ -136,8 +136,8 @@ static int mcs_statistics_show(struct se
- 		"cch_interrupt_sync", "cch_deallocate", "tgh_invalidate"};
+ 	seq_printf(s, "%16lu %s\n", val, id);
+ }
+@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
  
+ 	seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
  	for (op = 0; op < mcsop_last; op++) {
 -		count = atomic_long_read(&mcs_op_statistics[op].count);
 -		total = atomic_long_read(&mcs_op_statistics[op].total);
@@ -25793,10 +26905,11 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.13/driv
  		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-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h	2010-05-15 13:21:15.554995461 -0400
-@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
+diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
+index 7a8b906..8f7d44e 100644
+--- a/drivers/misc/sgi-gru/grutables.h
++++ b/drivers/misc/sgi-gru/grutables.h
+@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
   * GRU statistics.
   */
  struct gru_stats_s {
@@ -25804,7 +26917,8 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv
 -	atomic_long_t vdata_free;
 -	atomic_long_t gts_alloc;
 -	atomic_long_t gts_free;
--	atomic_long_t vdata_double_alloc;
+-	atomic_long_t gms_alloc;
+-	atomic_long_t gms_free;
 -	atomic_long_t gts_double_allocate;
 -	atomic_long_t assign_context;
 -	atomic_long_t assign_context_failed;
@@ -25817,28 +26931,25 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv
 -	atomic_long_t steal_kernel_context;
 -	atomic_long_t steal_context_failed;
 -	atomic_long_t nopfn;
--	atomic_long_t break_cow;
 -	atomic_long_t asid_new;
 -	atomic_long_t asid_next;
 -	atomic_long_t asid_wrap;
 -	atomic_long_t asid_reuse;
 -	atomic_long_t intr;
+-	atomic_long_t intr_cbr;
+-	atomic_long_t intr_tfh;
+-	atomic_long_t intr_spurious;
 -	atomic_long_t intr_mm_lock_failed;
 -	atomic_long_t call_os;
--	atomic_long_t call_os_offnode_reference;
--	atomic_long_t call_os_check_for_bug;
 -	atomic_long_t call_os_wait_queue;
 -	atomic_long_t user_flush_tlb;
 -	atomic_long_t user_unload_context;
 -	atomic_long_t user_exception;
 -	atomic_long_t set_context_option;
--	atomic_long_t migrate_check;
--	atomic_long_t migrated_retarget;
--	atomic_long_t migrated_unload;
--	atomic_long_t migrated_unload_delay;
--	atomic_long_t migrated_nopfn_retarget;
--	atomic_long_t migrated_nopfn_unload;
+-	atomic_long_t check_context_retarget_intr;
+-	atomic_long_t check_context_unload;
 -	atomic_long_t tlb_dropin;
+-	atomic_long_t tlb_preload_page;
 -	atomic_long_t tlb_dropin_fail_no_asid;
 -	atomic_long_t tlb_dropin_fail_upm;
 -	atomic_long_t tlb_dropin_fail_invalid;
@@ -25846,17 +26957,16 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv
 -	atomic_long_t tlb_dropin_fail_idle;
 -	atomic_long_t tlb_dropin_fail_fmm;
 -	atomic_long_t tlb_dropin_fail_no_exception;
--	atomic_long_t tlb_dropin_fail_no_exception_war;
 -	atomic_long_t tfh_stale_on_fault;
 -	atomic_long_t mmu_invalidate_range;
 -	atomic_long_t mmu_invalidate_page;
--	atomic_long_t mmu_clear_flush_young;
 -	atomic_long_t flush_tlb;
 -	atomic_long_t flush_tlb_gru;
 -	atomic_long_t flush_tlb_gru_tgh;
 -	atomic_long_t flush_tlb_gru_zero_asid;
 -
 -	atomic_long_t copy_gpa;
+-	atomic_long_t read_gpa;
 -
 -	atomic_long_t mesq_receive;
 -	atomic_long_t mesq_receive_none;
@@ -25868,7 +26978,7 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv
 -	atomic_long_t mesq_send_qlimit_reached;
 -	atomic_long_t mesq_send_amo_nacked;
 -	atomic_long_t mesq_send_put_nacked;
--	atomic_long_t mesq_qf_not_full;
+-	atomic_long_t mesq_page_overflow;
 -	atomic_long_t mesq_qf_locked;
 -	atomic_long_t mesq_qf_noop_not_full;
 -	atomic_long_t mesq_qf_switch_head_failed;
@@ -25878,11 +26988,13 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv
 -	atomic_long_t mesq_noop_qlimit_reached;
 -	atomic_long_t mesq_noop_amo_nacked;
 -	atomic_long_t mesq_noop_put_nacked;
+-	atomic_long_t mesq_noop_page_overflow;
 +	atomic_long_unchecked_t vdata_alloc;
 +	atomic_long_unchecked_t vdata_free;
 +	atomic_long_unchecked_t gts_alloc;
 +	atomic_long_unchecked_t gts_free;
-+	atomic_long_unchecked_t vdata_double_alloc;
++	atomic_long_unchecked_t gms_alloc;
++	atomic_long_unchecked_t gms_free;
 +	atomic_long_unchecked_t gts_double_allocate;
 +	atomic_long_unchecked_t assign_context;
 +	atomic_long_unchecked_t assign_context_failed;
@@ -25895,28 +27007,25 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv
 +	atomic_long_unchecked_t steal_kernel_context;
 +	atomic_long_unchecked_t steal_context_failed;
 +	atomic_long_unchecked_t nopfn;
-+	atomic_long_unchecked_t break_cow;
 +	atomic_long_unchecked_t asid_new;
 +	atomic_long_unchecked_t asid_next;
 +	atomic_long_unchecked_t asid_wrap;
 +	atomic_long_unchecked_t asid_reuse;
 +	atomic_long_unchecked_t intr;
++	atomic_long_unchecked_t intr_cbr;
++	atomic_long_unchecked_t intr_tfh;
++	atomic_long_unchecked_t intr_spurious;
 +	atomic_long_unchecked_t intr_mm_lock_failed;
 +	atomic_long_unchecked_t call_os;
-+	atomic_long_unchecked_t call_os_offnode_reference;
-+	atomic_long_unchecked_t call_os_check_for_bug;
 +	atomic_long_unchecked_t call_os_wait_queue;
 +	atomic_long_unchecked_t user_flush_tlb;
 +	atomic_long_unchecked_t user_unload_context;
 +	atomic_long_unchecked_t user_exception;
 +	atomic_long_unchecked_t set_context_option;
-+	atomic_long_unchecked_t migrate_check;
-+	atomic_long_unchecked_t migrated_retarget;
-+	atomic_long_unchecked_t migrated_unload;
-+	atomic_long_unchecked_t migrated_unload_delay;
-+	atomic_long_unchecked_t migrated_nopfn_retarget;
-+	atomic_long_unchecked_t migrated_nopfn_unload;
++	atomic_long_unchecked_t check_context_retarget_intr;
++	atomic_long_unchecked_t check_context_unload;
 +	atomic_long_unchecked_t tlb_dropin;
++	atomic_long_unchecked_t tlb_preload_page;
 +	atomic_long_unchecked_t tlb_dropin_fail_no_asid;
 +	atomic_long_unchecked_t tlb_dropin_fail_upm;
 +	atomic_long_unchecked_t tlb_dropin_fail_invalid;
@@ -25924,17 +27033,16 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv
 +	atomic_long_unchecked_t tlb_dropin_fail_idle;
 +	atomic_long_unchecked_t tlb_dropin_fail_fmm;
 +	atomic_long_unchecked_t tlb_dropin_fail_no_exception;
-+	atomic_long_unchecked_t tlb_dropin_fail_no_exception_war;
 +	atomic_long_unchecked_t tfh_stale_on_fault;
 +	atomic_long_unchecked_t mmu_invalidate_range;
 +	atomic_long_unchecked_t mmu_invalidate_page;
-+	atomic_long_unchecked_t mmu_clear_flush_young;
 +	atomic_long_unchecked_t flush_tlb;
 +	atomic_long_unchecked_t flush_tlb_gru;
 +	atomic_long_unchecked_t flush_tlb_gru_tgh;
 +	atomic_long_unchecked_t flush_tlb_gru_zero_asid;
 +
 +	atomic_long_unchecked_t copy_gpa;
++	atomic_long_unchecked_t read_gpa;
 +
 +	atomic_long_unchecked_t mesq_receive;
 +	atomic_long_unchecked_t mesq_receive_none;
@@ -25946,7 +27054,7 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv
 +	atomic_long_unchecked_t mesq_send_qlimit_reached;
 +	atomic_long_unchecked_t mesq_send_amo_nacked;
 +	atomic_long_unchecked_t mesq_send_put_nacked;
-+	atomic_long_unchecked_t mesq_qf_not_full;
++	atomic_long_unchecked_t mesq_page_overflow;
 +	atomic_long_unchecked_t mesq_qf_locked;
 +	atomic_long_unchecked_t mesq_qf_noop_not_full;
 +	atomic_long_unchecked_t mesq_qf_switch_head_failed;
@@ -25956,11 +27064,12 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv
 +	atomic_long_unchecked_t mesq_noop_qlimit_reached;
 +	atomic_long_unchecked_t mesq_noop_amo_nacked;
 +	atomic_long_unchecked_t mesq_noop_put_nacked;
++	atomic_long_unchecked_t mesq_noop_page_overflow;
  
  };
  
-@@ -252,8 +252,8 @@ enum mcs_op {cchop_allocate, cchop_start
- 	cchop_deallocate, tghop_invalidate, mcsop_last};
+@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
+ 	tghop_invalidate, mcsop_last};
  
  struct mcs_op_statistic {
 -	atomic_long_t	count;
@@ -25970,7 +27079,7 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv
  	unsigned long	max;
  };
  
-@@ -276,7 +276,7 @@ extern struct mcs_op_statistic mcs_op_st
+@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
  
  #define STAT(id)	do {						\
  				if (gru_options & OPT_STATS)		\
@@ -25979,10 +27088,11 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv
  			} while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2000.c linux-2.6.32.13/drivers/mtd/devices/doc2000.c
---- linux-2.6.32.13/drivers/mtd/devices/doc2000.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/mtd/devices/doc2000.c	2010-05-15 13:21:15.563050037 -0400
-@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
+diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
+index 5bf5f46..c5de373 100644
+--- a/drivers/mtd/devices/doc2000.c
++++ b/drivers/mtd/devices/doc2000.c
+@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
  
  		/* The ECC will not be calculated correctly if less than 512 is written */
  /* DBB-
@@ -25991,10 +27101,11 @@ diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2000.c linux-2.6.32.13/drivers
  			printk(KERN_WARNING
  			       "ECC needs a full sector write (adr: %lx size %lx)\n",
  			       (long) to, (long) len);
-diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2001.c linux-2.6.32.13/drivers/mtd/devices/doc2001.c
---- linux-2.6.32.13/drivers/mtd/devices/doc2001.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/mtd/devices/doc2001.c	2010-05-15 13:21:15.563050037 -0400
-@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
+diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
+index 0990f78..bb4e8a4 100644
+--- a/drivers/mtd/devices/doc2001.c
++++ b/drivers/mtd/devices/doc2001.c
+@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
  	struct Nand *mychip = &this->chips[from >> (this->chipshift)];
  
  	/* Don't allow read past end of device */
@@ -26003,10 +27114,23 @@ diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2001.c linux-2.6.32.13/drivers
  		return -EINVAL;
  
  	/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.32.13/drivers/mtd/ubi/build.c linux-2.6.32.13/drivers/mtd/ubi/build.c
---- linux-2.6.32.13/drivers/mtd/ubi/build.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/mtd/ubi/build.c	2010-05-15 13:21:15.566632432 -0400
-@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
+diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
+index ca03428..41f6395 100644
+--- a/drivers/mtd/nand/denali.c
++++ b/drivers/mtd/nand/denali.c
+@@ -24,6 +24,7 @@
+ #include <linux/pci.h>
+ #include <linux/mtd/mtd.h>
+ #include <linux/module.h>
++#include <linux/slab.h>
+ 
+ #include "denali.h"
+ 
+diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
+index 13b05cb..dde1a57 100644
+--- a/drivers/mtd/ubi/build.c
++++ b/drivers/mtd/ubi/build.c
+@@ -1282,7 +1282,7 @@ module_exit(ubi_exit);
  static int __init bytes_str_to_int(const char *str)
  {
  	char *endp;
@@ -26015,7 +27139,7 @@ diff -urNp linux-2.6.32.13/drivers/mtd/ubi/build.c linux-2.6.32.13/drivers/mtd/u
  
  	result = simple_strtoul(str, &endp, 0);
  	if (str == endp || result >= INT_MAX) {
-@@ -1266,11 +1266,11 @@ static int __init bytes_str_to_int(const
+@@ -1293,11 +1293,11 @@ static int __init bytes_str_to_int(const char *str)
  
  	switch (*endp) {
  	case 'G':
@@ -26030,7 +27154,7 @@ diff -urNp linux-2.6.32.13/drivers/mtd/ubi/build.c linux-2.6.32.13/drivers/mtd/u
  		if (endp[1] == 'i' && endp[2] == 'B')
  			endp += 2;
  	case '\0':
-@@ -1281,7 +1281,13 @@ static int __init bytes_str_to_int(const
+@@ -1308,7 +1308,13 @@ static int __init bytes_str_to_int(const char *str)
  		return -EINVAL;
  	}
  
@@ -26045,10 +27169,24 @@ diff -urNp linux-2.6.32.13/drivers/mtd/ubi/build.c linux-2.6.32.13/drivers/mtd/u
  }
  
  /**
-diff -urNp linux-2.6.32.13/drivers/net/e1000e/82571.c linux-2.6.32.13/drivers/net/e1000e/82571.c
---- linux-2.6.32.13/drivers/net/e1000e/82571.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/e1000e/82571.c	2010-05-15 13:21:15.586662276 -0400
-@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
+diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
+index 3e0f19f..02612a8 100644
+--- a/drivers/net/cxgb3/cxgb3_main.c
++++ b/drivers/net/cxgb3/cxgb3_main.c
+@@ -2296,7 +2296,7 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
+ 	case CHELSIO_GET_QSET_NUM:{
+ 		struct ch_reg edata;
+ 
+-		memset(&edata, 0, sizeof(struct ch_reg));
++		memset(&edata, 0, sizeof(edata));
+ 
+ 		edata.cmd = CHELSIO_GET_QSET_NUM;
+ 		edata.val = pi->nqsets;
+diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
+index d206f21..979c799 100644
+--- a/drivers/net/e1000e/82571.c
++++ b/drivers/net/e1000e/82571.c
+@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
  {
  	struct e1000_hw *hw = &adapter->hw;
  	struct e1000_mac_info *mac = &hw->mac;
@@ -26056,8 +27194,8 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/82571.c linux-2.6.32.13/drivers/ne
  	struct e1000_mac_operations *func = &mac->ops;
  	u32 swsm = 0;
  	u32 swsm2 = 0;
-@@ -1656,7 +1657,7 @@ static void e1000_clear_hw_cntrs_82571(s
- 	temp = er32(ICRXDMTC);
+@@ -1703,7 +1704,7 @@ static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw)
+ 	er32(ICRXDMTC);
  }
  
 -static struct e1000_mac_operations e82571_mac_ops = {
@@ -26065,46 +27203,47 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/82571.c linux-2.6.32.13/drivers/ne
  	/* .check_mng_mode: mac type dependent */
  	/* .check_for_link: media type dependent */
  	.id_led_init		= e1000e_id_led_init,
-@@ -1674,7 +1675,7 @@ static struct e1000_mac_operations e8257
- 	.setup_led		= e1000e_setup_led_generic,
+@@ -1725,7 +1726,7 @@ static struct e1000_mac_operations e82571_mac_ops = {
+ 	.read_mac_addr		= e1000_read_mac_addr_82571,
  };
  
 -static struct e1000_phy_operations e82_phy_ops_igp = {
 +static const struct e1000_phy_operations e82_phy_ops_igp = {
- 	.acquire_phy		= e1000_get_hw_semaphore_82571,
+ 	.acquire		= e1000_get_hw_semaphore_82571,
+ 	.check_polarity		= e1000_check_polarity_igp,
  	.check_reset_block	= e1000e_check_reset_block_generic,
- 	.commit_phy		= NULL,
-@@ -1691,7 +1692,7 @@ static struct e1000_phy_operations e82_p
+@@ -1743,7 +1744,7 @@ static struct e1000_phy_operations e82_phy_ops_igp = {
  	.cfg_on_link_up      	= NULL,
  };
  
 -static struct e1000_phy_operations e82_phy_ops_m88 = {
 +static const struct e1000_phy_operations e82_phy_ops_m88 = {
- 	.acquire_phy		= e1000_get_hw_semaphore_82571,
+ 	.acquire		= e1000_get_hw_semaphore_82571,
+ 	.check_polarity		= e1000_check_polarity_m88,
  	.check_reset_block	= e1000e_check_reset_block_generic,
- 	.commit_phy		= e1000e_phy_sw_reset,
-@@ -1708,7 +1709,7 @@ static struct e1000_phy_operations e82_p
+@@ -1761,7 +1762,7 @@ static struct e1000_phy_operations e82_phy_ops_m88 = {
  	.cfg_on_link_up      	= NULL,
  };
  
 -static struct e1000_phy_operations e82_phy_ops_bm = {
 +static const struct e1000_phy_operations e82_phy_ops_bm = {
- 	.acquire_phy		= e1000_get_hw_semaphore_82571,
+ 	.acquire		= e1000_get_hw_semaphore_82571,
+ 	.check_polarity		= e1000_check_polarity_m88,
  	.check_reset_block	= e1000e_check_reset_block_generic,
- 	.commit_phy		= e1000e_phy_sw_reset,
-@@ -1725,7 +1726,7 @@ static struct e1000_phy_operations e82_p
+@@ -1779,7 +1780,7 @@ static struct e1000_phy_operations e82_phy_ops_bm = {
  	.cfg_on_link_up      	= NULL,
  };
  
 -static struct e1000_nvm_operations e82571_nvm_ops = {
 +static const struct e1000_nvm_operations e82571_nvm_ops = {
- 	.acquire_nvm		= e1000_acquire_nvm_82571,
- 	.read_nvm		= e1000e_read_nvm_eerd,
- 	.release_nvm		= e1000_release_nvm_82571,
-diff -urNp linux-2.6.32.13/drivers/net/e1000e/e1000.h linux-2.6.32.13/drivers/net/e1000e/e1000.h
---- linux-2.6.32.13/drivers/net/e1000e/e1000.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/e1000e/e1000.h	2010-05-15 13:21:15.586662276 -0400
-@@ -375,9 +375,9 @@ struct e1000_info {
+ 	.acquire		= e1000_acquire_nvm_82571,
+ 	.read			= e1000e_read_nvm_eerd,
+ 	.release		= e1000_release_nvm_82571,
+diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
+index c0b3db4..2fa61ce 100644
+--- a/drivers/net/e1000e/e1000.h
++++ b/drivers/net/e1000e/e1000.h
+@@ -377,9 +377,9 @@ struct e1000_info {
  	u32			pba;
  	u32			max_hw_frame_size;
  	s32			(*get_variants)(struct e1000_adapter *);
@@ -26117,10 +27256,11 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/e1000.h linux-2.6.32.13/drivers/ne
  };
  
  /* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.32.13/drivers/net/e1000e/es2lan.c linux-2.6.32.13/drivers/net/e1000e/es2lan.c
---- linux-2.6.32.13/drivers/net/e1000e/es2lan.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/e1000e/es2lan.c	2010-05-15 13:21:15.611440944 -0400
-@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
+diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
+index 38d79a6..300d5df 100644
+--- a/drivers/net/e1000e/es2lan.c
++++ b/drivers/net/e1000e/es2lan.c
+@@ -205,6 +205,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
  {
  	struct e1000_hw *hw = &adapter->hw;
  	struct e1000_mac_info *mac = &hw->mac;
@@ -26128,99 +27268,71 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/es2lan.c linux-2.6.32.13/drivers/n
  	struct e1000_mac_operations *func = &mac->ops;
  
  	/* Set media type */
-@@ -1365,7 +1366,7 @@ static void e1000_clear_hw_cntrs_80003es
- 	temp = er32(ICRXDMTC);
+@@ -1431,7 +1432,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw)
+ 	er32(ICRXDMTC);
  }
  
 -static struct e1000_mac_operations es2_mac_ops = {
 +static const struct e1000_mac_operations es2_mac_ops = {
+ 	.read_mac_addr		= e1000_read_mac_addr_80003es2lan,
  	.id_led_init		= e1000e_id_led_init,
  	.check_mng_mode		= e1000e_check_mng_mode_generic,
- 	/* check_for_link dependent on media type */
-@@ -1383,7 +1384,7 @@ static struct e1000_mac_operations es2_m
+@@ -1453,7 +1454,7 @@ static struct e1000_mac_operations es2_mac_ops = {
  	.setup_led		= e1000e_setup_led_generic,
  };
  
 -static struct e1000_phy_operations es2_phy_ops = {
 +static const struct e1000_phy_operations es2_phy_ops = {
- 	.acquire_phy		= e1000_acquire_phy_80003es2lan,
+ 	.acquire		= e1000_acquire_phy_80003es2lan,
+ 	.check_polarity		= e1000_check_polarity_m88,
  	.check_reset_block	= e1000e_check_reset_block_generic,
- 	.commit_phy	 	= e1000e_phy_sw_reset,
-@@ -1400,7 +1401,7 @@ static struct e1000_phy_operations es2_p
+@@ -1471,7 +1472,7 @@ static struct e1000_phy_operations es2_phy_ops = {
  	.cfg_on_link_up      	= e1000_cfg_on_link_up_80003es2lan,
  };
  
 -static struct e1000_nvm_operations es2_nvm_ops = {
 +static const struct e1000_nvm_operations es2_nvm_ops = {
- 	.acquire_nvm		= e1000_acquire_nvm_80003es2lan,
- 	.read_nvm		= e1000e_read_nvm_eerd,
- 	.release_nvm		= e1000_release_nvm_80003es2lan,
-diff -urNp linux-2.6.32.13/drivers/net/e1000e/hw.h linux-2.6.32.13/drivers/net/e1000e/hw.h
---- linux-2.6.32.13/drivers/net/e1000e/hw.h	2010-04-04 20:41:49.956500002 -0400
-+++ linux-2.6.32.13/drivers/net/e1000e/hw.h	2010-05-15 13:21:15.627454440 -0400
-@@ -756,34 +756,34 @@ struct e1000_mac_operations {
- 
- /* Function pointers for the PHY. */
- struct e1000_phy_operations {
--	s32  (*acquire_phy)(struct e1000_hw *);
--	s32  (*check_polarity)(struct e1000_hw *);
--	s32  (*check_reset_block)(struct e1000_hw *);
--	s32  (*commit_phy)(struct e1000_hw *);
--	s32  (*force_speed_duplex)(struct e1000_hw *);
--	s32  (*get_cfg_done)(struct e1000_hw *hw);
--	s32  (*get_cable_length)(struct e1000_hw *);
--	s32  (*get_phy_info)(struct e1000_hw *);
--	s32  (*read_phy_reg)(struct e1000_hw *, u32, u16 *);
--	s32  (*read_phy_reg_locked)(struct e1000_hw *, u32, u16 *);
--	void (*release_phy)(struct e1000_hw *);
--	s32  (*reset_phy)(struct e1000_hw *);
--	s32  (*set_d0_lplu_state)(struct e1000_hw *, bool);
--	s32  (*set_d3_lplu_state)(struct e1000_hw *, bool);
--	s32  (*write_phy_reg)(struct e1000_hw *, u32, u16);
--	s32  (*write_phy_reg_locked)(struct e1000_hw *, u32, u16);
--	s32  (*cfg_on_link_up)(struct e1000_hw *);
-+	s32  (* acquire_phy)(struct e1000_hw *);
-+	s32  (* check_polarity)(struct e1000_hw *);
-+	s32  (* check_reset_block)(struct e1000_hw *);
-+	s32  (* commit_phy)(struct e1000_hw *);
-+	s32  (* force_speed_duplex)(struct e1000_hw *);
-+	s32  (* get_cfg_done)(struct e1000_hw *hw);
-+	s32  (* get_cable_length)(struct e1000_hw *);
-+	s32  (* get_phy_info)(struct e1000_hw *);
-+	s32  (* read_phy_reg)(struct e1000_hw *, u32, u16 *);
-+	s32  (* read_phy_reg_locked)(struct e1000_hw *, u32, u16 *);
-+	void (* release_phy)(struct e1000_hw *);
-+	s32  (* reset_phy)(struct e1000_hw *);
-+	s32  (* set_d0_lplu_state)(struct e1000_hw *, bool);
-+	s32  (* set_d3_lplu_state)(struct e1000_hw *, bool);
-+	s32  (* write_phy_reg)(struct e1000_hw *, u32, u16);
-+	s32  (* write_phy_reg_locked)(struct e1000_hw *, u32, u16);
-+	s32  (* cfg_on_link_up)(struct e1000_hw *);
- };
+ 	.acquire		= e1000_acquire_nvm_80003es2lan,
+ 	.read			= e1000e_read_nvm_eerd,
+ 	.release		= e1000_release_nvm_80003es2lan,
+diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
+index 664ed58..23bac4f 100644
+--- a/drivers/net/e1000e/hw.h
++++ b/drivers/net/e1000e/hw.h
+@@ -791,13 +791,13 @@ struct e1000_phy_operations {
  
  /* Function pointers for the NVM. */
  struct e1000_nvm_operations {
--	s32  (*acquire_nvm)(struct e1000_hw *);
--	s32  (*read_nvm)(struct e1000_hw *, u16, u16, u16 *);
--	void (*release_nvm)(struct e1000_hw *);
--	s32  (*update_nvm)(struct e1000_hw *);
+-	s32  (*acquire)(struct e1000_hw *);
+-	s32  (*read)(struct e1000_hw *, u16, u16, u16 *);
+-	void (*release)(struct e1000_hw *);
+-	s32  (*update)(struct e1000_hw *);
 -	s32  (*valid_led_default)(struct e1000_hw *, u16 *);
--	s32  (*validate_nvm)(struct e1000_hw *);
--	s32  (*write_nvm)(struct e1000_hw *, u16, u16, u16 *);
-+	s32  (* const acquire_nvm)(struct e1000_hw *);
-+	s32  (* const read_nvm)(struct e1000_hw *, u16, u16, u16 *);
-+	void (* const release_nvm)(struct e1000_hw *);
-+	s32  (* const update_nvm)(struct e1000_hw *);
+-	s32  (*validate)(struct e1000_hw *);
+-	s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
++	s32  (* const acquire)(struct e1000_hw *);
++	s32  (* const read)(struct e1000_hw *, u16, u16, u16 *);
++	void (* const release)(struct e1000_hw *);
++	s32  (* const update)(struct e1000_hw *);
 +	s32  (* const valid_led_default)(struct e1000_hw *, u16 *);
-+	s32  (* const validate_nvm)(struct e1000_hw *);
-+	s32  (* const write_nvm)(struct e1000_hw *, u16, u16, u16 *);
++	s32  (* const validate)(struct e1000_hw *);
++	s32  (* const write)(struct e1000_hw *, u16, u16, u16 *);
  };
  
  struct e1000_mac_info {
-diff -urNp linux-2.6.32.13/drivers/net/e1000e/ich8lan.c linux-2.6.32.13/drivers/net/e1000e/ich8lan.c
---- linux-2.6.32.13/drivers/net/e1000e/ich8lan.c	2010-04-04 20:41:49.960543003 -0400
-+++ linux-2.6.32.13/drivers/net/e1000e/ich8lan.c	2010-05-15 13:21:15.627454440 -0400
-@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
+@@ -877,6 +877,7 @@ struct e1000_phy_info {
+ };
+ 
+ struct e1000_nvm_info {
++	/* cannot be const */
+ 	struct e1000_nvm_operations ops;
+ 
+ 	enum e1000_nvm_type type;
+diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
+index b2507d9..93765c8 100644
+--- a/drivers/net/e1000e/ich8lan.c
++++ b/drivers/net/e1000e/ich8lan.c
+@@ -3388,7 +3388,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
  	}
  }
  
@@ -26229,49 +27341,51 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/ich8lan.c linux-2.6.32.13/drivers/
  	.id_led_init		= e1000e_id_led_init,
  	.check_mng_mode		= e1000_check_mng_mode_ich8lan,
  	.check_for_link		= e1000_check_for_copper_link_ich8lan,
-@@ -3470,7 +3470,7 @@ static struct e1000_mac_operations ich8_
+@@ -3407,7 +3407,7 @@ static struct e1000_mac_operations ich8_mac_ops = {
  	/* id_led_init dependent on mac type */
  };
  
 -static struct e1000_phy_operations ich8_phy_ops = {
 +static const struct e1000_phy_operations ich8_phy_ops = {
- 	.acquire_phy		= e1000_acquire_swflag_ich8lan,
+ 	.acquire		= e1000_acquire_swflag_ich8lan,
  	.check_reset_block	= e1000_check_reset_block_ich8lan,
- 	.commit_phy		= NULL,
-@@ -3486,7 +3486,7 @@ static struct e1000_phy_operations ich8_
- 	.write_phy_reg		= e1000e_write_phy_reg_igp,
+ 	.commit			= NULL,
+@@ -3421,7 +3421,7 @@ static struct e1000_phy_operations ich8_phy_ops = {
+ 	.write_reg		= e1000e_write_phy_reg_igp,
  };
  
 -static struct e1000_nvm_operations ich8_nvm_ops = {
 +static const struct e1000_nvm_operations ich8_nvm_ops = {
- 	.acquire_nvm		= e1000_acquire_nvm_ich8lan,
- 	.read_nvm	 	= e1000_read_nvm_ich8lan,
- 	.release_nvm		= e1000_release_nvm_ich8lan,
-diff -urNp linux-2.6.32.13/drivers/net/ibmveth.c linux-2.6.32.13/drivers/net/ibmveth.c
---- linux-2.6.32.13/drivers/net/ibmveth.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/ibmveth.c	2010-05-15 13:21:15.630621605 -0400
-@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
- 	NULL,
- };
- 
--static struct sysfs_ops veth_pool_ops = {
-+static const struct sysfs_ops veth_pool_ops = {
- 	.show   = veth_pool_show,
- 	.store  = veth_pool_store,
- };
-diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_82575.c linux-2.6.32.13/drivers/net/igb/e1000_82575.c
---- linux-2.6.32.13/drivers/net/igb/e1000_82575.c	2010-04-29 17:49:38.085476187 -0400
-+++ linux-2.6.32.13/drivers/net/igb/e1000_82575.c	2010-05-15 13:21:15.646981498 -0400
-@@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct 
- 	wr32(E1000_VT_CTL, vt_ctl);
+ 	.acquire		= e1000_acquire_nvm_ich8lan,
+ 	.read		 	= e1000_read_nvm_ich8lan,
+ 	.release		= e1000_release_nvm_ich8lan,
+diff --git a/drivers/net/eql.c b/drivers/net/eql.c
+index 0cb1cf9..02efc44 100644
+--- a/drivers/net/eql.c
++++ b/drivers/net/eql.c
+@@ -555,7 +555,7 @@ static int eql_g_master_cfg(struct net_device *dev, master_config_t __user *mcp)
+ 	equalizer_t *eql;
+ 	master_config_t mc;
+ 
+-	memset(&mc, 0, sizeof(master_config_t));
++	memset(&mc, 0, sizeof(mc));
+ 
+ 	if (eql_is_master(dev)) {
+ 		eql = netdev_priv(dev);
+diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
+index 86438b5..82ec00c 100644
+--- a/drivers/net/igb/e1000_82575.c
++++ b/drivers/net/igb/e1000_82575.c
+@@ -1597,7 +1597,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
+ 	return ret_val;
  }
  
 -static struct e1000_mac_operations e1000_mac_ops_82575 = {
 +static const struct e1000_mac_operations e1000_mac_ops_82575 = {
- 	.reset_hw             = igb_reset_hw_82575,
  	.init_hw              = igb_init_hw_82575,
  	.check_for_link       = igb_check_for_link_82575,
-@@ -1410,13 +1410,13 @@ static struct e1000_mac_operations e1000
+ 	.rar_set              = igb_rar_set,
+@@ -1605,13 +1605,13 @@ static struct e1000_mac_operations e1000_mac_ops_82575 = {
  	.get_speed_and_duplex = igb_get_speed_and_duplex_copper,
  };
  
@@ -26287,10 +27401,11 @@ diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_82575.c linux-2.6.32.13/drivers
  	.acquire              = igb_acquire_nvm_82575,
  	.read                 = igb_read_nvm_eerd,
  	.release              = igb_release_nvm_82575,
-diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_hw.h linux-2.6.32.13/drivers/net/igb/e1000_hw.h
---- linux-2.6.32.13/drivers/net/igb/e1000_hw.h	2010-04-29 17:49:38.085476187 -0400
-+++ linux-2.6.32.13/drivers/net/igb/e1000_hw.h	2010-05-15 13:21:15.646981498 -0400
-@@ -303,17 +303,17 @@ struct e1000_phy_operations {
+diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
+index cb8db78..aad4c54 100644
+--- a/drivers/net/igb/e1000_hw.h
++++ b/drivers/net/igb/e1000_hw.h
+@@ -323,17 +323,17 @@ struct e1000_phy_operations {
  };
  
  struct e1000_nvm_operations {
@@ -26315,10 +27430,19 @@ diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_hw.h linux-2.6.32.13/drivers/ne
  };
  
  extern const struct e1000_info e1000_82575_info;
-diff -urNp linux-2.6.32.13/drivers/net/irda/vlsi_ir.c linux-2.6.32.13/drivers/net/irda/vlsi_ir.c
---- linux-2.6.32.13/drivers/net/irda/vlsi_ir.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/irda/vlsi_ir.c	2010-05-15 13:21:15.650979196 -0400
-@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
+@@ -412,6 +412,7 @@ struct e1000_phy_info {
+ };
+ 
+ struct e1000_nvm_info {
++	/* cannot be const */
+ 	struct e1000_nvm_operations ops;
+ 
+ 	enum e1000_nvm_type type;
+diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
+index c3d0738..486ea60 100644
+--- a/drivers/net/irda/vlsi_ir.c
++++ b/drivers/net/irda/vlsi_ir.c
+@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(struct sk_buff *skb,
  			/* no race - tx-ring already empty */
  			vlsi_set_baud(idev, iobase);
  			netif_wake_queue(ndev);
@@ -26334,31 +27458,11 @@ diff -urNp linux-2.6.32.13/drivers/net/irda/vlsi_ir.c linux-2.6.32.13/drivers/ne
  		spin_unlock_irqrestore(&idev->lock, flags);
  		dev_kfree_skb_any(skb);
  		return NETDEV_TX_OK;
-diff -urNp linux-2.6.32.13/drivers/net/iseries_veth.c linux-2.6.32.13/drivers/net/iseries_veth.c
---- linux-2.6.32.13/drivers/net/iseries_veth.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/iseries_veth.c	2010-05-15 13:21:15.675080517 -0400
-@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
- 	NULL
- };
- 
--static struct sysfs_ops veth_cnx_sysfs_ops = {
-+static const struct sysfs_ops veth_cnx_sysfs_ops = {
- 		.show = veth_cnx_attribute_show
- };
- 
-@@ -441,7 +441,7 @@ static struct attribute *veth_port_defau
- 	NULL
- };
- 
--static struct sysfs_ops veth_port_sysfs_ops = {
-+static const struct sysfs_ops veth_port_sysfs_ops = {
- 	.show = veth_port_attribute_show
- };
- 
-diff -urNp linux-2.6.32.13/drivers/net/pcnet32.c linux-2.6.32.13/drivers/net/pcnet32.c
---- linux-2.6.32.13/drivers/net/pcnet32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/pcnet32.c	2010-05-15 13:21:15.695242570 -0400
-@@ -79,7 +79,7 @@ static int cards_found;
+diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
+index c200c282..e15e89b 100644
+--- a/drivers/net/pcnet32.c
++++ b/drivers/net/pcnet32.c
+@@ -82,7 +82,7 @@ static int cards_found;
  /*
   * VLB I/O addresses
   */
@@ -26366,11 +27470,47 @@ diff -urNp linux-2.6.32.13/drivers/net/pcnet32.c linux-2.6.32.13/drivers/net/pcn
 +static unsigned int pcnet32_portlist[] __devinitdata =
      { 0x300, 0x320, 0x340, 0x360, 0 };
  
- static int pcnet32_debug = 0;
-diff -urNp linux-2.6.32.13/drivers/net/tg3.h linux-2.6.32.13/drivers/net/tg3.h
---- linux-2.6.32.13/drivers/net/tg3.h	2010-04-04 20:41:49.968494922 -0400
-+++ linux-2.6.32.13/drivers/net/tg3.h	2010-05-15 13:21:15.715816686 -0400
-@@ -95,6 +95,7 @@
+ static int pcnet32_debug;
+diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
+index 1b2c291..769f512 100644
+--- a/drivers/net/ppp_generic.c
++++ b/drivers/net/ppp_generic.c
+@@ -992,7 +992,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+ 	void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
+ 	struct ppp_stats stats;
+ 	struct ppp_comp_stats cstats;
+-	char *vers;
+ 
+ 	switch (cmd) {
+ 	case SIOCGPPPSTATS:
+@@ -1014,8 +1013,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+ 		break;
+ 
+ 	case SIOCGPPPVER:
+-		vers = PPP_VERSION;
+-		if (copy_to_user(addr, vers, strlen(vers) + 1))
++		if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
+ 			break;
+ 		err = 0;
+ 		break;
+diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
+index 573054a..2b931d1 100644
+--- a/drivers/net/tg3.c
++++ b/drivers/net/tg3.c
+@@ -12410,7 +12410,7 @@ static void __devinit tg3_read_vpd(struct tg3 *tp)
+ 			cnt = pci_read_vpd(tp->pdev, pos,
+ 					   TG3_NVM_VPD_LEN - pos,
+ 					   &vpd_data[pos]);
+-			if (cnt == -ETIMEDOUT || -EINTR)
++			if (cnt == -ETIMEDOUT || cnt == -EINTR)
+ 				cnt = 0;
+ 			else if (cnt < 0)
+ 				goto out_not_found;
+diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
+index ce9c491..7ff916b 100644
+--- a/drivers/net/tg3.h
++++ b/drivers/net/tg3.h
+@@ -130,6 +130,7 @@
  #define  CHIPREV_ID_5750_A0		 0x4000
  #define  CHIPREV_ID_5750_A1		 0x4001
  #define  CHIPREV_ID_5750_A3		 0x4003
@@ -26378,30 +27518,41 @@ diff -urNp linux-2.6.32.13/drivers/net/tg3.h linux-2.6.32.13/drivers/net/tg3.h
  #define  CHIPREV_ID_5750_C2		 0x4202
  #define  CHIPREV_ID_5752_A0_HW		 0x5000
  #define  CHIPREV_ID_5752_A0		 0x6000
-diff -urNp linux-2.6.32.13/drivers/net/tulip/de4x5.c linux-2.6.32.13/drivers/net/tulip/de4x5.c
---- linux-2.6.32.13/drivers/net/tulip/de4x5.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/tulip/de4x5.c	2010-05-15 13:21:15.731971640 -0400
-@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
+diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
+index 75a64c8..adfb171 100644
+--- a/drivers/net/tulip/de4x5.c
++++ b/drivers/net/tulip/de4x5.c
+@@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
  	for (i=0; i<ETH_ALEN; i++) {
  	    tmp.addr[i] = dev->dev_addr[i];
  	}
 -	if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
-+	if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
++	if (ioc->len > sizeof(tmp.addr) || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
  	break;
  
      case DE4X5_SET_HWADDR:           /* Set the hardware address */
-@@ -5512,7 +5512,7 @@ de4x5_ioctl(struct net_device *dev, stru
+@@ -5441,7 +5441,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
  	spin_lock_irqsave(&lp->lock, flags);
  	memcpy(&statbuf, &lp->pktStats, ioc->len);
  	spin_unlock_irqrestore(&lp->lock, flags);
 -	if (copy_to_user(ioc->data, &statbuf, ioc->len))
-+	if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
++	if (ioc->len > sizeof(statbuf) || copy_to_user(ioc->data, &statbuf, ioc->len))
  		return -EFAULT;
  	break;
      }
-diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb/hso.c
---- linux-2.6.32.13/drivers/net/usb/hso.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/usb/hso.c	2010-05-15 13:21:15.731971640 -0400
+@@ -5474,7 +5474,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+ 	tmp.lval[6] = inl(DE4X5_STRR); j+=4;
+ 	tmp.lval[7] = inl(DE4X5_SIGR); j+=4;
+ 	ioc->len = j;
+-	if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
++	if (copy_to_user(ioc->data, tmp.lval, ioc->len)) return -EFAULT;
+ 	break;
+ 
+ #define DE4X5_DUMP              0x0f /* Dump the DE4X5 Status */
+diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
+index e254274..4f2d0b4 100644
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
 @@ -258,7 +258,7 @@ struct hso_serial {
  
  	/* from usb_serial_port */
@@ -26411,7 +27562,7 @@ diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb
  	spinlock_t serial_lock;
  
  	int (*write_data) (struct hso_serial *serial);
-@@ -1180,7 +1180,7 @@ static void put_rxbuf_data_and_resubmit_
+@@ -1201,7 +1201,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
  	struct urb *urb;
  
  	urb = serial->rx_urb[0];
@@ -26420,7 +27571,7 @@ diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb
  		count = put_rxbuf_data(urb, serial);
  		if (count == -1)
  			return;
-@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_cal
+@@ -1237,7 +1237,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
  	DUMP1(urb->transfer_buffer, urb->actual_length);
  
  	/* Anyone listening? */
@@ -26429,17 +27580,17 @@ diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb
  		return;
  
  	if (status == 0) {
-@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_st
+@@ -1332,8 +1332,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
  	spin_unlock_irq(&serial->serial_lock);
  
  	/* check for port already opened, if not set the termios */
 -	serial->open_count++;
 -	if (serial->open_count == 1) {
 +	if (atomic_inc_return(&serial->open_count) == 1) {
- 		tty->low_latency = 1;
  		serial->rx_state = RX_IDLE;
  		/* Force default termio settings */
-@@ -1325,7 +1324,7 @@ static int hso_serial_open(struct tty_st
+ 		_hso_serial_set_termios(tty, NULL);
+@@ -1345,7 +1344,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
  		result = hso_start_serial_device(serial->parent, GFP_KERNEL);
  		if (result) {
  			hso_stop_serial_device(serial->parent);
@@ -26448,7 +27599,7 @@ diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb
  			kref_put(&serial->parent->ref, hso_serial_ref_free);
  		}
  	} else {
-@@ -1362,10 +1361,10 @@ static void hso_serial_close(struct tty_
+@@ -1382,10 +1381,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
  
  	/* reset the rts and dtr */
  	/* do the actual close */
@@ -26462,7 +27613,7 @@ diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb
  		spin_lock_irq(&serial->serial_lock);
  		if (serial->tty == tty) {
  			serial->tty->driver_data = NULL;
-@@ -1447,7 +1446,7 @@ static void hso_serial_set_termios(struc
+@@ -1467,7 +1466,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
  
  	/* the actual setup */
  	spin_lock_irqsave(&serial->serial_lock, flags);
@@ -26471,7 +27622,30 @@ diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb
  		_hso_serial_set_termios(tty, old);
  	else
  		tty->termios = old;
-@@ -3095,7 +3094,7 @@ static int hso_resume(struct usb_interfa
+@@ -1653,10 +1652,11 @@ static int hso_get_count(struct hso_serial *serial,
+ 	struct uart_icount cnow;
+ 	struct hso_tiocmget  *tiocmget = serial->tiocmget;
+ 
+-	memset(&icount, 0, sizeof(struct serial_icounter_struct));
+-
+ 	if (!tiocmget)
+ 		 return -ENOENT;
++
++	memset(&icount, 0, sizeof(icount));
++
+ 	spin_lock_irq(&serial->serial_lock);
+ 	memcpy(&cnow, &tiocmget->icount, sizeof(struct uart_icount));
+ 	spin_unlock_irq(&serial->serial_lock);
+@@ -1931,7 +1931,7 @@ static void intr_callback(struct urb *urb)
+ 				D1("Pending read interrupt on port %d\n", i);
+ 				spin_lock(&serial->serial_lock);
+ 				if (serial->rx_state == RX_IDLE &&
+-					serial->open_count > 0) {
++					atomic_read(&serial->open_count) > 0) {
+ 					/* Setup and send a ctrl req read on
+ 					 * port i */
+ 					if (!serial->rx_urb_filled[0]) {
+@@ -3121,7 +3121,7 @@ static int hso_resume(struct usb_interface *iface)
  	/* Start all serial ports */
  	for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
  		if (serial_table[i] && (serial_table[i]->interface == iface)) {
@@ -26480,9 +27654,10 @@ diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb
  				result =
  				    hso_start_serial_device(serial_table[i], GFP_NOIO);
  				hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c	2010-05-15 13:21:15.742991879 -0400
+diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
+index 80b19a4..dab3a45 100644
+--- a/drivers/net/wireless/b43/debugfs.c
++++ b/drivers/net/wireless/b43/debugfs.c
 @@ -43,7 +43,7 @@ static struct dentry *rootdir;
  struct b43_debugfs_fops {
  	ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -26492,9 +27667,10 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c linux-2.6.32.13/dr
  	/* Offset of struct b43_dfs_file in struct b43_dfsentry */
  	size_t file_struct_offset;
  };
-diff -urNp linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c	2010-05-15 13:21:15.742991879 -0400
+diff --git a/drivers/net/wireless/b43legacy/debugfs.c b/drivers/net/wireless/b43legacy/debugfs.c
+index 1f85ac5..c99b4b4 100644
+--- a/drivers/net/wireless/b43legacy/debugfs.c
++++ b/drivers/net/wireless/b43legacy/debugfs.c
 @@ -44,7 +44,7 @@ static struct dentry *rootdir;
  struct b43legacy_debugfs_fops {
  	ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -26504,79 +27680,12 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
  	/* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
  	size_t file_struct_offset;
  	/* Take wl->irq_lock before calling read/write? */
-diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c
---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c	2010-05-15 13:21:15.746908676 -0400
-@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = 
- 	 },
- };
- 
--static struct iwl_ops iwl1000_ops = {
-+static const struct iwl_ops iwl1000_ops = {
- 	.ucode = &iwl5000_ucode,
- 	.lib = &iwl1000_lib,
- 	.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c
---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c	2010-04-04 20:41:49.972919715 -0400
-+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c	2010-05-15 13:21:15.777121582 -0400
-@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
- 	.build_addsta_hcmd = iwl3945_build_addsta_hcmd,
- };
- 
--static struct iwl_ops iwl3945_ops = {
-+static const struct iwl_ops iwl3945_ops = {
- 	.ucode = &iwl3945_ucode,
- 	.lib = &iwl3945_lib,
- 	.hcmd = &iwl3945_hcmd,
-diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c	2010-04-29 17:49:38.221487644 -0400
-+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c	2010-05-15 13:21:15.803555313 -0400
-@@ -2340,7 +2340,7 @@ static struct iwl_lib_ops iwl4965_lib = 
- 	},
- };
- 
--static struct iwl_ops iwl4965_ops = {
-+static const struct iwl_ops iwl4965_ops = {
- 	.ucode = &iwl4965_ucode,
- 	.lib = &iwl4965_lib,
- 	.hcmd = &iwl4965_hcmd,
-diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c
---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c	2010-04-29 17:49:38.221487644 -0400
-+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c	2010-05-15 13:21:15.810712850 -0400
-@@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib = 
- 	 },
- };
- 
--struct iwl_ops iwl5000_ops = {
-+const struct iwl_ops iwl5000_ops = {
- 	.ucode = &iwl5000_ucode,
- 	.lib = &iwl5000_lib,
- 	.hcmd = &iwl5000_hcmd,
- 	.utils = &iwl5000_hcmd_utils,
- };
- 
--static struct iwl_ops iwl5150_ops = {
-+static const struct iwl_ops iwl5150_ops = {
- 	.ucode = &iwl5000_ucode,
- 	.lib = &iwl5150_lib,
- 	.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c
---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c	2010-05-15 13:21:15.810712850 -0400
-@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
- 	.calc_rssi = iwl5000_calc_rssi,
- };
- 
--static struct iwl_ops iwl6000_ops = {
-+static const struct iwl_ops iwl6000_ops = {
- 	.ucode = &iwl5000_ucode,
- 	.lib = &iwl6000_lib,
- 	.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h	2010-05-15 13:21:15.810712850 -0400
-@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
- #endif
+diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
+index 5c2bcef..d4dd3a5 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
++++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
+@@ -68,8 +68,8 @@ do {                                            			\
+ } while (0)
  
  #else
 -#define IWL_DEBUG(__priv, level, fmt, args...)
@@ -26586,22 +27695,11 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
  static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
  				      void *p, u32 len)
  {}
-diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h
---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h	2010-05-15 13:21:15.810712850 -0400
-@@ -67,7 +67,7 @@ struct iwl_tx_queue;
- 
- /* shared structures from iwl-5000.c */
- extern struct iwl_mod_params iwl50_mod_params;
--extern struct iwl_ops iwl5000_ops;
-+extern const struct iwl_ops iwl5000_ops;
- extern struct iwl_ucode_ops iwl5000_ucode;
- extern struct iwl_lib_ops iwl5000_lib;
- extern struct iwl_hcmd_ops iwl5000_hcmd;
-diff -urNp linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c	2010-05-15 13:21:15.810712850 -0400
-@@ -708,7 +708,7 @@ out_unlock:
+diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
+index de2caac..64f7c60 100644
+--- a/drivers/net/wireless/libertas/debugfs.c
++++ b/drivers/net/wireless/libertas/debugfs.c
+@@ -718,7 +718,7 @@ out_unlock:
  struct lbs_debugfs_files {
  	const char *name;
  	int perm;
@@ -26610,22 +27708,24 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
  };
  
  static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c	2010-05-15 13:21:15.822985498 -0400
-@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
+diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
+index 4bd61ee..f6a134f 100644
+--- a/drivers/net/wireless/rndis_wlan.c
++++ b/drivers/net/wireless/rndis_wlan.c
+@@ -1235,7 +1235,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
  
- 	devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
+ 	netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
  
 -	if (rts_threshold < 0 || rts_threshold > 2347)
 +	if (rts_threshold > 2347)
  		rts_threshold = 2347;
  
  	tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-2.6.32.13/drivers/oprofile/buffer_sync.c linux-2.6.32.13/drivers/oprofile/buffer_sync.c
---- linux-2.6.32.13/drivers/oprofile/buffer_sync.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/oprofile/buffer_sync.c	2010-05-15 13:21:15.822985498 -0400
-@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
+diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
+index b7e755f..6f17b32 100644
+--- a/drivers/oprofile/buffer_sync.c
++++ b/drivers/oprofile/buffer_sync.c
+@@ -342,7 +342,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
  		if (cookie == NO_COOKIE)
  			offset = pc;
  		if (cookie == INVALID_COOKIE) {
@@ -26634,7 +27734,7 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/buffer_sync.c linux-2.6.32.13/driver
  			offset = pc;
  		}
  		if (cookie != last_cookie) {
-@@ -384,14 +384,14 @@ add_sample(struct mm_struct *mm, struct 
+@@ -386,14 +386,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
  	/* add userspace sample */
  
  	if (!mm) {
@@ -26651,7 +27751,7 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/buffer_sync.c linux-2.6.32.13/driver
  		return 0;
  	}
  
-@@ -560,7 +560,7 @@ void sync_buffer(int cpu)
+@@ -562,7 +562,7 @@ void sync_buffer(int cpu)
  		/* ignore backtraces if failed to add a sample */
  		if (state == sb_bt_start) {
  			state = sb_bt_ignore;
@@ -26660,10 +27760,11 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/buffer_sync.c linux-2.6.32.13/driver
  		}
  	}
  	release_mm(mm);
-diff -urNp linux-2.6.32.13/drivers/oprofile/event_buffer.c linux-2.6.32.13/drivers/oprofile/event_buffer.c
---- linux-2.6.32.13/drivers/oprofile/event_buffer.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/oprofile/event_buffer.c	2010-05-15 13:21:15.822985498 -0400
-@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
+diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
+index 5df60a6..72f5c1c 100644
+--- a/drivers/oprofile/event_buffer.c
++++ b/drivers/oprofile/event_buffer.c
+@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
  	}
  
  	if (buffer_pos == buffer_size) {
@@ -26672,10 +27773,11 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/event_buffer.c linux-2.6.32.13/drive
  		return;
  	}
  
-diff -urNp linux-2.6.32.13/drivers/oprofile/oprof.c linux-2.6.32.13/drivers/oprofile/oprof.c
---- linux-2.6.32.13/drivers/oprofile/oprof.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/oprofile/oprof.c	2010-05-15 13:21:15.822985498 -0400
-@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
+diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
+index b336cd9..90015a2 100644
+--- a/drivers/oprofile/oprof.c
++++ b/drivers/oprofile/oprof.c
+@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
  	if (oprofile_ops.switch_events())
  		return;
  
@@ -26684,21 +27786,10 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/oprof.c linux-2.6.32.13/drivers/opro
  	start_switch_worker();
  }
  
-diff -urNp linux-2.6.32.13/drivers/oprofile/oprofilefs.c linux-2.6.32.13/drivers/oprofile/oprofilefs.c
---- linux-2.6.32.13/drivers/oprofile/oprofilefs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/oprofile/oprofilefs.c	2010-05-15 13:21:15.822985498 -0400
-@@ -187,7 +187,7 @@ static const struct file_operations atom
- 
- 
- int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
--	char const *name, atomic_t *val)
-+	char const *name, atomic_unchecked_t *val)
- {
- 	struct dentry *d = __oprofilefs_create_file(sb, root, name,
- 						     &atomic_ro_fops, 0444);
-diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.c linux-2.6.32.13/drivers/oprofile/oprofile_stats.c
---- linux-2.6.32.13/drivers/oprofile/oprofile_stats.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/oprofile/oprofile_stats.c	2010-05-15 13:21:15.822985498 -0400
+diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
+index 917d28e..d62d981 100644
+--- a/drivers/oprofile/oprofile_stats.c
++++ b/drivers/oprofile/oprofile_stats.c
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
  		cpu_buf->sample_invalid_eip = 0;
  	}
@@ -26716,9 +27807,10 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.c linux-2.6.32.13/dri
  }
  
  
-diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.h linux-2.6.32.13/drivers/oprofile/oprofile_stats.h
---- linux-2.6.32.13/drivers/oprofile/oprofile_stats.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/oprofile/oprofile_stats.h	2010-05-15 13:21:15.822985498 -0400
+diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
+index 0b54e46..a37c527 100644
+--- a/drivers/oprofile/oprofile_stats.h
++++ b/drivers/oprofile/oprofile_stats.h
 @@ -13,11 +13,11 @@
  #include <asm/atomic.h>
  
@@ -26736,43 +27828,46 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.h linux-2.6.32.13/dri
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.32.13/drivers/parisc/pdc_stable.c linux-2.6.32.13/drivers/parisc/pdc_stable.c
---- linux-2.6.32.13/drivers/parisc/pdc_stable.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/parisc/pdc_stable.c	2010-05-15 13:21:15.822985498 -0400
-@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
- 	return ret;
- }
+diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
+index 2766a6d..80c77e2 100644
+--- a/drivers/oprofile/oprofilefs.c
++++ b/drivers/oprofile/oprofilefs.c
+@@ -187,7 +187,7 @@ static const struct file_operations atomic_ro_fops = {
  
--static struct sysfs_ops pdcspath_attr_ops = {
-+static const struct sysfs_ops pdcspath_attr_ops = {
- 	.show = pdcspath_attr_show,
- 	.store = pdcspath_attr_store,
- };
-diff -urNp linux-2.6.32.13/drivers/parport/procfs.c linux-2.6.32.13/drivers/parport/procfs.c
---- linux-2.6.32.13/drivers/parport/procfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/parport/procfs.c	2010-05-15 13:21:15.822985498 -0400
-@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
+ 
+ int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
+-	char const *name, atomic_t *val)
++	char const *name, atomic_unchecked_t *val)
+ {
+ 	struct dentry *d = __oprofilefs_create_file(sb, root, name,
+ 						     &atomic_ro_fops, 0444);
+diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
+index 3f56bc0..7094b5d 100644
+--- a/drivers/parport/procfs.c
++++ b/drivers/parport/procfs.c
+@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
  
  	*ppos += len;
  
 -	return copy_to_user(result, buffer, len) ? -EFAULT : 0;
-+	return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
++	return (len > sizeof(buffer) || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
  }
  
  #ifdef CONFIG_PARPORT_1284
-@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table
+@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
  
  	*ppos += len;
  
 -	return copy_to_user (result, buffer, len) ? -EFAULT : 0;
-+	return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
++	return (len > sizeof(buffer) || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
  }
  #endif /* IEEE1284.3 support. */
  
-diff -urNp linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c	2010-05-15 13:21:15.842765021 -0400
-@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
+diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
+index cb23aa2..f6dd9fe 100644
+--- a/drivers/pci/hotplug/acpiphp_glue.c
++++ b/drivers/pci/hotplug/acpiphp_glue.c
+@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val,
  }
  
  
@@ -26781,10 +27876,11 @@ diff -urNp linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.13/dr
  	.handler = handle_hotplug_event_func,
  };
  
-diff -urNp linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c	2010-05-15 13:21:15.842765021 -0400
-@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
+diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
+index 76ba8a1..20ca857 100644
+--- a/drivers/pci/hotplug/cpqphp_nvram.c
++++ b/drivers/pci/hotplug/cpqphp_nvram.c
+@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
  
  void compaq_nvram_init (void __iomem *rom_start)
  {
@@ -26798,22 +27894,11 @@ diff -urNp linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.13/dr
  	dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
  	/* initialize our int15 lock */
-diff -urNp linux-2.6.32.13/drivers/pci/hotplug/fakephp.c linux-2.6.32.13/drivers/pci/hotplug/fakephp.c
---- linux-2.6.32.13/drivers/pci/hotplug/fakephp.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pci/hotplug/fakephp.c	2010-05-15 13:21:15.847000534 -0400
-@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
- }
- 
- static struct kobj_type legacy_ktype = {
--	.sysfs_ops = &(struct sysfs_ops){
-+	.sysfs_ops = &(const struct sysfs_ops){
- 		.store = legacy_store, .show = legacy_show
- 	},
- 	.release = &legacy_release,
-diff -urNp linux-2.6.32.13/drivers/pci/intel-iommu.c linux-2.6.32.13/drivers/pci/intel-iommu.c
---- linux-2.6.32.13/drivers/pci/intel-iommu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pci/intel-iommu.c	2010-05-15 13:21:15.847000534 -0400
-@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de
+diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
+index 8e499e8..24a1ecb 100644
+--- a/drivers/pci/intel-iommu.c
++++ b/drivers/pci/intel-iommu.c
+@@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)
  	return !dma_addr;
  }
  
@@ -26822,10 +27907,11 @@ diff -urNp linux-2.6.32.13/drivers/pci/intel-iommu.c linux-2.6.32.13/drivers/pci
  	.alloc_coherent = intel_alloc_coherent,
  	.free_coherent = intel_free_coherent,
  	.map_sg = intel_map_sg,
-diff -urNp linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c
---- linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c	2010-05-15 13:21:15.867469095 -0400
-@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
+diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
+index 3debed2..f03f571 100644
+--- a/drivers/pci/pcie/portdrv_pci.c
++++ b/drivers/pci/pcie/portdrv_pci.c
+@@ -250,7 +250,7 @@ static void pcie_portdrv_err_resume(struct pci_dev *dev)
  static const struct pci_device_id port_pci_ids[] = { {
  	/* handle any PCI-Express port */
  	PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0),
@@ -26834,10 +27920,11 @@ diff -urNp linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.13/driver
  };
  MODULE_DEVICE_TABLE(pci, port_pci_ids);
  
-diff -urNp linux-2.6.32.13/drivers/pci/probe.c linux-2.6.32.13/drivers/pci/probe.c
---- linux-2.6.32.13/drivers/pci/probe.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pci/probe.c	2010-05-15 13:21:15.867469095 -0400
-@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
+diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
+index f4adba2..f151c41 100644
+--- a/drivers/pci/probe.c
++++ b/drivers/pci/probe.c
+@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(struct device *dev,
  	return ret;
  }
  
@@ -26854,10 +27941,11 @@ diff -urNp linux-2.6.32.13/drivers/pci/probe.c linux-2.6.32.13/drivers/pci/probe
  					struct device_attribute *attr,
  					char *buf)
  {
-diff -urNp linux-2.6.32.13/drivers/pci/proc.c linux-2.6.32.13/drivers/pci/proc.c
---- linux-2.6.32.13/drivers/pci/proc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pci/proc.c	2010-05-15 13:21:15.867469095 -0400
-@@ -480,7 +480,16 @@ static const struct file_operations proc
+diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
+index 64ac30b..9a295d5 100644
+--- a/drivers/pci/proc.c
++++ b/drivers/pci/proc.c
+@@ -481,7 +481,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
  static int __init pci_proc_init(void)
  {
  	struct pci_dev *dev = NULL;
@@ -26874,22 +27962,24 @@ diff -urNp linux-2.6.32.13/drivers/pci/proc.c linux-2.6.32.13/drivers/pci/proc.c
  	proc_create("devices", 0, proc_bus_pci_dir,
  		    &proc_bus_pci_dev_operations);
  	proc_initialized = 1;
-diff -urNp linux-2.6.32.13/drivers/pci/slot.c linux-2.6.32.13/drivers/pci/slot.c
---- linux-2.6.32.13/drivers/pci/slot.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pci/slot.c	2010-05-15 13:21:15.895764457 -0400
-@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
- 	return attribute->store ? attribute->store(slot, buf, len) : -EIO;
- }
- 
--static struct sysfs_ops pci_slot_sysfs_ops = {
-+static const struct sysfs_ops pci_slot_sysfs_ops = {
- 	.show = pci_slot_attr_show,
- 	.store = pci_slot_attr_store,
- };
-diff -urNp linux-2.6.32.13/drivers/pcmcia/ti113x.h linux-2.6.32.13/drivers/pcmcia/ti113x.h
---- linux-2.6.32.13/drivers/pcmcia/ti113x.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pcmcia/ti113x.h	2010-05-15 13:21:15.895764457 -0400
-@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
+diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
+index d007a2a..5d7a756 100644
+--- a/drivers/pcmcia/pcmcia_ioctl.c
++++ b/drivers/pcmcia/pcmcia_ioctl.c
+@@ -850,7 +850,7 @@ static int ds_ioctl(struct file *file, u_int cmd, u_long arg)
+ 	    return -EFAULT;
+ 	}
+     }
+-    buf = kmalloc(sizeof(ds_ioctl_arg_t), GFP_KERNEL);
++    buf = kzalloc(sizeof(ds_ioctl_arg_t), GFP_KERNEL);
+     if (!buf)
+ 	return -ENOMEM;
+ 
+diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h
+index 9ffa97d..d04ec32 100644
+--- a/drivers/pcmcia/ti113x.h
++++ b/drivers/pcmcia/ti113x.h
+@@ -936,7 +936,7 @@ static struct pci_device_id ene_tune_tbl[] = {
  	DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
  		ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
  
@@ -26898,10 +27988,11 @@ diff -urNp linux-2.6.32.13/drivers/pcmcia/ti113x.h linux-2.6.32.13/drivers/pcmci
  };
  
  static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
-diff -urNp linux-2.6.32.13/drivers/pcmcia/yenta_socket.c linux-2.6.32.13/drivers/pcmcia/yenta_socket.c
---- linux-2.6.32.13/drivers/pcmcia/yenta_socket.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pcmcia/yenta_socket.c	2010-05-15 13:21:15.911499692 -0400
-@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table 
+diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
+index f1d4137..9e9bdbb 100644
+--- a/drivers/pcmcia/yenta_socket.c
++++ b/drivers/pcmcia/yenta_socket.c
+@@ -1428,7 +1428,7 @@ static struct pci_device_id yenta_table[] = {
  
  	/* match any cardbus bridge */
  	CB_ID(PCI_ANY_ID, PCI_ANY_ID, DEFAULT),
@@ -26910,10 +28001,11 @@ diff -urNp linux-2.6.32.13/drivers/pcmcia/yenta_socket.c linux-2.6.32.13/drivers
  };
  MODULE_DEVICE_TABLE(pci, yenta_table);
  
-diff -urNp linux-2.6.32.13/drivers/platform/x86/acer-wmi.c linux-2.6.32.13/drivers/platform/x86/acer-wmi.c
---- linux-2.6.32.13/drivers/platform/x86/acer-wmi.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/platform/x86/acer-wmi.c	2010-05-15 13:21:15.911499692 -0400
-@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
+diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
+index 1ea6c43..4d4ef01 100644
+--- a/drivers/platform/x86/acer-wmi.c
++++ b/drivers/platform/x86/acer-wmi.c
+@@ -916,7 +916,7 @@ static int update_bl_status(struct backlight_device *bd)
  	return 0;
  }
  
@@ -26922,10 +28014,32 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/acer-wmi.c linux-2.6.32.13/drive
  	.get_brightness = read_brightness,
  	.update_status = update_bl_status,
  };
-diff -urNp linux-2.6.32.13/drivers/platform/x86/asus_acpi.c linux-2.6.32.13/drivers/platform/x86/asus_acpi.c
---- linux-2.6.32.13/drivers/platform/x86/asus_acpi.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/platform/x86/asus_acpi.c	2010-05-15 13:21:15.911499692 -0400
-@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
+diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
+index 1fccc85..d176c29 100644
+--- a/drivers/platform/x86/asus-laptop.c
++++ b/drivers/platform/x86/asus-laptop.c
+@@ -224,7 +224,6 @@ struct asus_laptop {
+ 	struct asus_led gled;
+ 	struct asus_led kled;
+ 	struct workqueue_struct *led_workqueue;
+-
+ 	int wireless_status;
+ 	bool have_rsts;
+ 	int lcd_state;
+@@ -621,7 +620,7 @@ static int update_bl_status(struct backlight_device *bd)
+ 	return asus_lcd_set(asus, value);
+ }
+ 
+-static struct backlight_ops asusbl_ops = {
++static const struct backlight_ops asusbl_ops = {
+ 	.get_brightness = asus_read_brightness,
+ 	.update_status = update_bl_status,
+ };
+diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
+index 92fd30c..e477b4e 100644
+--- a/drivers/platform/x86/asus_acpi.c
++++ b/drivers/platform/x86/asus_acpi.c
+@@ -1464,7 +1464,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type)
  	return 0;
  }
  
@@ -26934,22 +28048,11 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/asus_acpi.c linux-2.6.32.13/driv
  	.get_brightness = read_brightness,
  	.update_status  = set_brightness_status,
  };
-diff -urNp linux-2.6.32.13/drivers/platform/x86/asus-laptop.c linux-2.6.32.13/drivers/platform/x86/asus-laptop.c
---- linux-2.6.32.13/drivers/platform/x86/asus-laptop.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/platform/x86/asus-laptop.c	2010-05-15 13:21:15.911499692 -0400
-@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
-  */
- static int read_brightness(struct backlight_device *bd);
- static int update_bl_status(struct backlight_device *bd);
--static struct backlight_ops asusbl_ops = {
-+static const struct backlight_ops asusbl_ops = {
- 	.get_brightness = read_brightness,
- 	.update_status = update_bl_status,
- };
-diff -urNp linux-2.6.32.13/drivers/platform/x86/compal-laptop.c linux-2.6.32.13/drivers/platform/x86/compal-laptop.c
---- linux-2.6.32.13/drivers/platform/x86/compal-laptop.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/platform/x86/compal-laptop.c	2010-05-15 13:21:15.911499692 -0400
-@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
+diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
+index 90111d7..dfcbb83 100644
+--- a/drivers/platform/x86/compal-laptop.c
++++ b/drivers/platform/x86/compal-laptop.c
+@@ -168,7 +168,7 @@ static int bl_update_status(struct backlight_device *b)
  	return set_lcd_level(b->props.brightness);
  }
  
@@ -26958,11 +28061,12 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/compal-laptop.c linux-2.6.32.13/
  	.get_brightness = bl_get_brightness,
  	.update_status	= bl_update_status,
  };
-diff -urNp linux-2.6.32.13/drivers/platform/x86/dell-laptop.c linux-2.6.32.13/drivers/platform/x86/dell-laptop.c
---- linux-2.6.32.13/drivers/platform/x86/dell-laptop.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/platform/x86/dell-laptop.c	2010-05-15 13:21:15.911499692 -0400
-@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
- 	return buffer.output[1];
+diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
+index 6110601..3f9e967 100644
+--- a/drivers/platform/x86/dell-laptop.c
++++ b/drivers/platform/x86/dell-laptop.c
+@@ -469,7 +469,7 @@ out:
+ 	return buffer->output[1];
  }
  
 -static struct backlight_ops dell_ops = {
@@ -26970,22 +28074,24 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/dell-laptop.c linux-2.6.32.13/dr
  	.get_brightness = dell_get_intensity,
  	.update_status  = dell_send_intensity,
  };
-diff -urNp linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c	2010-04-29 17:49:38.317493070 -0400
-+++ linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c	2010-05-15 13:21:15.911499692 -0400
-@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
-  */
- static int read_brightness(struct backlight_device *bd);
- static int update_bl_status(struct backlight_device *bd);
+diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
+index 0306174..9d1f28b 100644
+--- a/drivers/platform/x86/eeepc-laptop.c
++++ b/drivers/platform/x86/eeepc-laptop.c
+@@ -1114,7 +1114,7 @@ static int update_bl_status(struct backlight_device *bd)
+ 	return set_brightness(bd, bd->props.brightness);
+ }
+ 
 -static struct backlight_ops eeepcbl_ops = {
 +static const struct backlight_ops eeepcbl_ops = {
  	.get_brightness = read_brightness,
  	.update_status = update_bl_status,
  };
-diff -urNp linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c	2010-05-15 13:21:15.911499692 -0400
-@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
+diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
+index e325aeb..30d69ef 100644
+--- a/drivers/platform/x86/fujitsu-laptop.c
++++ b/drivers/platform/x86/fujitsu-laptop.c
+@@ -437,7 +437,7 @@ static int bl_update_status(struct backlight_device *b)
  	return ret;
  }
  
@@ -26994,34 +28100,11 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.13
  	.get_brightness = bl_get_brightness,
  	.update_status = bl_update_status,
  };
-diff -urNp linux-2.6.32.13/drivers/platform/x86/msi-laptop.c linux-2.6.32.13/drivers/platform/x86/msi-laptop.c
---- linux-2.6.32.13/drivers/platform/x86/msi-laptop.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/platform/x86/msi-laptop.c	2010-05-15 13:21:15.911499692 -0400
-@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
- 	return set_lcd_level(b->props.brightness);
- }
- 
--static struct backlight_ops msibl_ops = {
-+static const struct backlight_ops msibl_ops = {
- 	.get_brightness = bl_get_brightness,
- 	.update_status  = bl_update_status,
- };
-diff -urNp linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c
---- linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c	2010-05-15 13:21:15.911499692 -0400
-@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
- 	return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
- }
- 
--static struct backlight_ops pcc_backlight_ops = {
-+static const struct backlight_ops pcc_backlight_ops = {
- 	.get_brightness	= bl_get,
- 	.update_status	= bl_set_status,
- };
-diff -urNp linux-2.6.32.13/drivers/platform/x86/sony-laptop.c linux-2.6.32.13/drivers/platform/x86/sony-laptop.c
---- linux-2.6.32.13/drivers/platform/x86/sony-laptop.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/platform/x86/sony-laptop.c	2010-05-15 13:21:15.914756904 -0400
-@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
+diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
+index 1387c5f..21d4309 100644
+--- a/drivers/platform/x86/sony-laptop.c
++++ b/drivers/platform/x86/sony-laptop.c
+@@ -857,7 +857,7 @@ static int sony_backlight_get_brightness(struct backlight_device *bd)
  }
  
  static struct backlight_device *sony_backlight_device;
@@ -27030,10 +28113,11 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/sony-laptop.c linux-2.6.32.13/dr
  	.update_status = sony_backlight_update_status,
  	.get_brightness = sony_backlight_get_brightness,
  };
-diff -urNp linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c	2010-04-29 17:49:38.333363657 -0400
-+++ linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c	2010-05-15 13:21:15.914756904 -0400
-@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
+diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
+index 4bdb137..e53ba1f 100644
+--- a/drivers/platform/x86/thinkpad_acpi.c
++++ b/drivers/platform/x86/thinkpad_acpi.c
+@@ -6142,7 +6142,7 @@ static void tpacpi_brightness_notify_change(void)
  			       BACKLIGHT_UPDATE_HOTKEY);
  }
  
@@ -27042,10 +28126,11 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.13/
  	.get_brightness = brightness_get,
  	.update_status  = brightness_update_status,
  };
-diff -urNp linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c	2010-05-15 13:21:15.914756904 -0400
-@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
+diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
+index 37aa147..c1aa23e 100644
+--- a/drivers/platform/x86/toshiba_acpi.c
++++ b/drivers/platform/x86/toshiba_acpi.c
+@@ -741,7 +741,7 @@ static acpi_status remove_device(void)
  	return AE_OK;
  }
  
@@ -27054,10 +28139,11 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.13/d
          .get_brightness = get_lcd,
          .update_status  = set_lcd_status,
  };
-diff -urNp linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c	2010-05-15 13:21:15.914756904 -0400
-@@ -60,7 +60,7 @@ do { \
+diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
+index 8591f6a..a0f2b81 100644
+--- a/drivers/pnp/pnpbios/bioscalls.c
++++ b/drivers/pnp/pnpbios/bioscalls.c
+@@ -59,7 +59,7 @@ do { \
  	set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
  } while(0)
  
@@ -27066,7 +28152,7 @@ diff -urNp linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.13/drive
  			(unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
  
  /*
-@@ -97,7 +97,10 @@ static inline u16 call_pnp_bios(u16 func
+@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
  
  	cpu = get_cpu();
  	save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
@@ -27077,7 +28163,7 @@ diff -urNp linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.13/drive
  
  	/* On some boxes IRQ's during PnP BIOS calls are deadly.  */
  	spin_lock_irqsave(&pnp_bios_lock, flags);
-@@ -135,7 +138,10 @@ static inline u16 call_pnp_bios(u16 func
+@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
  			     :"memory");
  	spin_unlock_irqrestore(&pnp_bios_lock, flags);
  
@@ -27088,7 +28174,7 @@ diff -urNp linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.13/drive
  	put_cpu();
  
  	/* If we get here and this is set then the PnP BIOS faulted on us. */
-@@ -469,7 +475,7 @@ int pnp_bios_read_escd(char *data, u32 n
+@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
  	return status;
  }
  
@@ -27097,7 +28183,7 @@ diff -urNp linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.13/drive
  {
  	int i;
  
-@@ -477,6 +483,8 @@ void pnpbios_calls_init(union pnp_bios_i
+@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
  	pnp_bios_callpoint.offset = header->fields.pm16offset;
  	pnp_bios_callpoint.segment = PNP_CS16;
  
@@ -27106,17 +28192,18 @@ diff -urNp linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.13/drive
  	for_each_possible_cpu(i) {
  		struct desc_struct *gdt = get_cpu_gdt_table(i);
  		if (!gdt)
-@@ -488,4 +496,6 @@ void pnpbios_calls_init(union pnp_bios_i
+@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
  		set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
  			 (unsigned long)__va(header->fields.pm16dseg));
  	}
 +
 +	pax_close_kernel();
  }
-diff -urNp linux-2.6.32.13/drivers/pnp/quirks.c linux-2.6.32.13/drivers/pnp/quirks.c
---- linux-2.6.32.13/drivers/pnp/quirks.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pnp/quirks.c	2010-05-15 13:21:15.914756904 -0400
-@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
+diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
+index dfbd5a6..a0a9f46 100644
+--- a/drivers/pnp/quirks.c
++++ b/drivers/pnp/quirks.c
+@@ -322,7 +322,7 @@ static struct pnp_fixup pnp_fixups[] = {
  	/* PnP resources that might overlap PCI BARs */
  	{"PNP0c01", quirk_system_pci_resources},
  	{"PNP0c02", quirk_system_pci_resources},
@@ -27125,10 +28212,11 @@ diff -urNp linux-2.6.32.13/drivers/pnp/quirks.c linux-2.6.32.13/drivers/pnp/quir
  };
  
  void pnp_fixup_device(struct pnp_dev *dev)
-diff -urNp linux-2.6.32.13/drivers/pnp/resource.c linux-2.6.32.13/drivers/pnp/resource.c
---- linux-2.6.32.13/drivers/pnp/resource.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/pnp/resource.c	2010-05-15 13:21:15.914756904 -0400
-@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
+diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
+index e3446ab..b13bf03 100644
+--- a/drivers/pnp/resource.c
++++ b/drivers/pnp/resource.c
+@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
  		return 1;
  
  	/* check if the resource is valid */
@@ -27137,7 +28225,7 @@ diff -urNp linux-2.6.32.13/drivers/pnp/resource.c linux-2.6.32.13/drivers/pnp/re
  		return 0;
  
  	/* check if the resource is reserved */
-@@ -419,7 +419,7 @@ int pnp_check_dma(struct pnp_dev *dev, s
+@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
  		return 1;
  
  	/* check if the resource is valid */
@@ -27146,163 +28234,24 @@ diff -urNp linux-2.6.32.13/drivers/pnp/resource.c linux-2.6.32.13/drivers/pnp/re
  		return 0;
  
  	/* check if the resource is reserved */
-diff -urNp linux-2.6.32.13/drivers/s390/cio/qdio_perf.c linux-2.6.32.13/drivers/s390/cio/qdio_perf.c
---- linux-2.6.32.13/drivers/s390/cio/qdio_perf.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/s390/cio/qdio_perf.c	2010-05-15 13:21:15.914756904 -0400
-@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
- static int qdio_perf_proc_show(struct seq_file *m, void *v)
- {
- 	seq_printf(m, "Number of qdio interrupts\t\t\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.qdio_int));
-+		   (long)atomic_long_read_unchecked(&perf_stats.qdio_int));
- 	seq_printf(m, "Number of PCI interrupts\t\t\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.pci_int));
-+		   (long)atomic_long_read_unchecked(&perf_stats.pci_int));
- 	seq_printf(m, "Number of adapter interrupts\t\t\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.thin_int));
-+		   (long)atomic_long_read_unchecked(&perf_stats.thin_int));
- 	seq_printf(m, "\n");
- 	seq_printf(m, "Inbound tasklet runs\t\t\t\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.tasklet_inbound));
-+		   (long)atomic_long_read_unchecked(&perf_stats.tasklet_inbound));
- 	seq_printf(m, "Outbound tasklet runs\t\t\t\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.tasklet_outbound));
-+		   (long)atomic_long_read_unchecked(&perf_stats.tasklet_outbound));
- 	seq_printf(m, "Adapter interrupt tasklet runs/loops\t\t: %li/%li\n",
--		   (long)atomic_long_read(&perf_stats.tasklet_thinint),
--		   (long)atomic_long_read(&perf_stats.tasklet_thinint_loop));
-+		   (long)atomic_long_read_unchecked(&perf_stats.tasklet_thinint),
-+		   (long)atomic_long_read_unchecked(&perf_stats.tasklet_thinint_loop));
- 	seq_printf(m, "Adapter interrupt inbound tasklet runs/loops\t: %li/%li\n",
--		   (long)atomic_long_read(&perf_stats.thinint_inbound),
--		   (long)atomic_long_read(&perf_stats.thinint_inbound_loop));
-+		   (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound),
-+		   (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound_loop));
- 	seq_printf(m, "\n");
- 	seq_printf(m, "Number of SIGA In issued\t\t\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.siga_in));
-+		   (long)atomic_long_read_unchecked(&perf_stats.siga_in));
- 	seq_printf(m, "Number of SIGA Out issued\t\t\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.siga_out));
-+		   (long)atomic_long_read_unchecked(&perf_stats.siga_out));
- 	seq_printf(m, "Number of SIGA Sync issued\t\t\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.siga_sync));
-+		   (long)atomic_long_read_unchecked(&perf_stats.siga_sync));
- 	seq_printf(m, "\n");
- 	seq_printf(m, "Number of inbound transfers\t\t\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.inbound_handler));
-+		   (long)atomic_long_read_unchecked(&perf_stats.inbound_handler));
- 	seq_printf(m, "Number of outbound transfers\t\t\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.outbound_handler));
-+		   (long)atomic_long_read_unchecked(&perf_stats.outbound_handler));
- 	seq_printf(m, "\n");
- 	seq_printf(m, "Number of fast requeues (outg. SBAL w/o SIGA)\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.fast_requeue));
-+		   (long)atomic_long_read_unchecked(&perf_stats.fast_requeue));
- 	seq_printf(m, "Number of outbound target full condition\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.outbound_target_full));
-+		   (long)atomic_long_read_unchecked(&perf_stats.outbound_target_full));
- 	seq_printf(m, "Number of outbound tasklet mod_timer calls\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.debug_tl_out_timer));
-+		   (long)atomic_long_read_unchecked(&perf_stats.debug_tl_out_timer));
- 	seq_printf(m, "Number of stop polling calls\t\t\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.debug_stop_polling));
-+		   (long)atomic_long_read_unchecked(&perf_stats.debug_stop_polling));
- 	seq_printf(m, "AI inbound tasklet loops after stop polling\t: %li\n",
--		   (long)atomic_long_read(&perf_stats.thinint_inbound_loop2));
-+		   (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound_loop2));
- 	seq_printf(m, "QEBSM EQBS total/incomplete\t\t\t: %li/%li\n",
--		   (long)atomic_long_read(&perf_stats.debug_eqbs_all),
--		   (long)atomic_long_read(&perf_stats.debug_eqbs_incomplete));
-+		   (long)atomic_long_read_unchecked(&perf_stats.debug_eqbs_all),
-+		   (long)atomic_long_read_unchecked(&perf_stats.debug_eqbs_incomplete));
- 	seq_printf(m, "QEBSM SQBS total/incomplete\t\t\t: %li/%li\n",
--		   (long)atomic_long_read(&perf_stats.debug_sqbs_all),
--		   (long)atomic_long_read(&perf_stats.debug_sqbs_incomplete));
-+		   (long)atomic_long_read_unchecked(&perf_stats.debug_sqbs_all),
-+		   (long)atomic_long_read_unchecked(&perf_stats.debug_sqbs_incomplete));
- 	seq_printf(m, "\n");
- 	return 0;
+diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
+index 6ce83f5..68ee329 100644
+--- a/drivers/s390/cio/qdio_debug.c
++++ b/drivers/s390/cio/qdio_debug.c
+@@ -233,7 +233,7 @@ static int qperf_seq_open(struct inode *inode, struct file *filp)
+ 			   filp->f_path.dentry->d_inode->i_private);
  }
-diff -urNp linux-2.6.32.13/drivers/s390/cio/qdio_perf.h linux-2.6.32.13/drivers/s390/cio/qdio_perf.h
---- linux-2.6.32.13/drivers/s390/cio/qdio_perf.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/s390/cio/qdio_perf.h	2010-05-15 13:21:15.927411554 -0400
-@@ -13,46 +13,46 @@
- 
- struct qdio_perf_stats {
- 	/* interrupt handler calls */
--	atomic_long_t qdio_int;
--	atomic_long_t pci_int;
--	atomic_long_t thin_int;
-+	atomic_long_unchecked_t qdio_int;
-+	atomic_long_unchecked_t pci_int;
-+	atomic_long_unchecked_t thin_int;
- 
- 	/* tasklet runs */
--	atomic_long_t tasklet_inbound;
--	atomic_long_t tasklet_outbound;
--	atomic_long_t tasklet_thinint;
--	atomic_long_t tasklet_thinint_loop;
--	atomic_long_t thinint_inbound;
--	atomic_long_t thinint_inbound_loop;
--	atomic_long_t thinint_inbound_loop2;
-+	atomic_long_unchecked_t tasklet_inbound;
-+	atomic_long_unchecked_t tasklet_outbound;
-+	atomic_long_unchecked_t tasklet_thinint;
-+	atomic_long_unchecked_t tasklet_thinint_loop;
-+	atomic_long_unchecked_t thinint_inbound;
-+	atomic_long_unchecked_t thinint_inbound_loop;
-+	atomic_long_unchecked_t thinint_inbound_loop2;
- 
- 	/* signal adapter calls */
--	atomic_long_t siga_out;
--	atomic_long_t siga_in;
--	atomic_long_t siga_sync;
-+	atomic_long_unchecked_t siga_out;
-+	atomic_long_unchecked_t siga_in;
-+	atomic_long_unchecked_t siga_sync;
- 
- 	/* misc */
--	atomic_long_t inbound_handler;
--	atomic_long_t outbound_handler;
--	atomic_long_t fast_requeue;
--	atomic_long_t outbound_target_full;
-+	atomic_long_unchecked_t inbound_handler;
-+	atomic_long_unchecked_t outbound_handler;
-+	atomic_long_unchecked_t fast_requeue;
-+	atomic_long_unchecked_t outbound_target_full;
- 
- 	/* for debugging */
--	atomic_long_t debug_tl_out_timer;
--	atomic_long_t debug_stop_polling;
--	atomic_long_t debug_eqbs_all;
--	atomic_long_t debug_eqbs_incomplete;
--	atomic_long_t debug_sqbs_all;
--	atomic_long_t debug_sqbs_incomplete;
-+	atomic_long_unchecked_t debug_tl_out_timer;
-+	atomic_long_unchecked_t debug_stop_polling;
-+	atomic_long_unchecked_t debug_eqbs_all;
-+	atomic_long_unchecked_t debug_eqbs_incomplete;
-+	atomic_long_unchecked_t debug_sqbs_all;
-+	atomic_long_unchecked_t debug_sqbs_incomplete;
- };
- 
- extern struct qdio_perf_stats perf_stats;
- extern int qdio_performance_stats;
- 
--static inline void qdio_perf_stat_inc(atomic_long_t *count)
-+static inline void qdio_perf_stat_inc(atomic_long_unchecked_t *count)
- {
- 	if (qdio_performance_stats)
--		atomic_long_inc(count);
-+		atomic_long_inc_unchecked(count);
- }
- 
- int qdio_setup_perf_stats(void);
-diff -urNp linux-2.6.32.13/drivers/scsi/ipr.c linux-2.6.32.13/drivers/scsi/ipr.c
---- linux-2.6.32.13/drivers/scsi/ipr.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/scsi/ipr.c	2010-05-15 13:21:15.970703897 -0400
-@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
+ 
+-static struct file_operations debugfs_perf_fops = {
++static const struct file_operations debugfs_perf_fops = {
+ 	.owner	 = THIS_MODULE,
+ 	.open	 = qperf_seq_open,
+ 	.read	 = seq_read,
+diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
+index f820cff..54a7195 100644
+--- a/drivers/scsi/ipr.c
++++ b/drivers/scsi/ipr.c
+@@ -6091,7 +6091,7 @@ static bool ipr_qc_fill_rtf(struct ata_queued_cmd *qc)
  	return true;
  }
  
@@ -27311,10 +28260,11 @@ diff -urNp linux-2.6.32.13/drivers/scsi/ipr.c linux-2.6.32.13/drivers/scsi/ipr.c
  	.phy_reset = ipr_ata_phy_reset,
  	.hardreset = ipr_sata_reset,
  	.post_internal_cmd = ipr_ata_post_internal,
-diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c	2010-05-15 13:21:15.970703897 -0400
-@@ -86,12 +86,12 @@ struct fc_exch_mgr {
+diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
+index 104e0fb..6db906b 100644
+--- a/drivers/scsi/libfc/fc_exch.c
++++ b/drivers/scsi/libfc/fc_exch.c
+@@ -100,12 +100,12 @@ struct fc_exch_mgr {
  	 * all together if not used XXX
  	 */
  	struct {
@@ -27333,7 +28283,7 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/
  	} stats;
  };
  #define	fc_seq_exch(sp) container_of(sp, struct fc_exch, seq)
-@@ -510,7 +510,7 @@ static struct fc_exch *fc_exch_em_alloc(
+@@ -671,7 +671,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
  	/* allocate memory for exchange */
  	ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
  	if (!ep) {
@@ -27342,7 +28292,7 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/
  		goto out;
  	}
  	memset(ep, 0, sizeof(*ep));
-@@ -557,7 +557,7 @@ out:
+@@ -719,7 +719,7 @@ out:
  	return ep;
  err:
  	spin_unlock_bh(&pool->lock);
@@ -27351,7 +28301,7 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/
  	mempool_free(ep, mp->ep_pool);
  	return NULL;
  }
-@@ -690,7 +690,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -864,7 +864,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
  		xid = ntohs(fh->fh_ox_id);	/* we originated exch */
  		ep = fc_exch_find(mp, xid);
  		if (!ep) {
@@ -27360,7 +28310,7 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/
  			reject = FC_RJT_OX_ID;
  			goto out;
  		}
-@@ -720,7 +720,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -894,7 +894,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
  		ep = fc_exch_find(mp, xid);
  		if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
  			if (ep) {
@@ -27369,7 +28319,7 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/
  				reject = FC_RJT_RX_ID;
  				goto rel;
  			}
-@@ -731,7 +731,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -905,7 +905,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
  			}
  			xid = ep->xid;	/* get our XID */
  		} else if (!ep) {
@@ -27378,7 +28328,7 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/
  			reject = FC_RJT_RX_ID;	/* XID not found */
  			goto out;
  		}
-@@ -752,7 +752,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -922,7 +922,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
  	} else {
  		sp = &ep->seq;
  		if (sp->id != fh->fh_seq_id) {
@@ -27387,7 +28337,7 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/
  			reject = FC_RJT_SEQ_ID;	/* sequence/exch should exist */
  			goto rel;
  		}
-@@ -1163,22 +1163,22 @@ static void fc_exch_recv_seq_resp(struct
+@@ -1303,22 +1303,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
  
  	ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
  	if (!ep) {
@@ -27414,16 +28364,16 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/
  		goto rel;
  	}
  	sof = fr_sof(fp);
-@@ -1189,7 +1189,7 @@ static void fc_exch_recv_seq_resp(struct
- 	} 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);
- 			goto rel;
- 		}
+@@ -1327,7 +1327,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
+ 		sp->ssb_stat |= SSB_ST_RESP;
+ 		sp->id = fh->fh_seq_id;
+ 	} else if (sp->id != fh->fh_seq_id) {
+-		atomic_inc(&mp->stats.seq_not_found);
++		atomic_inc_unchecked(&mp->stats.seq_not_found);
+ 		goto rel;
  	}
-@@ -1249,9 +1249,9 @@ static void fc_exch_recv_resp(struct fc_
+ 
+@@ -1390,9 +1390,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
  	sp = fc_seq_lookup_orig(mp, fp);	/* doesn't hold sequence */
  
  	if (!sp)
@@ -27435,10 +28385,11 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/
  
  	fc_frame_free(fp);
  }
-diff -urNp linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c	2010-05-15 13:20:18.878584179 -0400
-+++ linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c	2010-05-15 13:21:15.970703897 -0400
-@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
+diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
+index fb78856..5c2001e 100644
+--- a/drivers/scsi/libsas/sas_ata.c
++++ b/drivers/scsi/libsas/sas_ata.c
+@@ -344,7 +344,7 @@ static int sas_ata_scr_read(struct ata_link *link, unsigned int sc_reg_in,
  	}
  }
  
@@ -27446,10 +28397,11 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c linux-2.6.32.13/drivers
 +static const struct ata_port_operations sas_sata_ops = {
  	.phy_reset		= sas_ata_phy_reset,
  	.post_internal_cmd	= sas_ata_post_internal,
- 	.qc_prep		= ata_noop_qc_prep,
-diff -urNp linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h
---- linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h	2010-05-15 13:21:15.991412669 -0400
+ 	.qc_defer               = ata_std_qc_defer,
+diff --git a/drivers/scsi/mpt2sas/mpt2sas_debug.h b/drivers/scsi/mpt2sas/mpt2sas_debug.h
+index 3dcddfe..58216cb 100644
+--- a/drivers/scsi/mpt2sas/mpt2sas_debug.h
++++ b/drivers/scsi/mpt2sas/mpt2sas_debug.h
 @@ -79,7 +79,7 @@
  		CMD;						\
  }
@@ -27459,9 +28411,23 @@ diff -urNp linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.13/
  #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
  
  
-diff -urNp linux-2.6.32.13/drivers/scsi/scsi_logging.h linux-2.6.32.13/drivers/scsi/scsi_logging.h
---- linux-2.6.32.13/drivers/scsi/scsi_logging.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/scsi/scsi_logging.h	2010-05-15 13:21:15.991412669 -0400
+diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
+index be1a8fc..f67861f 100644
+--- a/drivers/scsi/qla2xxx/qla_os.c
++++ b/drivers/scsi/qla2xxx/qla_os.c
+@@ -3899,7 +3899,7 @@ static struct pci_driver qla2xxx_pci_driver = {
+ 	.err_handler	= &qla2xxx_err_handler,
+ };
+ 
+-static struct file_operations apidev_fops = {
++static const struct file_operations apidev_fops = {
+ 	.owner = THIS_MODULE,
+ };
+ 
+diff --git a/drivers/scsi/scsi_logging.h b/drivers/scsi/scsi_logging.h
+index 1f65139..eef6227 100644
+--- a/drivers/scsi/scsi_logging.h
++++ b/drivers/scsi/scsi_logging.h
 @@ -51,7 +51,7 @@ do {								\
  		} while (0);					\
  } while (0)
@@ -27471,10 +28437,11 @@ diff -urNp linux-2.6.32.13/drivers/scsi/scsi_logging.h linux-2.6.32.13/drivers/s
  #endif /* CONFIG_SCSI_LOGGING */
  
  /*
-diff -urNp linux-2.6.32.13/drivers/scsi/sg.c linux-2.6.32.13/drivers/scsi/sg.c
---- linux-2.6.32.13/drivers/scsi/sg.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/scsi/sg.c	2010-05-15 13:21:15.991412669 -0400
-@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
+diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
+index ef752b2..c017189 100644
+--- a/drivers/scsi/sg.c
++++ b/drivers/scsi/sg.c
+@@ -2302,7 +2302,7 @@ struct sg_proc_leaf {
  	const struct file_operations * fops;
  };
  
@@ -27483,7 +28450,7 @@ diff -urNp linux-2.6.32.13/drivers/scsi/sg.c linux-2.6.32.13/drivers/scsi/sg.c
  	{"allow_dio", &adio_fops},
  	{"debug", &debug_fops},
  	{"def_reserved_size", &dressz_fops},
-@@ -2307,7 +2307,7 @@ sg_proc_init(void)
+@@ -2317,7 +2317,7 @@ sg_proc_init(void)
  {
  	int k, mask;
  	int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
@@ -27492,10 +28459,11 @@ diff -urNp linux-2.6.32.13/drivers/scsi/sg.c linux-2.6.32.13/drivers/scsi/sg.c
  
  	sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
  	if (!sg_proc_sgp)
-diff -urNp linux-2.6.32.13/drivers/serial/8250_pci.c linux-2.6.32.13/drivers/serial/8250_pci.c
---- linux-2.6.32.13/drivers/serial/8250_pci.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/serial/8250_pci.c	2010-05-15 13:21:16.030795257 -0400
-@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
+diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
+index 53be4d3..178495f 100644
+--- a/drivers/serial/8250_pci.c
++++ b/drivers/serial/8250_pci.c
+@@ -3777,7 +3777,7 @@ static struct pci_device_id serial_pci_tbl[] = {
  		PCI_ANY_ID, PCI_ANY_ID,
  		PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
  		0xffff00, pbn_default },
@@ -27504,64 +28472,24 @@ diff -urNp linux-2.6.32.13/drivers/serial/8250_pci.c linux-2.6.32.13/drivers/ser
  };
  
  static struct pci_driver serial_pci_driver = {
-diff -urNp linux-2.6.32.13/drivers/serial/kgdboc.c linux-2.6.32.13/drivers/serial/kgdboc.c
---- linux-2.6.32.13/drivers/serial/kgdboc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/serial/kgdboc.c	2010-05-15 13:21:16.030795257 -0400
-@@ -18,7 +18,7 @@
+diff --git a/drivers/serial/kgdboc.c b/drivers/serial/kgdboc.c
+index a9a94ae..f1641fc 100644
+--- a/drivers/serial/kgdboc.c
++++ b/drivers/serial/kgdboc.c
+@@ -20,7 +20,7 @@
  
  #define MAX_CONFIG_LEN		40
  
 -static struct kgdb_io		kgdboc_io_ops;
-+static const struct kgdb_io	kgdboc_io_ops;
++static struct kgdb_io	kgdboc_io_ops;
  
  /* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
  static int configured		= -1;
-@@ -154,7 +154,7 @@ static void kgdboc_post_exp_handler(void
- 		module_put(THIS_MODULE);
- }
- 
--static struct kgdb_io kgdboc_io_ops = {
-+static const struct kgdb_io kgdboc_io_ops = {
- 	.name			= "kgdboc",
- 	.read_char		= kgdboc_get_char,
- 	.write_char		= kgdboc_put_char,
-diff -urNp linux-2.6.32.13/drivers/staging/android/binder.c linux-2.6.32.13/drivers/staging/android/binder.c
---- linux-2.6.32.13/drivers/staging/android/binder.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/android/binder.c	2010-05-15 13:21:16.072777583 -0400
-@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
- 	binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
- }
- 
--static struct vm_operations_struct binder_vm_ops = {
-+static const struct vm_operations_struct binder_vm_ops = {
- 	.open = binder_vma_open,
- 	.close = binder_vma_close,
- };
-diff -urNp linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c
---- linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c	2010-05-15 13:21:16.111132239 -0400
-@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
- 	return VM_FAULT_NOPAGE;
- }
- 
--static struct vm_operations_struct b3dfg_vm_ops = {
-+static const struct vm_operations_struct b3dfg_vm_ops = {
- 	.fault = b3dfg_vma_fault,
- };
- 
-@@ -848,7 +848,7 @@ static int b3dfg_mmap(struct file *filp,
- 	return r;
- }
- 
--static struct file_operations b3dfg_fops = {
-+static const struct file_operations b3dfg_fops = {
- 	.owner = THIS_MODULE,
- 	.open = b3dfg_open,
- 	.release = b3dfg_release,
-diff -urNp linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c	2010-05-15 13:21:16.111132239 -0400
-@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct 
+diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
+index aeb2c00..7667956 100644
+--- a/drivers/staging/comedi/comedi_fops.c
++++ b/drivers/staging/comedi/comedi_fops.c
+@@ -1425,7 +1425,7 @@ static void comedi_unmap(struct vm_area_struct *area)
  	mutex_unlock(&dev->mutex);
  }
  
@@ -27570,10 +28498,33 @@ diff -urNp linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c linux-2.6.32.13/
  	.close = comedi_unmap,
  };
  
-diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c	2010-05-15 13:21:16.111132239 -0400
-@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
+diff --git a/drivers/staging/dream/pmem.c b/drivers/staging/dream/pmem.c
+index 6387365..74aad74 100644
+--- a/drivers/staging/dream/pmem.c
++++ b/drivers/staging/dream/pmem.c
+@@ -175,7 +175,7 @@ static int pmem_mmap(struct file *, struct vm_area_struct *);
+ static int pmem_open(struct inode *, struct file *);
+ static long pmem_ioctl(struct file *, unsigned int, unsigned long);
+ 
+-struct file_operations pmem_fops = {
++const struct file_operations pmem_fops = {
+ 	.release = pmem_release,
+ 	.mmap = pmem_mmap,
+ 	.open = pmem_open,
+@@ -1201,7 +1201,7 @@ static ssize_t debug_read(struct file *file, char __user *buf, size_t count,
+ 	return simple_read_from_buffer(buf, count, ppos, buffer, n);
+ }
+ 
+-static struct file_operations debug_fops = {
++static const struct file_operations debug_fops = {
+ 	.read = debug_read,
+ 	.open = debug_open,
+ };
+diff --git a/drivers/staging/dream/qdsp5/adsp_driver.c b/drivers/staging/dream/qdsp5/adsp_driver.c
+index 8197765..5f3b690 100644
+--- a/drivers/staging/dream/qdsp5/adsp_driver.c
++++ b/drivers/staging/dream/qdsp5/adsp_driver.c
+@@ -577,7 +577,7 @@ static struct adsp_device *inode_to_device(struct inode *inode)
  static dev_t adsp_devno;
  static struct class *adsp_class;
  
@@ -27582,10 +28533,11 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
  	.owner = THIS_MODULE,
  	.open = adsp_open,
  	.unlocked_ioctl = adsp_ioctl,
-diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c	2010-05-15 13:21:16.127017061 -0400
-@@ -1022,7 +1022,7 @@ done:
+diff --git a/drivers/staging/dream/qdsp5/audio_aac.c b/drivers/staging/dream/qdsp5/audio_aac.c
+index a373f35..8c97186 100644
+--- a/drivers/staging/dream/qdsp5/audio_aac.c
++++ b/drivers/staging/dream/qdsp5/audio_aac.c
+@@ -1023,7 +1023,7 @@ done:
  	return rc;
  }
  
@@ -27594,10 +28546,11 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
  	.owner = THIS_MODULE,
  	.open = audio_open,
  	.release = audio_release,
-diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c	2010-05-15 13:21:16.139031435 -0400
-@@ -833,7 +833,7 @@ done:
+diff --git a/drivers/staging/dream/qdsp5/audio_amrnb.c b/drivers/staging/dream/qdsp5/audio_amrnb.c
+index 07b79d5..15bf062 100644
+--- a/drivers/staging/dream/qdsp5/audio_amrnb.c
++++ b/drivers/staging/dream/qdsp5/audio_amrnb.c
+@@ -834,7 +834,7 @@ done:
  	return rc;
  }
  
@@ -27606,10 +28559,11 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
  	.owner = THIS_MODULE,
  	.open = audamrnb_open,
  	.release = audamrnb_release,
-diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c	2010-05-15 13:21:16.151007392 -0400
-@@ -805,7 +805,7 @@ dma_fail:
+diff --git a/drivers/staging/dream/qdsp5/audio_evrc.c b/drivers/staging/dream/qdsp5/audio_evrc.c
+index ad989ee..ba5ebf5 100644
+--- a/drivers/staging/dream/qdsp5/audio_evrc.c
++++ b/drivers/staging/dream/qdsp5/audio_evrc.c
+@@ -806,7 +806,7 @@ dma_fail:
  	return rc;
  }
  
@@ -27618,10 +28572,11 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
  	.owner = THIS_MODULE,
  	.open = audevrc_open,
  	.release = audevrc_release,
-diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c	2010-05-15 13:21:16.155145249 -0400
-@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
+diff --git a/drivers/staging/dream/qdsp5/audio_in.c b/drivers/staging/dream/qdsp5/audio_in.c
+index 6ae48e7..02b8370 100644
+--- a/drivers/staging/dream/qdsp5/audio_in.c
++++ b/drivers/staging/dream/qdsp5/audio_in.c
+@@ -914,7 +914,7 @@ static int audpre_open(struct inode *inode, struct file *file)
  	return 0;
  }
  
@@ -27630,7 +28585,7 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1
  	.owner		= THIS_MODULE,
  	.open		= audio_in_open,
  	.release	= audio_in_release,
-@@ -922,7 +922,7 @@ static struct file_operations audio_fops
+@@ -923,7 +923,7 @@ static struct file_operations audio_fops = {
  	.unlocked_ioctl	= audio_in_ioctl,
  };
  
@@ -27639,9 +28594,10 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1
  	.owner          = THIS_MODULE,
  	.open           = audpre_open,
  	.unlocked_ioctl = audpre_ioctl,
-diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c	2010-05-15 13:21:16.171026730 -0400
+diff --git a/drivers/staging/dream/qdsp5/audio_mp3.c b/drivers/staging/dream/qdsp5/audio_mp3.c
+index 530e1f3..e8bfc32 100644
+--- a/drivers/staging/dream/qdsp5/audio_mp3.c
++++ b/drivers/staging/dream/qdsp5/audio_mp3.c
 @@ -941,7 +941,7 @@ done:
  	return rc;
  }
@@ -27651,10 +28607,11 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
  	.owner		= THIS_MODULE,
  	.open		= audio_open,
  	.release	= audio_release,
-diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c	2010-05-15 13:21:16.175016772 -0400
-@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
+diff --git a/drivers/staging/dream/qdsp5/audio_out.c b/drivers/staging/dream/qdsp5/audio_out.c
+index 76d7fa5..32bc20b 100644
+--- a/drivers/staging/dream/qdsp5/audio_out.c
++++ b/drivers/staging/dream/qdsp5/audio_out.c
+@@ -800,7 +800,7 @@ static int audpp_open(struct inode *inode, struct file *file)
  	return 0;
  }
  
@@ -27663,7 +28620,7 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
  	.owner		= THIS_MODULE,
  	.open		= audio_open,
  	.release	= audio_release,
-@@ -819,7 +819,7 @@ static struct file_operations audio_fops
+@@ -809,7 +809,7 @@ static struct file_operations audio_fops = {
  	.unlocked_ioctl	= audio_ioctl,
  };
  
@@ -27672,10 +28629,11 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
  	.owner		= THIS_MODULE,
  	.open		= audpp_open,
  	.unlocked_ioctl	= audpp_ioctl,
-diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c	2010-05-15 13:21:16.183014216 -0400
-@@ -816,7 +816,7 @@ err:
+diff --git a/drivers/staging/dream/qdsp5/audio_qcelp.c b/drivers/staging/dream/qdsp5/audio_qcelp.c
+index effa96f..5fb23cd 100644
+--- a/drivers/staging/dream/qdsp5/audio_qcelp.c
++++ b/drivers/staging/dream/qdsp5/audio_qcelp.c
+@@ -817,7 +817,7 @@ err:
  	return rc;
  }
  
@@ -27684,9 +28642,10 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
  	.owner = THIS_MODULE,
  	.open = audqcelp_open,
  	.release = audqcelp_release,
-diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c	2010-05-15 13:21:16.187015266 -0400
+diff --git a/drivers/staging/dream/qdsp5/snd.c b/drivers/staging/dream/qdsp5/snd.c
+index 037d7ff..5469ec3 100644
+--- a/drivers/staging/dream/qdsp5/snd.c
++++ b/drivers/staging/dream/qdsp5/snd.c
 @@ -242,7 +242,7 @@ err:
  	return rc;
  }
@@ -27696,76 +28655,24 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.13/dri
  	.owner		= THIS_MODULE,
  	.open		= snd_open,
  	.release	= snd_release,
-diff -urNp linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c
---- linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c	2010-05-15 13:21:16.190693177 -0400
-@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
- 	return 0;
- }
- 
--static struct file_operations qmi_fops = {
-+static const struct file_operations qmi_fops = {
- 	.owner = THIS_MODULE,
- 	.read = qmi_read,
- 	.write = qmi_write,
-diff -urNp linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c
---- linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c	2010-05-15 13:21:16.190693177 -0400
-@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 
- 	return rc;
- }
- 
--static struct file_operations rpcrouter_server_fops = {
-+static const struct file_operations rpcrouter_server_fops = {
- 	.owner	 = THIS_MODULE,
- 	.open	 = rpcrouter_open,
- 	.release = rpcrouter_release,
-@@ -224,7 +224,7 @@ static struct file_operations rpcrouter_
- 	.unlocked_ioctl	 = rpcrouter_ioctl,
- };
- 
--static struct file_operations rpcrouter_router_fops = {
-+static const struct file_operations rpcrouter_router_fops = {
- 	.owner	 = THIS_MODULE,
- 	.open	 = rpcrouter_open,
- 	.release = rpcrouter_release,
-diff -urNp linux-2.6.32.13/drivers/staging/dst/dcore.c linux-2.6.32.13/drivers/staging/dst/dcore.c
---- linux-2.6.32.13/drivers/staging/dst/dcore.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dst/dcore.c	2010-05-15 13:21:16.190693177 -0400
-@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
- 	return 0;
- }
- 
--static struct block_device_operations dst_blk_ops = {
-+static const struct block_device_operations dst_blk_ops = {
- 	.open		= dst_bdev_open,
- 	.release	= dst_bdev_release,
- 	.owner		= THIS_MODULE,
-@@ -588,7 +588,7 @@ static struct dst_node *dst_alloc_node(s
- 	n->size = ctl->size;
- 
- 	atomic_set(&n->refcnt, 1);
--	atomic_long_set(&n->gen, 0);
-+	atomic_long_set_unchecked(&n->gen, 0);
- 	snprintf(n->name, sizeof(n->name), "%s", ctl->name);
- 
- 	err = dst_node_sysfs_init(n);
-diff -urNp linux-2.6.32.13/drivers/staging/dst/trans.c linux-2.6.32.13/drivers/staging/dst/trans.c
---- linux-2.6.32.13/drivers/staging/dst/trans.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/dst/trans.c	2010-05-15 13:21:16.211066896 -0400
-@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, 
- 	t->error = 0;
- 	t->retries = 0;
- 	atomic_set(&t->refcnt, 1);
--	t->gen = atomic_long_inc_return(&n->gen);
-+	t->gen = atomic_long_inc_return_unchecked(&n->gen);
- 
- 	t->enc = bio_data_dir(bio);
- 	dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
-diff -urNp linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c	2010-05-15 13:21:16.231838911 -0400
-@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
+diff --git a/drivers/staging/dt3155/dt3155_drv.c b/drivers/staging/dt3155/dt3155_drv.c
+index 40ef97f..b0fcaa3 100644
+--- a/drivers/staging/dt3155/dt3155_drv.c
++++ b/drivers/staging/dt3155/dt3155_drv.c
+@@ -853,7 +853,7 @@ dt3155_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+  *  needed by init_module
+  *  register_chrdev
+  *****************************************************/
+-static struct file_operations dt3155_fops = {
++static const struct file_operations dt3155_fops = {
+ 	.read		= dt3155_read,
+ 	.unlocked_ioctl	= dt3155_unlocked_ioctl,
+ 	.mmap		= dt3155_mmap,
+diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c
+index 46b4b9f..f3ae0da 100644
+--- a/drivers/staging/go7007/go7007-v4l2.c
++++ b/drivers/staging/go7007/go7007-v4l2.c
+@@ -1673,7 +1673,7 @@ static int go7007_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
  	return 0;
  }
  
@@ -27774,22 +28681,37 @@ diff -urNp linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.13/
  	.open	= go7007_vm_open,
  	.close	= go7007_vm_close,
  	.fault	= go7007_vm_fault,
-diff -urNp linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c
---- linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c	2010-05-15 13:21:16.231838911 -0400
-@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
- /* The one and only one */
- static struct blkvsc_driver_context g_blkvsc_drv;
- 
--static struct block_device_operations block_ops = {
-+static const struct block_device_operations block_ops = {
- 	.owner = THIS_MODULE,
- 	.open = blkvsc_open,
- 	.release = blkvsc_release,
-diff -urNp linux-2.6.32.13/drivers/staging/panel/panel.c linux-2.6.32.13/drivers/staging/panel/panel.c
---- linux-2.6.32.13/drivers/staging/panel/panel.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/panel/panel.c	2010-05-15 13:21:16.231838911 -0400
-@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
+diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c
+index 6c77e64..609ea38 100644
+--- a/drivers/staging/hv/hv.c
++++ b/drivers/staging/hv/hv.c
+@@ -162,7 +162,7 @@ static u64 HvDoHypercall(u64 Control, void *Input, void *Output)
+ 	u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
+ 	u32 outputAddressHi = outputAddress >> 32;
+ 	u32 outputAddressLo = outputAddress & 0xFFFFFFFF;
+-	volatile void *hypercallPage = gHvContext.HypercallPage;
++	volatile void *hypercallPage = ktva_ktla(gHvContext.HypercallPage);
+ 
+ 	DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
+ 		   Control, Input, Output);
+diff --git a/drivers/staging/msm/msm_fb_bl.c b/drivers/staging/msm/msm_fb_bl.c
+index 033fc94..2a80775 100644
+--- a/drivers/staging/msm/msm_fb_bl.c
++++ b/drivers/staging/msm/msm_fb_bl.c
+@@ -42,7 +42,7 @@ static int msm_fb_bl_update_status(struct backlight_device *pbd)
+ 	return 0;
+ }
+ 
+-static struct backlight_ops msm_fb_bl_ops = {
++static const struct backlight_ops msm_fb_bl_ops = {
+ 	.get_brightness = msm_fb_bl_get_brightness,
+ 	.update_status = msm_fb_bl_update_status,
+ };
+diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
+index 6474c3a..b48bdd6 100644
+--- a/drivers/staging/panel/panel.c
++++ b/drivers/staging/panel/panel.c
+@@ -1304,7 +1304,7 @@ static int lcd_release(struct inode *inode, struct file *file)
  	return 0;
  }
  
@@ -27798,7 +28720,7 @@ diff -urNp linux-2.6.32.13/drivers/staging/panel/panel.c linux-2.6.32.13/drivers
  	.write   = lcd_write,
  	.open    = lcd_open,
  	.release = lcd_release,
-@@ -1565,7 +1565,7 @@ static int keypad_release(struct inode *
+@@ -1564,7 +1564,7 @@ static int keypad_release(struct inode *inode, struct file *file)
  	return 0;
  }
  
@@ -27807,10 +28729,11 @@ diff -urNp linux-2.6.32.13/drivers/staging/panel/panel.c linux-2.6.32.13/drivers
  	.read    = keypad_read,		/* read */
  	.open    = keypad_open,		/* open */
  	.release = keypad_release,	/* close */
-diff -urNp linux-2.6.32.13/drivers/staging/phison/phison.c linux-2.6.32.13/drivers/staging/phison/phison.c
---- linux-2.6.32.13/drivers/staging/phison/phison.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/phison/phison.c	2010-05-15 13:21:16.242656725 -0400
-@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
+diff --git a/drivers/staging/phison/phison.c b/drivers/staging/phison/phison.c
+index 6771520..18840c6 100644
+--- a/drivers/staging/phison/phison.c
++++ b/drivers/staging/phison/phison.c
+@@ -43,7 +43,7 @@ static struct scsi_host_template phison_sht = {
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -27819,22 +28742,11 @@ diff -urNp linux-2.6.32.13/drivers/staging/phison/phison.c linux-2.6.32.13/drive
  	.inherits		= &ata_bmdma_port_ops,
  	.prereset		= phison_pre_reset,
  };
-diff -urNp linux-2.6.32.13/drivers/staging/poch/poch.c linux-2.6.32.13/drivers/staging/poch/poch.c
---- linux-2.6.32.13/drivers/staging/poch/poch.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/poch/poch.c	2010-05-15 13:21:16.268445393 -0400
-@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
- 	return 0;
- }
- 
--static struct file_operations poch_fops = {
-+static const struct file_operations poch_fops = {
- 	.owner = THIS_MODULE,
- 	.open = poch_open,
- 	.release = poch_release,
-diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/inode.c linux-2.6.32.13/drivers/staging/pohmelfs/inode.c
---- linux-2.6.32.13/drivers/staging/pohmelfs/inode.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/pohmelfs/inode.c	2010-05-15 13:21:16.285190860 -0400
-@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
+diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
+index 643b413..2ba07d4 100644
+--- a/drivers/staging/pohmelfs/inode.c
++++ b/drivers/staging/pohmelfs/inode.c
+@@ -1846,7 +1846,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
  	mutex_init(&psb->mcache_lock);
  	psb->mcache_root = RB_ROOT;
  	psb->mcache_timeout = msecs_to_jiffies(5000);
@@ -27843,10 +28755,11 @@ diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/inode.c linux-2.6.32.13/driv
  
  	psb->trans_max_pages = 100;
  
-diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c	2010-05-15 13:21:16.291030028 -0400
-@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
+diff --git a/drivers/staging/pohmelfs/mcache.c b/drivers/staging/pohmelfs/mcache.c
+index e22665c..a2a9390 100644
+--- a/drivers/staging/pohmelfs/mcache.c
++++ b/drivers/staging/pohmelfs/mcache.c
+@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start
  	m->data = data;
  	m->start = start;
  	m->size = size;
@@ -27855,10 +28768,11 @@ diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c linux-2.6.32.13/dri
  
  	mutex_lock(&psb->mcache_lock);
  	err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h	2010-05-15 13:21:16.307023663 -0400
-@@ -570,7 +570,7 @@ struct pohmelfs_config;
+diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
+index 63391d2..976c496 100644
+--- a/drivers/staging/pohmelfs/netfs.h
++++ b/drivers/staging/pohmelfs/netfs.h
+@@ -571,7 +571,7 @@ struct pohmelfs_config;
  struct pohmelfs_sb {
  	struct rb_root		mcache_root;
  	struct mutex		mcache_lock;
@@ -27867,22 +28781,63 @@ diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h linux-2.6.32.13/driv
  	unsigned long		mcache_timeout;
  
  	unsigned int		idx;
-diff -urNp linux-2.6.32.13/drivers/staging/sep/sep_driver.c linux-2.6.32.13/drivers/staging/sep/sep_driver.c
---- linux-2.6.32.13/drivers/staging/sep/sep_driver.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/sep/sep_driver.c	2010-05-15 13:21:16.365819296 -0400
-@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver 
+diff --git a/drivers/staging/ramzswap/ramzswap_drv.c b/drivers/staging/ramzswap/ramzswap_drv.c
+index d14bf91..7de8382 100644
+--- a/drivers/staging/ramzswap/ramzswap_drv.c
++++ b/drivers/staging/ramzswap/ramzswap_drv.c
+@@ -693,7 +693,7 @@ void ramzswap_slot_free_notify(struct block_device *bdev, unsigned long index)
+ 	return;
+ }
+ 
+-static struct block_device_operations ramzswap_devops = {
++static const struct block_device_operations ramzswap_devops = {
+ 	.ioctl = ramzswap_ioctl,
+ 	.swap_slot_free_notify = ramzswap_slot_free_notify,
+ 	.owner = THIS_MODULE
+diff --git a/drivers/staging/rtl8192u/ieee80211/proc.c b/drivers/staging/rtl8192u/ieee80211/proc.c
+index 6eda928..7e60f0e 100644
+--- a/drivers/staging/rtl8192u/ieee80211/proc.c
++++ b/drivers/staging/rtl8192u/ieee80211/proc.c
+@@ -99,7 +99,7 @@ static int crypto_info_open(struct inode *inode, struct file *file)
+ 	return seq_open(file, &crypto_seq_ops);
+ }
+ 
+-static struct file_operations proc_crypto_ops = {
++static const struct file_operations proc_crypto_ops = {
+ 	.open		= crypto_info_open,
+ 	.read		= seq_read,
+ 	.llseek		= seq_lseek,
+diff --git a/drivers/staging/samsung-laptop/samsung-laptop.c b/drivers/staging/samsung-laptop/samsung-laptop.c
+index ac2bf11..701e8d5 100644
+--- a/drivers/staging/samsung-laptop/samsung-laptop.c
++++ b/drivers/staging/samsung-laptop/samsung-laptop.c
+@@ -269,7 +269,7 @@ static int update_status(struct backlight_device *bd)
+ 	return 0;
+ }
+ 
+-static struct backlight_ops backlight_ops = {
++static const struct backlight_ops backlight_ops = {
+ 	.get_brightness	= get_brightness,
+ 	.update_status	= update_status,
+ };
+diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
+index ecbde34..df37dd7 100644
+--- a/drivers/staging/sep/sep_driver.c
++++ b/drivers/staging/sep/sep_driver.c
+@@ -2637,7 +2637,7 @@ static struct pci_driver sep_pci_driver = {
  static dev_t sep_devno;
  
  /* the files operations structure of the driver */
 -static struct file_operations sep_file_operations = {
 +static const struct file_operations sep_file_operations = {
  	.owner = THIS_MODULE,
- 	.ioctl = sep_ioctl,
+ 	.unlocked_ioctl = sep_ioctl,
  	.poll = sep_poll,
-diff -urNp linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c	2010-05-15 13:21:16.387343522 -0400
-@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
+diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
+index bc16fc07..b3827aa 100644
+--- a/drivers/staging/vme/devices/vme_user.c
++++ b/drivers/staging/vme/devices/vme_user.c
+@@ -136,7 +136,7 @@ static long vme_user_unlocked_ioctl(struct file *, unsigned int, unsigned long);
  static int __init vme_user_probe(struct device *, int, int);
  static int __exit vme_user_remove(struct device *, int, int);
  
@@ -27891,31 +28846,24 @@ diff -urNp linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c linux-2.6.32.1
          .open = vme_user_open,
          .release = vme_user_release,
          .read = vme_user_read,
-diff -urNp linux-2.6.32.13/drivers/uio/uio.c linux-2.6.32.13/drivers/uio/uio.c
---- linux-2.6.32.13/drivers/uio/uio.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/uio/uio.c	2010-05-15 13:21:16.387343522 -0400
-@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
- 	return entry->show(mem, buf);
- }
- 
--static struct sysfs_ops map_sysfs_ops = {
-+static const struct sysfs_ops map_sysfs_ops = {
- 	.show = map_type_show,
- };
- 
-@@ -217,7 +217,7 @@ static ssize_t portio_type_show(struct k
- 	return entry->show(port, buf);
- }
- 
--static struct sysfs_ops portio_sysfs_ops = {
-+static const struct sysfs_ops portio_sysfs_ops = {
- 	.show = portio_type_show,
- };
+diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
+index b24025d..39d4a85 100644
+--- a/drivers/usb/atm/cxacru.c
++++ b/drivers/usb/atm/cxacru.c
+@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
+ 		ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
+ 		if (ret < 2)
+ 			return -EINVAL;
+-		if (index < 0 || index > 0x7f)
++		if (index > 0x7f)
+ 			return -EINVAL;
+ 		pos += tmp;
  
-diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/atm/usbatm.c
---- linux-2.6.32.13/drivers/usb/atm/usbatm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/atm/usbatm.c	2010-05-15 13:21:16.394585811 -0400
-@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
+diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
+index 9b53e8d..75b6c9a 100644
+--- a/drivers/usb/atm/usbatm.c
++++ b/drivers/usb/atm/usbatm.c
+@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
  		if (printk_ratelimit())
  			atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
  				__func__, vpi, vci);
@@ -27924,7 +28872,7 @@ diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/
  		return;
  	}
  
-@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(stru
+@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
  		if (length > ATM_MAX_AAL5_PDU) {
  			atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
  				  __func__, length, vcc);
@@ -27933,7 +28881,7 @@ diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/
  			goto out;
  		}
  
-@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(stru
+@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
  		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);
@@ -27950,7 +28898,7 @@ diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/
  			goto out;
  		}
  
-@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(stru
+@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
  			if (printk_ratelimit())
  				atm_err(instance, "%s: no memory for skb (length: %u)!\n",
  					__func__, length);
@@ -27959,7 +28907,7 @@ diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/
  			goto out;
  		}
  
-@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(stru
+@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
  
  		vcc->push(vcc, skb);
  
@@ -27968,7 +28916,7 @@ diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/
  	out:
  		skb_trim(sarb, 0);
  	}
-@@ -616,7 +616,7 @@ static void usbatm_tx_process(unsigned l
+@@ -616,7 +616,7 @@ static void usbatm_tx_process(unsigned long data)
  			struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
  
  			usbatm_pop(vcc, skb);
@@ -27977,7 +28925,7 @@ diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/
  
  			skb = skb_dequeue(&instance->sndqueue);
  		}
-@@ -775,11 +775,11 @@ static int usbatm_atm_proc_read(struct a
+@@ -775,11 +775,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
  	if (!left--)
  		return sprintf(page,
  			       "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
@@ -27994,22 +28942,37 @@ diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/
  
  	if (!left--) {
  		if (instance->disconnected)
-diff -urNp linux-2.6.32.13/drivers/usb/class/cdc-acm.c linux-2.6.32.13/drivers/usb/class/cdc-acm.c
---- linux-2.6.32.13/drivers/usb/class/cdc-acm.c	2010-04-29 17:49:38.389083173 -0400
-+++ linux-2.6.32.13/drivers/usb/class/cdc-acm.c	2010-05-15 13:21:16.402576854 -0400
-@@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] = 
+diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
+index a1aacb0..a053738 100644
+--- a/drivers/usb/class/cdc-acm.c
++++ b/drivers/usb/class/cdc-acm.c
+@@ -1640,7 +1640,7 @@ static const struct usb_device_id acm_ids[] = {
+ 	{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
  		USB_CDC_ACM_PROTO_AT_CDMA) },
  
- 	/* NOTE:  COMM/ACM/0xff is likely MSFT RNDIS ... NOT a modem!! */
 -	{ }
 +	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
  };
  
  MODULE_DEVICE_TABLE(usb, acm_ids);
-diff -urNp linux-2.6.32.13/drivers/usb/class/usblp.c linux-2.6.32.13/drivers/usb/class/usblp.c
---- linux-2.6.32.13/drivers/usb/class/usblp.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/class/usblp.c	2010-05-15 13:21:16.423521533 -0400
-@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
+diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
+index 094c76b..42d7b46 100644
+--- a/drivers/usb/class/cdc-wdm.c
++++ b/drivers/usb/class/cdc-wdm.c
+@@ -342,7 +342,7 @@ static ssize_t wdm_write
+ 		goto outnp;
+ 	}
+ 
+-	if (!file->f_flags && O_NONBLOCK)
++	if (!(file->f_flags & O_NONBLOCK))
+ 		r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
+ 								&desc->flags));
+ 	else
+diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
+index 2250095..0bb116a 100644
+--- a/drivers/usb/class/usblp.c
++++ b/drivers/usb/class/usblp.c
+@@ -226,7 +226,7 @@ static const struct quirk_printer_struct quirk_printers[] = {
  	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
  	{ 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
  	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt Printer M129C */
@@ -28018,7 +28981,7 @@ diff -urNp linux-2.6.32.13/drivers/usb/class/usblp.c linux-2.6.32.13/drivers/usb
  };
  
  static int usblp_wwait(struct usblp *usblp, int nonblock);
-@@ -1412,7 +1412,7 @@ static struct usb_device_id usblp_ids []
+@@ -1398,7 +1398,7 @@ static const struct usb_device_id usblp_ids[] = {
  	{ USB_INTERFACE_INFO(7, 1, 2) },
  	{ USB_INTERFACE_INFO(7, 1, 3) },
  	{ USB_DEVICE(0x04b8, 0x0202) },	/* Seiko Epson Receipt Printer M129C */
@@ -28027,10 +28990,11 @@ diff -urNp linux-2.6.32.13/drivers/usb/class/usblp.c linux-2.6.32.13/drivers/usb
  };
  
  MODULE_DEVICE_TABLE (usb, usblp_ids);
-diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.c linux-2.6.32.13/drivers/usb/core/hcd.c
---- linux-2.6.32.13/drivers/usb/core/hcd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/core/hcd.c	2010-05-15 13:21:16.445526992 -0400
-@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
+diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
+index 12742f1..670b6be 100644
+--- a/drivers/usb/core/hcd.c
++++ b/drivers/usb/core/hcd.c
+@@ -2381,7 +2381,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutdown);
  
  #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
  
@@ -28039,7 +29003,7 @@ diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.c linux-2.6.32.13/drivers/usb/co
  
  /*
   * The registration is unlocked.
-@@ -2226,7 +2226,7 @@ struct usb_mon_operations *mon_ops;
+@@ -2391,7 +2391,7 @@ struct usb_mon_operations *mon_ops;
   * symbols from usbcore, usbcore gets referenced and cannot be unloaded first.
   */
   
@@ -28048,40 +29012,11 @@ diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.c linux-2.6.32.13/drivers/usb/co
  {
  
  	if (mon_ops)
-diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.h linux-2.6.32.13/drivers/usb/core/hcd.h
---- linux-2.6.32.13/drivers/usb/core/hcd.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/core/hcd.h	2010-05-15 13:21:16.447026425 -0400
-@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
- #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
- 
- struct usb_mon_operations {
--	void (*urb_submit)(struct usb_bus *bus, struct urb *urb);
--	void (*urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
--	void (*urb_complete)(struct usb_bus *bus, struct urb *urb, int status);
-+	void (* const urb_submit)(struct usb_bus *bus, struct urb *urb);
-+	void (* const urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
-+	void (* const urb_complete)(struct usb_bus *bus, struct urb *urb, int status);
- 	/* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
- };
- 
--extern struct usb_mon_operations *mon_ops;
-+extern const struct usb_mon_operations *mon_ops;
- 
- static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
- {
-@@ -514,7 +514,7 @@ static inline void usbmon_urb_complete(s
- 		(*mon_ops->urb_complete)(bus, urb, status);
- }
- 
--int usb_mon_register(struct usb_mon_operations *ops);
-+int usb_mon_register(const struct usb_mon_operations *ops);
- void usb_mon_deregister(void);
- 
- #else
-diff -urNp linux-2.6.32.13/drivers/usb/core/hub.c linux-2.6.32.13/drivers/usb/core/hub.c
---- linux-2.6.32.13/drivers/usb/core/hub.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/core/hub.c	2010-05-15 13:21:16.479087397 -0400
-@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table
+diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
+index 53467b5..efa96ae 100644
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -3456,7 +3456,7 @@ static const struct usb_device_id hub_id_table[] = {
        .bDeviceClass = USB_CLASS_HUB},
      { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
        .bInterfaceClass = USB_CLASS_HUB},
@@ -28090,10 +29025,11 @@ diff -urNp linux-2.6.32.13/drivers/usb/core/hub.c linux-2.6.32.13/drivers/usb/co
  };
  
  MODULE_DEVICE_TABLE (usb, hub_id_table);
-diff -urNp linux-2.6.32.13/drivers/usb/core/message.c linux-2.6.32.13/drivers/usb/core/message.c
---- linux-2.6.32.13/drivers/usb/core/message.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/core/message.c	2010-05-15 13:21:16.479087397 -0400
-@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
+diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
+index d6e3e41..9f0787f 100644
+--- a/drivers/usb/core/message.c
++++ b/drivers/usb/core/message.c
+@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device *udev, int index)
  	buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
  	if (buf) {
  		len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE);
@@ -28104,10 +29040,23 @@ diff -urNp linux-2.6.32.13/drivers/usb/core/message.c linux-2.6.32.13/drivers/us
  			if (!smallbuf)
  				return buf;
  			memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.32.13/drivers/usb/host/ehci-pci.c linux-2.6.32.13/drivers/usb/host/ehci-pci.c
---- linux-2.6.32.13/drivers/usb/host/ehci-pci.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/host/ehci-pci.c	2010-05-15 13:21:16.495431959 -0400
-@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
+diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
+index 94ecdbc..f91e996 100644
+--- a/drivers/usb/early/ehci-dbgp.c
++++ b/drivers/usb/early/ehci-dbgp.c
+@@ -1026,6 +1026,7 @@ static void kgdbdbgp_write_char(u8 chr)
+ 	early_dbgp_write(NULL, &chr, 1);
+ }
+ 
++/* cannot be const, see kgdbdbgp_parse_config() */
+ static struct kgdb_io kgdbdbgp_io_ops = {
+ 	.name = "kgdbdbgp",
+ 	.read_char = kgdbdbgp_read_char,
+diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
+index 19f5070..4d9cb08 100644
+--- a/drivers/usb/host/ehci-pci.c
++++ b/drivers/usb/host/ehci-pci.c
+@@ -419,7 +419,7 @@ static const struct pci_device_id pci_ids [] = { {
  	PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
  	.driver_data =	(unsigned long) &ehci_pci_hc_driver,
  	},
@@ -28116,10 +29065,11 @@ diff -urNp linux-2.6.32.13/drivers/usb/host/ehci-pci.c linux-2.6.32.13/drivers/u
  };
  MODULE_DEVICE_TABLE(pci, pci_ids);
  
-diff -urNp linux-2.6.32.13/drivers/usb/host/uhci-hcd.c linux-2.6.32.13/drivers/usb/host/uhci-hcd.c
---- linux-2.6.32.13/drivers/usb/host/uhci-hcd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/host/uhci-hcd.c	2010-05-15 13:21:16.495431959 -0400
-@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
+diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
+index 6637e52..aabaaef 100644
+--- a/drivers/usb/host/uhci-hcd.c
++++ b/drivers/usb/host/uhci-hcd.c
+@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_pci_ids[] = { {
  	/* handle any USB UHCI controller */
  	PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
  	.driver_data =	(unsigned long) &uhci_driver,
@@ -28128,22 +29078,11 @@ diff -urNp linux-2.6.32.13/drivers/usb/host/uhci-hcd.c linux-2.6.32.13/drivers/u
  };
  
  MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
-diff -urNp linux-2.6.32.13/drivers/usb/misc/appledisplay.c linux-2.6.32.13/drivers/usb/misc/appledisplay.c
---- linux-2.6.32.13/drivers/usb/misc/appledisplay.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/misc/appledisplay.c	2010-05-15 13:21:16.495431959 -0400
-@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
- 		return pdata->msgdata[1];
- }
- 
--static struct backlight_ops appledisplay_bl_data = {
-+static const struct backlight_ops appledisplay_bl_data = {
- 	.get_brightness	= appledisplay_bl_get_brightness,
- 	.update_status	= appledisplay_bl_update_status,
- };
-diff -urNp linux-2.6.32.13/drivers/usb/mon/mon_main.c linux-2.6.32.13/drivers/usb/mon/mon_main.c
---- linux-2.6.32.13/drivers/usb/mon/mon_main.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/mon/mon_main.c	2010-05-15 13:21:16.504078790 -0400
-@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
+diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
+index 812dc28..4a8ae42 100644
+--- a/drivers/usb/mon/mon_main.c
++++ b/drivers/usb/mon/mon_main.c
+@@ -240,7 +240,7 @@ static struct notifier_block mon_nb = {
  /*
   * Ops
   */
@@ -28152,10 +29091,11 @@ diff -urNp linux-2.6.32.13/drivers/usb/mon/mon_main.c linux-2.6.32.13/drivers/us
  	.urb_submit =	mon_submit,
  	.urb_submit_error = mon_submit_error,
  	.urb_complete =	mon_complete,
-diff -urNp linux-2.6.32.13/drivers/usb/storage/debug.h linux-2.6.32.13/drivers/usb/storage/debug.h
---- linux-2.6.32.13/drivers/usb/storage/debug.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/storage/debug.h	2010-05-15 13:21:16.521852812 -0400
-@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char 
+diff --git a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h
+index dbb985d..1b4b62e 100644
+--- a/drivers/usb/storage/debug.h
++++ b/drivers/usb/storage/debug.h
+@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char key,
  #define US_DEBUGPX(x...) printk( x )
  #define US_DEBUG(x) x 
  #else
@@ -28168,10 +29108,11 @@ diff -urNp linux-2.6.32.13/drivers/usb/storage/debug.h linux-2.6.32.13/drivers/u
  #endif
  
  #endif
-diff -urNp linux-2.6.32.13/drivers/usb/storage/usb.c linux-2.6.32.13/drivers/usb/storage/usb.c
---- linux-2.6.32.13/drivers/usb/storage/usb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/storage/usb.c	2010-05-15 13:21:16.547749964 -0400
-@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
+diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
+index a7d0bf9..a6d3cfa 100644
+--- a/drivers/usb/storage/usb.c
++++ b/drivers/usb/storage/usb.c
+@@ -122,7 +122,7 @@ MODULE_PARM_DESC(quirks, "supplemental list of device IDs and their quirks");
  
  static struct us_unusual_dev us_unusual_dev_list[] = {
  #	include "unusual_devs.h" 
@@ -28180,9 +29121,10 @@ diff -urNp linux-2.6.32.13/drivers/usb/storage/usb.c linux-2.6.32.13/drivers/usb
  };
  
  #undef UNUSUAL_DEV
-diff -urNp linux-2.6.32.13/drivers/usb/storage/usual-tables.c linux-2.6.32.13/drivers/usb/storage/usual-tables.c
---- linux-2.6.32.13/drivers/usb/storage/usual-tables.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/usb/storage/usual-tables.c	2010-05-15 13:21:16.559032137 -0400
+diff --git a/drivers/usb/storage/usual-tables.c b/drivers/usb/storage/usual-tables.c
+index 468bde7..ca4f88d 100644
+--- a/drivers/usb/storage/usual-tables.c
++++ b/drivers/usb/storage/usual-tables.c
 @@ -48,7 +48,7 @@
  
  struct usb_device_id usb_storage_usb_ids[] = {
@@ -28192,10 +29134,11 @@ diff -urNp linux-2.6.32.13/drivers/usb/storage/usual-tables.c linux-2.6.32.13/dr
  };
  EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
  
-diff -urNp linux-2.6.32.13/drivers/uwb/wlp/messages.c linux-2.6.32.13/drivers/uwb/wlp/messages.c
---- linux-2.6.32.13/drivers/uwb/wlp/messages.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/uwb/wlp/messages.c	2010-05-15 13:21:16.584920944 -0400
-@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
+diff --git a/drivers/uwb/wlp/messages.c b/drivers/uwb/wlp/messages.c
+index 3a8e033..996a0e4 100644
+--- a/drivers/uwb/wlp/messages.c
++++ b/drivers/uwb/wlp/messages.c
+@@ -920,7 +920,7 @@ int wlp_parse_f0(struct wlp *wlp, struct sk_buff *skb)
  	size_t len = skb->len;
  	size_t used;
  	ssize_t result;
@@ -28204,23 +29147,24 @@ diff -urNp linux-2.6.32.13/drivers/uwb/wlp/messages.c linux-2.6.32.13/drivers/uw
  	enum wlp_assc_error assc_err;
  	char enonce_buf[WLP_WSS_NONCE_STRSIZE];
  	char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
-diff -urNp linux-2.6.32.13/drivers/uwb/wlp/sysfs.c linux-2.6.32.13/drivers/uwb/wlp/sysfs.c
---- linux-2.6.32.13/drivers/uwb/wlp/sysfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/uwb/wlp/sysfs.c	2010-05-15 13:21:16.587027337 -0400
-@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
- 	return ret;
- }
- 
--static
--struct sysfs_ops wss_sysfs_ops = {
-+static const struct sysfs_ops wss_sysfs_ops = {
- 	.show	= wlp_wss_attr_show,
- 	.store	= wlp_wss_attr_store,
- };
-diff -urNp linux-2.6.32.13/drivers/video/atmel_lcdfb.c linux-2.6.32.13/drivers/video/atmel_lcdfb.c
---- linux-2.6.32.13/drivers/video/atmel_lcdfb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/atmel_lcdfb.c	2010-05-15 13:21:16.587027337 -0400
-@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
+diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
+index 0b99783..9ee3be1 100644
+--- a/drivers/vhost/vhost.c
++++ b/drivers/vhost/vhost.c
+@@ -357,7 +357,7 @@ static int init_used(struct vhost_virtqueue *vq,
+ 	return get_user(vq->last_used_idx, &used->idx);
+ }
+ 
+-static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
++static long vhost_set_vring(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
+ {
+ 	struct file *eventfp, *filep = NULL,
+ 		    *pollstart = NULL, *pollstop = NULL;
+diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
+index 8dce251..bac16345 100644
+--- a/drivers/video/atmel_lcdfb.c
++++ b/drivers/video/atmel_lcdfb.c
+@@ -111,7 +111,7 @@ static int atmel_bl_get_brightness(struct backlight_device *bl)
  	return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
  }
  
@@ -28229,10 +29173,11 @@ diff -urNp linux-2.6.32.13/drivers/video/atmel_lcdfb.c linux-2.6.32.13/drivers/v
  	.update_status = atmel_bl_update_status,
  	.get_brightness = atmel_bl_get_brightness,
  };
-diff -urNp linux-2.6.32.13/drivers/video/aty/aty128fb.c linux-2.6.32.13/drivers/video/aty/aty128fb.c
---- linux-2.6.32.13/drivers/video/aty/aty128fb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/aty/aty128fb.c	2010-05-15 13:21:16.599120806 -0400
-@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
+diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
+index 34a0851..dd9de2e 100644
+--- a/drivers/video/aty/aty128fb.c
++++ b/drivers/video/aty/aty128fb.c
+@@ -1786,7 +1786,7 @@ static int aty128_bl_get_brightness(struct backlight_device *bd)
  	return bd->props.brightness;
  }
  
@@ -28241,10 +29186,11 @@ diff -urNp linux-2.6.32.13/drivers/video/aty/aty128fb.c linux-2.6.32.13/drivers/
  	.get_brightness	= aty128_bl_get_brightness,
  	.update_status	= aty128_bl_update_status,
  };
-diff -urNp linux-2.6.32.13/drivers/video/aty/atyfb_base.c linux-2.6.32.13/drivers/video/aty/atyfb_base.c
---- linux-2.6.32.13/drivers/video/aty/atyfb_base.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/aty/atyfb_base.c	2010-05-15 13:21:16.611030004 -0400
-@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 
+diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
+index f8d69ad..36dd05c 100644
+--- a/drivers/video/aty/atyfb_base.c
++++ b/drivers/video/aty/atyfb_base.c
+@@ -2221,7 +2221,7 @@ static int aty_bl_get_brightness(struct backlight_device *bd)
  	return bd->props.brightness;
  }
  
@@ -28253,10 +29199,11 @@ diff -urNp linux-2.6.32.13/drivers/video/aty/atyfb_base.c linux-2.6.32.13/driver
  	.get_brightness = aty_bl_get_brightness,
  	.update_status	= aty_bl_update_status,
  };
-diff -urNp linux-2.6.32.13/drivers/video/aty/radeon_backlight.c linux-2.6.32.13/drivers/video/aty/radeon_backlight.c
---- linux-2.6.32.13/drivers/video/aty/radeon_backlight.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/aty/radeon_backlight.c	2010-05-15 13:21:16.611030004 -0400
-@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
+diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
+index 256966e..9b811dd 100644
+--- a/drivers/video/aty/radeon_backlight.c
++++ b/drivers/video/aty/radeon_backlight.c
+@@ -128,7 +128,7 @@ static int radeon_bl_get_brightness(struct backlight_device *bd)
  	return bd->props.brightness;
  }
  
@@ -28265,250 +29212,37 @@ diff -urNp linux-2.6.32.13/drivers/video/aty/radeon_backlight.c linux-2.6.32.13/
  	.get_brightness = radeon_bl_get_brightness,
  	.update_status	= radeon_bl_update_status,
  };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c
---- linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c	2010-05-15 13:21:16.611030004 -0400
-@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
- 	return error ? data->current_brightness : reg_val;
- }
- 
--static struct backlight_ops adp5520_bl_ops = {
-+static const struct backlight_ops adp5520_bl_ops = {
- 	.update_status	= adp5520_bl_update_status,
- 	.get_brightness	= adp5520_bl_get_brightness,
- };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/adx_bl.c linux-2.6.32.13/drivers/video/backlight/adx_bl.c
---- linux-2.6.32.13/drivers/video/backlight/adx_bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/adx_bl.c	2010-05-15 13:21:16.611030004 -0400
-@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
- 	return 1;
- }
- 
--static struct backlight_ops adx_backlight_ops = {
-+static const struct backlight_ops adx_backlight_ops = {
- 	.options = 0,
- 	.update_status = adx_backlight_update_status,
- 	.get_brightness = adx_backlight_get_brightness,
-diff -urNp linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c
---- linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c	2010-05-15 13:21:16.611030004 -0400
-@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct 
- 	return pwm_channel_enable(&pwmbl->pwmc);
- }
- 
--static struct backlight_ops atmel_pwm_bl_ops = {
-+static const struct backlight_ops atmel_pwm_bl_ops = {
- 	.get_brightness = atmel_pwm_bl_get_intensity,
- 	.update_status  = atmel_pwm_bl_set_intensity,
- };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/backlight.c linux-2.6.32.13/drivers/video/backlight/backlight.c
---- linux-2.6.32.13/drivers/video/backlight/backlight.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/backlight.c	2010-05-15 13:21:16.611030004 -0400
-@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
-  * ERR_PTR() or a pointer to the newly allocated device.
-  */
- struct backlight_device *backlight_device_register(const char *name,
--		struct device *parent, void *devdata, struct backlight_ops *ops)
-+		struct device *parent, void *devdata, const struct backlight_ops *ops)
- {
- 	struct backlight_device *new_bd;
- 	int rc;
-diff -urNp linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c
---- linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c	2010-05-15 13:21:16.611030004 -0400
-@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
- }
- EXPORT_SYMBOL(corgi_lcd_limit_intensity);
- 
--static struct backlight_ops corgi_bl_ops = {
-+static const struct backlight_ops corgi_bl_ops = {
- 	.get_brightness	= corgi_bl_get_intensity,
- 	.update_status  = corgi_bl_update_status,
- };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c
---- linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c	2010-05-15 13:21:16.611030004 -0400
-@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
- 	return intensity;
- }
- 
--static struct backlight_ops cr_backlight_ops = {
-+static const struct backlight_ops cr_backlight_ops = {
- 	.get_brightness = cr_backlight_get_intensity,
- 	.update_status = cr_backlight_set_intensity,
- };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/da903x_bl.c linux-2.6.32.13/drivers/video/backlight/da903x_bl.c
---- linux-2.6.32.13/drivers/video/backlight/da903x_bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/da903x_bl.c	2010-05-15 13:21:16.611030004 -0400
-@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
- 	return data->current_brightness;
- }
- 
--static struct backlight_ops da903x_backlight_ops = {
-+static const struct backlight_ops da903x_backlight_ops = {
- 	.update_status	= da903x_backlight_update_status,
- 	.get_brightness	= da903x_backlight_get_brightness,
- };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/generic_bl.c linux-2.6.32.13/drivers/video/backlight/generic_bl.c
---- linux-2.6.32.13/drivers/video/backlight/generic_bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/generic_bl.c	2010-05-15 13:21:16.611030004 -0400
-@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
- }
- EXPORT_SYMBOL(corgibl_limit_intensity);
- 
--static struct backlight_ops genericbl_ops = {
-+static const struct backlight_ops genericbl_ops = {
- 	.options = BL_CORE_SUSPENDRESUME,
- 	.get_brightness = genericbl_get_intensity,
- 	.update_status  = genericbl_send_intensity,
-diff -urNp linux-2.6.32.13/drivers/video/backlight/hp680_bl.c linux-2.6.32.13/drivers/video/backlight/hp680_bl.c
---- linux-2.6.32.13/drivers/video/backlight/hp680_bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/hp680_bl.c	2010-05-15 13:21:16.611030004 -0400
-@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct 
- 	return current_intensity;
- }
- 
--static struct backlight_ops hp680bl_ops = {
-+static const struct backlight_ops hp680bl_ops = {
- 	.get_brightness = hp680bl_get_intensity,
- 	.update_status  = hp680bl_set_intensity,
- };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c
---- linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c	2010-05-15 13:21:16.611030004 -0400
-@@ -93,7 +93,7 @@ out:
+diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
+index 38ffc3f..c789c46 100644
+--- a/drivers/video/backlight/88pm860x_bl.c
++++ b/drivers/video/backlight/88pm860x_bl.c
+@@ -155,7 +155,7 @@ out:
+ 	return -EINVAL;
+ }
+ 
+-static struct backlight_ops pm860x_backlight_ops = {
++static const struct backlight_ops pm860x_backlight_ops = {
+ 	.options	= BL_CORE_SUSPENDRESUME,
+ 	.update_status	= pm860x_backlight_update_status,
+ 	.get_brightness	= pm860x_backlight_get_brightness,
+diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
+index b2b2c7b..209acc1 100644
+--- a/drivers/video/backlight/max8925_bl.c
++++ b/drivers/video/backlight/max8925_bl.c
+@@ -92,7 +92,7 @@ static int max8925_backlight_get_brightness(struct backlight_device *bl)
  	return ret;
  }
  
--static struct backlight_ops jornada_bl_ops = {
-+static const struct backlight_ops jornada_bl_ops = {
- 	.get_brightness = jornada_bl_get_brightness,
- 	.update_status = jornada_bl_update_status,
- 	.options = BL_CORE_SUSPENDRESUME,
-diff -urNp linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c
---- linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c	2010-05-15 13:21:16.611030004 -0400
-@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
- 	return kb3886bl_intensity;
- }
- 
--static struct backlight_ops kb3886bl_ops = {
-+static const struct backlight_ops kb3886bl_ops = {
- 	.get_brightness = kb3886bl_get_intensity,
- 	.update_status  = kb3886bl_send_intensity,
- };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/locomolcd.c linux-2.6.32.13/drivers/video/backlight/locomolcd.c
---- linux-2.6.32.13/drivers/video/backlight/locomolcd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/locomolcd.c	2010-05-15 13:21:16.611030004 -0400
-@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
- 	return current_intensity;
- }
- 
--static struct backlight_ops locomobl_data = {
-+static const struct backlight_ops locomobl_data = {
- 	.get_brightness = locomolcd_get_intensity,
- 	.update_status  = locomolcd_set_intensity,
- };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c
---- linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c	2010-04-29 17:49:38.397382140 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c	2010-05-15 13:21:16.611030004 -0400
-@@ -33,7 +33,7 @@ struct dmi_match_data {
- 	unsigned long iostart;
- 	unsigned long iolen;
- 	/* Backlight operations structure. */
--	struct backlight_ops backlight_ops;
-+	const struct backlight_ops backlight_ops;
- };
- 
- /* Module parameters. */
-diff -urNp linux-2.6.32.13/drivers/video/backlight/omap1_bl.c linux-2.6.32.13/drivers/video/backlight/omap1_bl.c
---- linux-2.6.32.13/drivers/video/backlight/omap1_bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/omap1_bl.c	2010-05-15 13:21:16.647199475 -0400
-@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
- 	return bl->current_intensity;
- }
- 
--static struct backlight_ops omapbl_ops = {
-+static const struct backlight_ops omapbl_ops = {
- 	.get_brightness = omapbl_get_intensity,
- 	.update_status  = omapbl_update_status,
- };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/progear_bl.c linux-2.6.32.13/drivers/video/backlight/progear_bl.c
---- linux-2.6.32.13/drivers/video/backlight/progear_bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/progear_bl.c	2010-05-15 13:21:16.647199475 -0400
-@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
- 	return intensity - HW_LEVEL_MIN;
- }
- 
--static struct backlight_ops progearbl_ops = {
-+static const struct backlight_ops progearbl_ops = {
- 	.get_brightness = progearbl_get_intensity,
- 	.update_status = progearbl_set_intensity,
- };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/pwm_bl.c linux-2.6.32.13/drivers/video/backlight/pwm_bl.c
---- linux-2.6.32.13/drivers/video/backlight/pwm_bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/pwm_bl.c	2010-05-15 13:21:16.647199475 -0400
-@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
- 	return bl->props.brightness;
- }
- 
--static struct backlight_ops pwm_backlight_ops = {
-+static const struct backlight_ops pwm_backlight_ops = {
- 	.update_status	= pwm_backlight_update_status,
- 	.get_brightness	= pwm_backlight_get_brightness,
- };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/tosa_bl.c linux-2.6.32.13/drivers/video/backlight/tosa_bl.c
---- linux-2.6.32.13/drivers/video/backlight/tosa_bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/tosa_bl.c	2010-05-15 13:21:16.647199475 -0400
-@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
- 	return props->brightness;
- }
- 
--static struct backlight_ops bl_ops = {
-+static const struct backlight_ops bl_ops = {
- 	.get_brightness		= tosa_bl_get_brightness,
- 	.update_status		= tosa_bl_update_status,
- };
-diff -urNp linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c
---- linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c	2010-05-15 13:21:16.647199475 -0400
-@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
- 	return data->current_brightness;
- }
- 
--static struct backlight_ops wm831x_backlight_ops = {
-+static const struct backlight_ops wm831x_backlight_ops = {
- 	.options = BL_CORE_SUSPENDRESUME,
- 	.update_status	= wm831x_backlight_update_status,
- 	.get_brightness	= wm831x_backlight_get_brightness,
-diff -urNp linux-2.6.32.13/drivers/video/bf54x-lq043fb.c linux-2.6.32.13/drivers/video/bf54x-lq043fb.c
---- linux-2.6.32.13/drivers/video/bf54x-lq043fb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/bf54x-lq043fb.c	2010-05-15 13:21:16.647199475 -0400
-@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
- 	return 0;
- }
- 
--static struct backlight_ops bfin_lq043fb_bl_ops = {
-+static const struct backlight_ops bfin_lq043fb_bl_ops = {
- 	.get_brightness = bl_get_brightness,
- };
- 
-diff -urNp linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c
---- linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c	2010-05-15 13:21:16.647199475 -0400
-@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
- 	return 0;
- }
- 
--static struct backlight_ops bfin_lq043fb_bl_ops = {
-+static const struct backlight_ops bfin_lq043fb_bl_ops = {
- 	.get_brightness = bl_get_brightness,
- };
- 
-diff -urNp linux-2.6.32.13/drivers/video/fbcmap.c linux-2.6.32.13/drivers/video/fbcmap.c
---- linux-2.6.32.13/drivers/video/fbcmap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/fbcmap.c	2010-05-15 13:21:16.647199475 -0400
-@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
+-static struct backlight_ops max8925_backlight_ops = {
++static const struct backlight_ops max8925_backlight_ops = {
+ 	.options	= BL_CORE_SUSPENDRESUME,
+ 	.update_status	= max8925_backlight_update_status,
+ 	.get_brightness	= max8925_backlight_get_brightness,
+diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
+index f53b9f1..958bf4e 100644
+--- a/drivers/video/fbcmap.c
++++ b/drivers/video/fbcmap.c
+@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
  		rc = -ENODEV;
  		goto out;
  	}
@@ -28518,10 +29252,11 @@ diff -urNp linux-2.6.32.13/drivers/video/fbcmap.c linux-2.6.32.13/drivers/video/
  		rc = -EINVAL;
  		goto out1;
  	}
-diff -urNp linux-2.6.32.13/drivers/video/fbmem.c linux-2.6.32.13/drivers/video/fbmem.c
---- linux-2.6.32.13/drivers/video/fbmem.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/fbmem.c	2010-05-15 13:21:16.659032956 -0400
-@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
+diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
+index 731fce6..e69cfbe 100644
+--- a/drivers/video/fbmem.c
++++ b/drivers/video/fbmem.c
+@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
  			image->dx += image->width + 8;
  		}
  	} else if (rotate == FB_ROTATE_UD) {
@@ -28530,7 +29265,7 @@ diff -urNp linux-2.6.32.13/drivers/video/fbmem.c linux-2.6.32.13/drivers/video/f
  			info->fbops->fb_imageblit(info, image);
  			image->dx -= image->width + 8;
  		}
-@@ -415,7 +415,7 @@ static void fb_do_show_logo(struct fb_in
+@@ -415,7 +415,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
  			image->dy += image->height + 8;
  		}
  	} else if (rotate == FB_ROTATE_CCW) {
@@ -28539,7 +29274,7 @@ diff -urNp linux-2.6.32.13/drivers/video/fbmem.c linux-2.6.32.13/drivers/video/f
  			info->fbops->fb_imageblit(info, image);
  			image->dy -= image->height + 8;
  		}
-@@ -1119,7 +1119,7 @@ static long do_fb_ioctl(struct fb_info *
+@@ -1119,7 +1119,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
  			return -EFAULT;
  		if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
  			return -EINVAL;
@@ -28548,10 +29283,11 @@ diff -urNp linux-2.6.32.13/drivers/video/fbmem.c linux-2.6.32.13/drivers/video/f
  			return -EINVAL;
  		if (!registered_fb[con2fb.framebuffer])
  			request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.32.13/drivers/video/fbmon.c linux-2.6.32.13/drivers/video/fbmon.c
---- linux-2.6.32.13/drivers/video/fbmon.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/fbmon.c	2010-05-15 13:21:16.667905259 -0400
-@@ -45,7 +45,7 @@
+diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
+index 563a98b..081bff4 100644
+--- a/drivers/video/fbmon.c
++++ b/drivers/video/fbmon.c
+@@ -46,7 +46,7 @@
  #ifdef DEBUG
  #define DPRINTK(fmt, args...) printk(fmt,## args)
  #else
@@ -28560,10 +29296,11 @@ diff -urNp linux-2.6.32.13/drivers/video/fbmon.c linux-2.6.32.13/drivers/video/f
  #endif
  
  #define FBMON_FIX_HEADER  1
-diff -urNp linux-2.6.32.13/drivers/video/i810/i810_accel.c linux-2.6.32.13/drivers/video/i810/i810_accel.c
---- linux-2.6.32.13/drivers/video/i810/i810_accel.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/i810/i810_accel.c	2010-05-15 13:21:16.667905259 -0400
-@@ -73,6 +73,7 @@ static inline int wait_for_space(struct 
+diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
+index f5bedee..28c6028 100644
+--- a/drivers/video/i810/i810_accel.c
++++ b/drivers/video/i810/i810_accel.c
+@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
  		}
  	}
  	printk("ringbuffer lockup!!!\n");
@@ -28571,10 +29308,11 @@ diff -urNp linux-2.6.32.13/drivers/video/i810/i810_accel.c linux-2.6.32.13/drive
  	i810_report_error(mmio); 
  	par->dev_flags |= LOCKUP;
  	info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.32.13/drivers/video/i810/i810_main.c linux-2.6.32.13/drivers/video/i810/i810_main.c
---- linux-2.6.32.13/drivers/video/i810/i810_main.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/i810/i810_main.c	2010-05-15 13:21:16.675089243 -0400
-@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
+diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
+index 5743ea2..c73b1c7 100644
+--- a/drivers/video/i810/i810_main.c
++++ b/drivers/video/i810/i810_main.c
+@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_tbl[] = {
  	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
  	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
  	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
@@ -28583,10 +29321,11 @@ diff -urNp linux-2.6.32.13/drivers/video/i810/i810_main.c linux-2.6.32.13/driver
  };
  
  static struct pci_driver i810fb_driver = {
-diff -urNp linux-2.6.32.13/drivers/video/modedb.c linux-2.6.32.13/drivers/video/modedb.c
---- linux-2.6.32.13/drivers/video/modedb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/modedb.c	2010-05-15 13:21:16.691535841 -0400
-@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
+diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
+index 0a4dbdc..b4954d6 100644
+--- a/drivers/video/modedb.c
++++ b/drivers/video/modedb.c
+@@ -40,240 +40,240 @@ static const struct fb_videomode modedb[] = {
      {
  	/* 640x400 @ 70 Hz, 31.5 kHz hsync */
  	NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2,
@@ -28886,10 +29625,11 @@ diff -urNp linux-2.6.32.13/drivers/video/modedb.c linux-2.6.32.13/drivers/video/
      },
  };
  
-diff -urNp linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c	2010-05-15 13:21:16.691535841 -0400
-@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
+diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c
+index 2fb552a..6aac6d1 100644
+--- a/drivers/video/nvidia/nv_backlight.c
++++ b/drivers/video/nvidia/nv_backlight.c
+@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(struct backlight_device *bd)
  	return bd->props.brightness;
  }
  
@@ -28898,10 +29638,24 @@ diff -urNp linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c linux-2.6.32.13/d
  	.get_brightness = nvidia_bl_get_brightness,
  	.update_status	= nvidia_bl_update_status,
  };
-diff -urNp linux-2.6.32.13/drivers/video/riva/fbdev.c linux-2.6.32.13/drivers/video/riva/fbdev.c
---- linux-2.6.32.13/drivers/video/riva/fbdev.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/riva/fbdev.c	2010-05-15 13:21:16.695039791 -0400
-@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
+diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
+index aaf5d30..7e9cadf 100644
+--- a/drivers/video/omap2/displays/panel-taal.c
++++ b/drivers/video/omap2/displays/panel-taal.c
+@@ -319,7 +319,7 @@ static int taal_bl_get_intensity(struct backlight_device *dev)
+ 	return 0;
+ }
+ 
+-static struct backlight_ops taal_bl_ops = {
++static const struct backlight_ops taal_bl_ops = {
+ 	.get_brightness = taal_bl_get_intensity,
+ 	.update_status  = taal_bl_update_status,
+ };
+diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
+index 618f36b..da38818 100644
+--- a/drivers/video/riva/fbdev.c
++++ b/drivers/video/riva/fbdev.c
+@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct backlight_device *bd)
  	return bd->props.brightness;
  }
  
@@ -28910,18 +29664,19 @@ diff -urNp linux-2.6.32.13/drivers/video/riva/fbdev.c linux-2.6.32.13/drivers/vi
  	.get_brightness = riva_bl_get_brightness,
  	.update_status	= riva_bl_update_status,
  };
-diff -urNp linux-2.6.32.13/drivers/video/uvesafb.c linux-2.6.32.13/drivers/video/uvesafb.c
---- linux-2.6.32.13/drivers/video/uvesafb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/uvesafb.c	2010-05-15 13:21:16.714782153 -0400
-@@ -18,6 +18,7 @@
- #include <linux/fb.h>
+diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
+index 7b8839e..39b9bf6 100644
+--- a/drivers/video/uvesafb.c
++++ b/drivers/video/uvesafb.c
+@@ -19,6 +19,7 @@
  #include <linux/io.h>
  #include <linux/mutex.h>
+ #include <linux/slab.h>
 +#include <linux/moduleloader.h>
  #include <video/edid.h>
  #include <video/uvesafb.h>
  #ifdef CONFIG_X86
-@@ -120,7 +121,7 @@ static int uvesafb_helper_start(void)
+@@ -121,7 +122,7 @@ static int uvesafb_helper_start(void)
  		NULL,
  	};
  
@@ -28930,7 +29685,7 @@ diff -urNp linux-2.6.32.13/drivers/video/uvesafb.c linux-2.6.32.13/drivers/video
  }
  
  /*
-@@ -568,10 +569,32 @@ static int __devinit uvesafb_vbe_getpmi(
+@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
  	if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
  		par->pmi_setpal = par->ypan = 0;
  	} else {
@@ -28963,7 +29718,7 @@ diff -urNp linux-2.6.32.13/drivers/video/uvesafb.c linux-2.6.32.13/drivers/video
  		printk(KERN_INFO "uvesafb: protected mode interface info at "
  				 "%04x:%04x\n",
  				 (u16)task->t.regs.es, (u16)task->t.regs.edi);
-@@ -1799,6 +1822,11 @@ out:
+@@ -1800,6 +1823,11 @@ out:
  	if (par->vbe_modes)
  		kfree(par->vbe_modes);
  
@@ -28975,7 +29730,7 @@ diff -urNp linux-2.6.32.13/drivers/video/uvesafb.c linux-2.6.32.13/drivers/video
  	framebuffer_release(info);
  	return err;
  }
-@@ -1825,6 +1853,12 @@ static int uvesafb_remove(struct platfor
+@@ -1826,6 +1854,12 @@ static int uvesafb_remove(struct platform_device *dev)
  				kfree(par->vbe_state_orig);
  			if (par->vbe_state_saved)
  				kfree(par->vbe_state_saved);
@@ -28988,9 +29743,10 @@ diff -urNp linux-2.6.32.13/drivers/video/uvesafb.c linux-2.6.32.13/drivers/video
  		}
  
  		framebuffer_release(info);
-diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/vesafb.c
---- linux-2.6.32.13/drivers/video/vesafb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/video/vesafb.c	2010-05-15 13:21:16.727737170 -0400
+diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
+index 090aa1a..69b720a 100644
+--- a/drivers/video/vesafb.c
++++ b/drivers/video/vesafb.c
 @@ -9,6 +9,7 @@
   */
  
@@ -28999,7 +29755,7 @@ diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/
  #include <linux/kernel.h>
  #include <linux/errno.h>
  #include <linux/string.h>
-@@ -53,8 +54,8 @@ static int   vram_remap __initdata;		/* 
+@@ -52,8 +53,8 @@ static int   vram_remap __initdata;		/* Set amount of memory to be used */
  static int   vram_total __initdata;		/* Set total amount of memory */
  static int   pmi_setpal __read_mostly = 1;	/* pmi for palette changes ??? */
  static int   ypan       __read_mostly;		/* 0..nothing, 1..ypan, 2..ywrap */
@@ -29010,7 +29766,7 @@ diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/
  static int   depth      __read_mostly;
  static int   vga_compat __read_mostly;
  /* --------------------------------------------------------------------- */
-@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct pl
+@@ -232,6 +233,7 @@ static int __init vesafb_probe(struct platform_device *dev)
  	unsigned int size_vmode;
  	unsigned int size_remap;
  	unsigned int size_total;
@@ -29018,7 +29774,7 @@ diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/
  
  	if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
  		return -ENODEV;
-@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct pl
+@@ -274,10 +276,6 @@ static int __init vesafb_probe(struct platform_device *dev)
  		size_remap = size_total;
  	vesafb_fix.smem_len = size_remap;
  
@@ -29029,7 +29785,7 @@ diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/
  	if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
  		printk(KERN_WARNING
  		       "vesafb: cannot reserve video memory at 0x%lx\n",
-@@ -315,9 +313,21 @@ static int __init vesafb_probe(struct pl
+@@ -319,9 +317,21 @@ static int __init vesafb_probe(struct platform_device *dev)
  	printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
  	       vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
  
@@ -29053,7 +29809,7 @@ diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/
  	}
  
  	if (screen_info.vesapm_seg < 0xc000)
-@@ -325,9 +335,25 @@ static int __init vesafb_probe(struct pl
+@@ -329,9 +339,25 @@ static int __init vesafb_probe(struct platform_device *dev)
  
  	if (ypan || pmi_setpal) {
  		unsigned short *pmi_base;
@@ -29082,7 +29838,7 @@ diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/
  		printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
  		if (pmi_base[3]) {
  			printk(KERN_INFO "vesafb: pmi: ports = ");
-@@ -469,6 +495,11 @@ static int __init vesafb_probe(struct pl
+@@ -473,6 +499,11 @@ static int __init vesafb_probe(struct platform_device *dev)
  	       info->node, info->fix.id);
  	return 0;
  err:
@@ -29094,22 +29850,11 @@ diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/
  	if (info->screen_base)
  		iounmap(info->screen_base);
  	framebuffer_release(info);
-diff -urNp linux-2.6.32.13/drivers/xen/sys-hypervisor.c linux-2.6.32.13/drivers/xen/sys-hypervisor.c
---- linux-2.6.32.13/drivers/xen/sys-hypervisor.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/drivers/xen/sys-hypervisor.c	2010-05-15 13:21:16.727737170 -0400
-@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
- 	return 0;
- }
- 
--static struct sysfs_ops hyp_sysfs_ops = {
-+static const struct sysfs_ops hyp_sysfs_ops = {
- 	.show = hyp_sysfs_show,
- 	.store = hyp_sysfs_store,
- };
-diff -urNp linux-2.6.32.13/fs/9p/vfs_inode.c linux-2.6.32.13/fs/9p/vfs_inode.c
---- linux-2.6.32.13/fs/9p/vfs_inode.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/9p/vfs_inode.c	2010-05-15 13:21:16.735266886 -0400
-@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
+diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
+index 4331b3b..061e3f7 100644
+--- a/fs/9p/vfs_inode.c
++++ b/fs/9p/vfs_inode.c
+@@ -1087,7 +1087,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
  static void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -29118,10 +29863,24 @@ diff -urNp linux-2.6.32.13/fs/9p/vfs_inode.c linux-2.6.32.13/fs/9p/vfs_inode.c
  
  	P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
  		IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-2.6.32.13/fs/aio.c linux-2.6.32.13/fs/aio.c
---- linux-2.6.32.13/fs/aio.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/aio.c	2010-05-15 13:21:16.759050469 -0400
-@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx 
+diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
+index bb4cc5b..df5eaa0 100644
+--- a/fs/Kconfig.binfmt
++++ b/fs/Kconfig.binfmt
+@@ -86,7 +86,7 @@ config HAVE_AOUT
+ 
+ config BINFMT_AOUT
+ 	tristate "Kernel support for a.out and ECOFF binaries"
+-	depends on HAVE_AOUT
++	depends on HAVE_AOUT && BROKEN
+ 	---help---
+ 	  A.out (Assembler.OUTput) is a set of formats for libraries and
+ 	  executables used in the earliest versions of UNIX.  Linux used
+diff --git a/fs/aio.c b/fs/aio.c
+index 5fb0fd7..0fd5a7e 100644
+--- a/fs/aio.c
++++ b/fs/aio.c
+@@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx *ctx)
  	size += sizeof(struct io_event) * nr_events;
  	nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
  
@@ -29130,21 +29889,23 @@ diff -urNp linux-2.6.32.13/fs/aio.c linux-2.6.32.13/fs/aio.c
  		return -EINVAL;
  
  	nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
-diff -urNp linux-2.6.32.13/fs/attr.c linux-2.6.32.13/fs/attr.c
---- linux-2.6.32.13/fs/attr.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/attr.c	2010-05-15 13:21:16.767048242 -0400
-@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 
+diff --git a/fs/attr.c b/fs/attr.c
+index b4fa3b0..76d4d92 100644
+--- a/fs/attr.c
++++ b/fs/attr.c
+@@ -82,6 +82,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
  		unsigned long limit;
  
- 		limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
+ 		limit = rlimit(RLIMIT_FSIZE);
 +		gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
  		if (limit != RLIM_INFINITY && offset > limit)
  			goto out_sig;
  		if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-2.6.32.13/fs/autofs/root.c linux-2.6.32.13/fs/autofs/root.c
---- linux-2.6.32.13/fs/autofs/root.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/autofs/root.c	2010-05-15 13:21:16.770726483 -0400
-@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
+diff --git a/fs/autofs/root.c b/fs/autofs/root.c
+index 9a0520b..7194d6b 100644
+--- a/fs/autofs/root.c
++++ b/fs/autofs/root.c
+@@ -301,7 +301,8 @@ static int autofs_root_symlink(struct inode *dir, struct dentry *dentry, const c
  	set_bit(n,sbi->symlink_bitmap);
  	sl = &sbi->symlink[n];
  	sl->len = strlen(symname);
@@ -29154,9 +29915,10 @@ diff -urNp linux-2.6.32.13/fs/autofs/root.c linux-2.6.32.13/fs/autofs/root.c
  	if (!sl->data) {
  		clear_bit(n,sbi->symlink_bitmap);
  		unlock_kernel();
-diff -urNp linux-2.6.32.13/fs/autofs4/symlink.c linux-2.6.32.13/fs/autofs4/symlink.c
---- linux-2.6.32.13/fs/autofs4/symlink.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/autofs4/symlink.c	2010-05-15 13:21:16.786757439 -0400
+diff --git a/fs/autofs4/symlink.c b/fs/autofs4/symlink.c
+index b4ea829..e63ef18 100644
+--- a/fs/autofs4/symlink.c
++++ b/fs/autofs4/symlink.c
 @@ -15,7 +15,7 @@
  static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
@@ -29166,10 +29928,11 @@ diff -urNp linux-2.6.32.13/fs/autofs4/symlink.c linux-2.6.32.13/fs/autofs4/symli
  	return NULL;
  }
  
-diff -urNp linux-2.6.32.13/fs/befs/linuxvfs.c linux-2.6.32.13/fs/befs/linuxvfs.c
---- linux-2.6.32.13/fs/befs/linuxvfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/befs/linuxvfs.c	2010-05-15 13:21:16.795284033 -0400
-@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 
+diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
+index 34ddda8..2ef7b6e 100644
+--- a/fs/befs/linuxvfs.c
++++ b/fs/befs/linuxvfs.c
+@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
  	befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
  	if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
@@ -29178,9 +29941,10 @@ diff -urNp linux-2.6.32.13/fs/befs/linuxvfs.c linux-2.6.32.13/fs/befs/linuxvfs.c
  		if (!IS_ERR(link))
  			kfree(link);
  	}
-diff -urNp linux-2.6.32.13/fs/binfmt_aout.c linux-2.6.32.13/fs/binfmt_aout.c
---- linux-2.6.32.13/fs/binfmt_aout.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/binfmt_aout.c	2010-05-15 13:21:16.799043518 -0400
+diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
+index f96eff0..4386ab0 100644
+--- a/fs/binfmt_aout.c
++++ b/fs/binfmt_aout.c
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -29189,21 +29953,42 @@ diff -urNp linux-2.6.32.13/fs/binfmt_aout.c linux-2.6.32.13/fs/binfmt_aout.c
  #include <linux/stat.h>
  #include <linux/fcntl.h>
  #include <linux/ptrace.h>
-@@ -113,10 +114,12 @@ static int aout_core_dump(long signr, st
+@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredump_params *cprm)
+ #endif
+ #       define START_STACK(u)   ((void __user *)u.start_stack)
+ 
++	memset(&dump, 0, sizeof(dump));
++
+ 	fs = get_fs();
+ 	set_fs(KERNEL_DS);
+ 	has_dumped = 1;
+@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredump_params *cprm)
  
  /* If the size of the dump file exceeds the rlimit, then see what would happen
     if we wrote the stack, but not the data area.  */
 +	gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
- 	if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > limit)
+ 	if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
  		dump.u_dsize = 0;
  
  /* Make sure we have enough room to write the stack and data areas. */
 +	gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
- 	if ((dump.u_ssize + 1) * PAGE_SIZE > limit)
+ 	if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
  		dump.u_ssize = 0;
  
-@@ -249,6 +252,8 @@ static int load_aout_binary(struct linux
- 	rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
+@@ -134,10 +139,7 @@ static int aout_core_dump(struct coredump_params *cprm)
+ 		if (!dump_write(file, dump_start, dump_size))
+ 			goto end_coredump;
+ 	}
+-/* Finally dump the task struct.  Not be used by gdb, but could be useful */
+-	set_fs(KERNEL_DS);
+-	if (!dump_write(file, current, sizeof(*current)))
+-		goto end_coredump;
++/* Finally let's not dump the task struct.  Not be used by gdb, but could be useful to an attacker */
+ end_coredump:
+ 	set_fs(fs);
+ 	return has_dumped;
+@@ -238,6 +240,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
+ 	rlim = rlimit(RLIMIT_DATA);
  	if (rlim >= RLIM_INFINITY)
  		rlim = ~0;
 +
@@ -29211,7 +29996,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_aout.c linux-2.6.32.13/fs/binfmt_aout.c
  	if (ex.a_data + ex.a_bss > rlim)
  		return -ENOMEM;
  
-@@ -277,6 +282,27 @@ static int load_aout_binary(struct linux
+@@ -266,6 +270,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
  	install_exec_creds(bprm);
   	current->flags &= ~PF_FORKNOEXEC;
  
@@ -29239,7 +30024,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_aout.c linux-2.6.32.13/fs/binfmt_aout.c
  	if (N_MAGIC(ex) == OMAGIC) {
  		unsigned long text_addr, map_size;
  		loff_t pos;
-@@ -349,7 +375,7 @@ static int load_aout_binary(struct linux
+@@ -338,7 +363,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
  
  		down_write(&current->mm->mmap_sem);
   		error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
@@ -29248,10 +30033,11 @@ diff -urNp linux-2.6.32.13/fs/binfmt_aout.c linux-2.6.32.13/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-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
---- linux-2.6.32.13/fs/binfmt_elf.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/binfmt_elf.c	2010-05-15 13:21:16.818718975 -0400
-@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
+diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
+index 535e763..5eaf894 100644
+--- a/fs/binfmt_elf.c
++++ b/fs/binfmt_elf.c
+@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump_params *cprm);
  #define elf_core_dump	NULL
  #endif
  
@@ -29262,7 +30048,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  #if ELF_EXEC_PAGESIZE > PAGE_SIZE
  #define ELF_MIN_ALIGN	ELF_EXEC_PAGESIZE
  #else
-@@ -69,6 +73,11 @@ static struct linux_binfmt elf_format = 
+@@ -70,6 +74,11 @@ static struct linux_binfmt elf_format = {
  		.load_binary	= load_elf_binary,
  		.load_shlib	= load_elf_library,
  		.core_dump	= elf_core_dump,
@@ -29274,7 +30060,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  		.min_coredump	= ELF_EXEC_PAGESIZE,
  		.hasvdso	= 1
  };
-@@ -77,6 +86,8 @@ static struct linux_binfmt elf_format = 
+@@ -78,6 +87,8 @@ static struct linux_binfmt elf_format = {
  
  static int set_brk(unsigned long start, unsigned long end)
  {
@@ -29283,7 +30069,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  	start = ELF_PAGEALIGN(start);
  	end = ELF_PAGEALIGN(end);
  	if (end > start) {
-@@ -87,7 +98,7 @@ static int set_brk(unsigned long start, 
+@@ -88,7 +99,7 @@ static int set_brk(unsigned long start, unsigned long end)
  		if (BAD_ADDR(addr))
  			return addr;
  	}
@@ -29292,7 +30078,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  	return 0;
  }
  
-@@ -148,7 +159,7 @@ create_elf_tables(struct linux_binprm *b
+@@ -149,7 +160,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
  	elf_addr_t __user *u_rand_bytes;
  	const char *k_platform = ELF_PLATFORM;
  	const char *k_base_platform = ELF_BASE_PLATFORM;
@@ -29301,7 +30087,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  	int items;
  	elf_addr_t *elf_info;
  	int ei_index = 0;
-@@ -195,8 +206,12 @@ create_elf_tables(struct linux_binprm *b
+@@ -196,8 +207,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
  	 * Generate 16 random bytes for userspace PRNG seeding.
  	 */
  	get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
@@ -29316,7 +30102,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  	if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
  		return -EFAULT;
  
-@@ -385,10 +400,10 @@ static unsigned long load_elf_interp(str
+@@ -386,10 +401,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
  {
  	struct elf_phdr *elf_phdata;
  	struct elf_phdr *eppnt;
@@ -29329,7 +30115,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  	unsigned long total_size;
  	int retval, i, size;
  
-@@ -434,6 +449,11 @@ static unsigned long load_elf_interp(str
+@@ -435,6 +450,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
  		goto out_close;
  	}
  
@@ -29341,7 +30127,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  	eppnt = elf_phdata;
  	for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
  		if (eppnt->p_type == PT_LOAD) {
-@@ -477,8 +497,8 @@ static unsigned long load_elf_interp(str
+@@ -478,8 +498,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
  			k = load_addr + eppnt->p_vaddr;
  			if (BAD_ADDR(k) ||
  			    eppnt->p_filesz > eppnt->p_memsz ||
@@ -29352,7 +30138,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  				error = -ENOMEM;
  				goto out_close;
  			}
-@@ -532,6 +552,177 @@ out:
+@@ -533,6 +553,177 @@ out:
  	return error;
  }
  
@@ -29373,7 +30159,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
 +
 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
 +	if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
-+		if (nx_enabled)
++		if ((__supported_pte_mask & _PAGE_NX))
 +			pax_flags &= ~MF_PAX_SEGMEXEC;
 +		else
 +			pax_flags &= ~MF_PAX_PAGEEXEC;
@@ -29416,7 +30202,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
 +
 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
 +	if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
-+		if (nx_enabled)
++		if ((__supported_pte_mask & _PAGE_NX))
 +			pax_flags &= ~MF_PAX_SEGMEXEC;
 +		else
 +			pax_flags &= ~MF_PAX_PAGEEXEC;
@@ -29459,7 +30245,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
 +
 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
 +	if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
-+		if (nx_enabled)
++		if ((__supported_pte_mask & _PAGE_NX))
 +			pax_flags &= ~MF_PAX_SEGMEXEC;
 +		else
 +			pax_flags &= ~MF_PAX_PAGEEXEC;
@@ -29530,7 +30316,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  /*
   * These are the functions used to load ELF style executables and shared
   * libraries.  There is no binary dependent code anywhere else.
-@@ -548,6 +739,11 @@ static unsigned long randomize_stack_top
+@@ -549,6 +740,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
  {
  	unsigned int random_variable = 0;
  
@@ -29542,7 +30328,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  	if ((current->flags & PF_RANDOMIZE) &&
  		!(current->personality & ADDR_NO_RANDOMIZE)) {
  		random_variable = get_random_int() & STACK_RND_MASK;
-@@ -566,7 +762,7 @@ static int load_elf_binary(struct linux_
+@@ -567,7 +763,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
   	unsigned long load_addr = 0, load_bias = 0;
  	int load_addr_set = 0;
  	char * elf_interpreter = NULL;
@@ -29551,7 +30337,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  	struct elf_phdr *elf_ppnt, *elf_phdata;
  	unsigned long elf_bss, elf_brk;
  	int retval, i;
-@@ -576,11 +772,11 @@ static int load_elf_binary(struct linux_
+@@ -577,11 +773,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	unsigned long start_code, end_code, start_data, end_data;
  	unsigned long reloc_func_desc = 0;
  	int executable_stack = EXSTACK_DEFAULT;
@@ -29564,7 +30350,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  
  	loc = kmalloc(sizeof(*loc), GFP_KERNEL);
  	if (!loc) {
-@@ -718,11 +914,80 @@ static int load_elf_binary(struct linux_
+@@ -719,11 +915,80 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
@@ -29604,7 +30390,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
 +#endif
 +
 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
-+	if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !nx_enabled) {
++	if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
 +		current->mm->context.user_cs_limit = PAGE_SIZE;
 +		current->mm->def_flags |= VM_PAGEEXEC;
 +	}
@@ -29646,7 +30432,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  	if (elf_read_implies_exec(loc->elf_ex, executable_stack))
  		current->personality |= READ_IMPLIES_EXEC;
  
-@@ -804,6 +1069,20 @@ static int load_elf_binary(struct linux_
+@@ -805,6 +1070,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  #else
  			load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
  #endif
@@ -29667,7 +30453,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  		}
  
  		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
-@@ -836,9 +1115,9 @@ static int load_elf_binary(struct linux_
+@@ -837,9 +1116,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  		 * allowed task size. Note that p_filesz must always be
  		 * <= p_memsz so it is only necessary to check p_memsz.
  		 */
@@ -29680,7 +30466,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  			/* set_brk can never work. Avoid overflows. */
  			send_sig(SIGKILL, current, 0);
  			retval = -EINVAL;
-@@ -866,6 +1145,11 @@ static int load_elf_binary(struct linux_
+@@ -867,6 +1146,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	start_data += load_bias;
  	end_data += load_bias;
  
@@ -29692,7 +30478,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/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
-@@ -877,9 +1161,11 @@ static int load_elf_binary(struct linux_
+@@ -878,9 +1162,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  		goto out_free_dentry;
  	}
  	if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
@@ -29707,19 +30493,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  	}
  
  	if (elf_interpreter) {
-@@ -1112,8 +1398,10 @@ static int dump_seek(struct file *file, 
- 			unsigned long n = off;
- 			if (n > PAGE_SIZE)
- 				n = PAGE_SIZE;
--			if (!dump_write(file, buf, n))
-+			if (!dump_write(file, buf, n)) {
-+				free_page((unsigned long)buf);
- 				return 0;
-+			}
- 			off -= n;
- 		}
- 		free_page((unsigned long)buf);
-@@ -1125,7 +1413,7 @@ static int dump_seek(struct file *file, 
+@@ -1091,7 +1377,7 @@ out:
   * Decide what to dump of a segment, part, all or none.
   */
  static unsigned long vma_dump_size(struct vm_area_struct *vma,
@@ -29728,7 +30502,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  {
  #define FILTER(type)	(mm_flags & (1UL << MMF_DUMP_##type))
  
-@@ -1159,7 +1447,7 @@ static unsigned long vma_dump_size(struc
+@@ -1125,7 +1411,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
  	if (vma->vm_file == NULL)
  		return 0;
  
@@ -29737,20 +30511,7 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  		goto whole;
  
  	/*
-@@ -1255,8 +1543,11 @@ static int writenote(struct memelfnote *
- #undef DUMP_WRITE
- 
- #define DUMP_WRITE(addr, nr)	\
-+	do { \
-+	gr_learn_resource(current, RLIMIT_CORE, size + (nr), 1); \
- 	if ((size += (nr)) > limit || !dump_write(file, (addr), (nr))) \
--		goto end_coredump;
-+		goto end_coredump; \
-+	} while (0);
- 
- static void fill_elf_header(struct elfhdr *elf, int segs,
- 			    u16 machine, u32 flags, u8 osabi)
-@@ -1385,9 +1676,9 @@ static void fill_auxv_note(struct memelf
+@@ -1347,9 +1633,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
  {
  	elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
  	int i = 0;
@@ -29762,35 +30523,90 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  	fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
  }
  
-@@ -1973,7 +2264,7 @@ static int elf_core_dump(long signr, str
+@@ -1855,14 +2141,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
+ }
+ 
+ static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
+-				     unsigned long mm_flags)
++				     struct coredump_params *cprm)
+ {
+ 	struct vm_area_struct *vma;
+ 	size_t size = 0;
+ 
+ 	for (vma = first_vma(current, gate_vma); vma != NULL;
+ 	     vma = next_vma(vma, gate_vma))
+-		size += vma_dump_size(vma, mm_flags);
++		size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
+ 	return size;
+ }
+ 
+@@ -1956,7 +2242,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+ 
+ 	dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
+ 
+-	offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
++	offset += elf_core_vma_data_size(gate_vma, cprm);
+ 	offset += elf_core_extra_data_size();
+ 	e_shoff = offset;
+ 
+@@ -1970,10 +2256,12 @@ static int elf_core_dump(struct coredump_params *cprm)
+ 	offset = dataoff;
+ 
+ 	size += sizeof(*elf);
++	gr_learn_resource(current, RLIMIT_CORE, size, 1);
+ 	if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
+ 		goto end_coredump;
+ 
+ 	size += sizeof(*phdr4note);
++	gr_learn_resource(current, RLIMIT_CORE, size, 1);
+ 	if (size > cprm->limit
+ 	    || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
+ 		goto end_coredump;
+@@ -1987,7 +2275,7 @@ static int elf_core_dump(struct coredump_params *cprm)
  		phdr.p_offset = offset;
  		phdr.p_vaddr = vma->vm_start;
  		phdr.p_paddr = 0;
--		phdr.p_filesz = vma_dump_size(vma, mm_flags);
-+		phdr.p_filesz = vma_dump_size(vma, mm_flags, signr);
+-		phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
++		phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
  		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,7 +2297,7 @@ static int elf_core_dump(long signr, str
+@@ -1998,6 +2286,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+ 		phdr.p_align = ELF_EXEC_PAGESIZE;
+ 
+ 		size += sizeof(phdr);
++		gr_learn_resource(current, RLIMIT_CORE, size, 1);
+ 		if (size > cprm->limit
+ 		    || !dump_write(cprm->file, &phdr, sizeof(phdr)))
+ 			goto end_coredump;
+@@ -2022,7 +2311,7 @@ static int elf_core_dump(struct coredump_params *cprm)
  		unsigned long addr;
  		unsigned long end;
  
--		end = vma->vm_start + vma_dump_size(vma, mm_flags);
-+		end = vma->vm_start + vma_dump_size(vma, mm_flags, signr);
+-		end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
++		end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
  
  		for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
  			struct page *page;
-@@ -2015,6 +2306,7 @@ static int elf_core_dump(long signr, str
+@@ -2031,6 +2320,7 @@ static int elf_core_dump(struct coredump_params *cprm)
  			page = get_dump_page(addr);
  			if (page) {
  				void *kaddr = kmap(page);
 +				gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
- 				stop = ((size += PAGE_SIZE) > limit) ||
- 					!dump_write(file, kaddr, PAGE_SIZE);
- 				kunmap(page);
-@@ -2042,6 +2334,97 @@ out:
+ 				stop = ((size += PAGE_SIZE) > cprm->limit) ||
+ 					!dump_write(cprm->file, kaddr,
+ 						    PAGE_SIZE);
+@@ -2048,6 +2338,7 @@ static int elf_core_dump(struct coredump_params *cprm)
  
- #endif		/* USE_ELF_CORE_DUMP */
+ 	if (e_phnum == PN_XNUM) {
+ 		size += sizeof(*shdr4extnum);
++		gr_learn_resource(current, RLIMIT_CORE, size, 1);
+ 		if (size > cprm->limit
+ 		    || !dump_write(cprm->file, shdr4extnum,
+ 				   sizeof(*shdr4extnum)))
+@@ -2068,6 +2359,97 @@ out:
+ 
+ #endif		/* CONFIG_ELF_CORE */
  
 +#ifdef CONFIG_PAX_MPROTECT
 +/* PaX: non-PIC ELF libraries need relocations on their executable segments
@@ -29814,13 +30630,13 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
 +	oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
 +	newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
 +
-+#ifdef CONFIG_PAX_NOELFRELOCS
-+	is_textrel_rw = false;
-+	is_textrel_rx = false;
-+#else
++#ifdef CONFIG_PAX_ELFRELOCS
 +	/* possible TEXTREL */
 +	is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
 +	is_textrel_rx = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
++#else
++	is_textrel_rw = false;
++	is_textrel_rx = false;
 +#endif
 +
 +	/* possible RELRO */
@@ -29886,10 +30702,11 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
  static int __init init_elf_binfmt(void)
  {
  	return register_binfmt(&elf_format);
-diff -urNp linux-2.6.32.13/fs/binfmt_flat.c linux-2.6.32.13/fs/binfmt_flat.c
---- linux-2.6.32.13/fs/binfmt_flat.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/binfmt_flat.c	2010-05-15 13:21:16.818718975 -0400
-@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
+diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
+index 811384b..8dcee62 100644
+--- a/fs/binfmt_flat.c
++++ b/fs/binfmt_flat.c
+@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_binprm * bprm,
  				realdatastart = (unsigned long) -ENOMEM;
  			printk("Unable to allocate RAM for process data, errno %d\n",
  					(int)-realdatastart);
@@ -29899,18 +30716,18 @@ diff -urNp linux-2.6.32.13/fs/binfmt_flat.c linux-2.6.32.13/fs/binfmt_flat.c
  			ret = realdatastart;
  			goto err;
  		}
-@@ -588,8 +590,10 @@ static int load_flat_file(struct linux_b
+@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_binprm * bprm,
  		}
  		if (IS_ERR_VALUE(result)) {
  			printk("Unable to read data+bss, errno %d\n", (int)-result);
 +			down_write(&current->mm->mmap_sem);
  			do_munmap(current->mm, textpos, text_len);
- 			do_munmap(current->mm, realdatastart, data_len + extra);
+ 			do_munmap(current->mm, realdatastart, len);
 +			up_write(&current->mm->mmap_sem);
  			ret = result;
  			goto err;
  		}
-@@ -658,8 +662,10 @@ static int load_flat_file(struct linux_b
+@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_binprm * bprm,
  		}
  		if (IS_ERR_VALUE(result)) {
  			printk("Unable to read code+data+bss, errno %d\n",(int)-result);
@@ -29921,10 +30738,11 @@ diff -urNp linux-2.6.32.13/fs/binfmt_flat.c linux-2.6.32.13/fs/binfmt_flat.c
  			ret = result;
  			goto err;
  		}
-diff -urNp linux-2.6.32.13/fs/binfmt_misc.c linux-2.6.32.13/fs/binfmt_misc.c
---- linux-2.6.32.13/fs/binfmt_misc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/binfmt_misc.c	2010-05-15 13:21:16.827094561 -0400
-@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
+diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
+index 42b60b0..57f6a31 100644
+--- a/fs/binfmt_misc.c
++++ b/fs/binfmt_misc.c
+@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_block * sb, void * data, int silent)
  	static struct tree_descr bm_files[] = {
  		[2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
  		[3] = {"register", &bm_register_operations, S_IWUSR},
@@ -29933,19 +30751,11 @@ diff -urNp linux-2.6.32.13/fs/binfmt_misc.c linux-2.6.32.13/fs/binfmt_misc.c
  	};
  	int err = simple_fill_super(sb, 0x42494e4d, bm_files);
  	if (!err)
-diff -urNp linux-2.6.32.13/fs/bio.c linux-2.6.32.13/fs/bio.c
---- linux-2.6.32.13/fs/bio.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/bio.c	2010-05-15 13:21:16.827094561 -0400
-@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
- 
- 	i = 0;
- 	while (i < bio_slab_nr) {
--		struct bio_slab *bslab = &bio_slabs[i];
-+		bslab = &bio_slabs[i];
- 
- 		if (!bslab->slab && entry == -1)
- 			entry = i;
-@@ -1217,7 +1217,7 @@ static void bio_copy_kern_endio(struct b
+diff --git a/fs/bio.c b/fs/bio.c
+index b3e0174..bfb5a81 100644
+--- a/fs/bio.c
++++ b/fs/bio.c
+@@ -1232,7 +1232,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
  	const int read = bio_data_dir(bio) == READ;
  	struct bio_map_data *bmd = bio->bi_private;
  	int i;
@@ -29954,22 +30764,40 @@ diff -urNp linux-2.6.32.13/fs/bio.c linux-2.6.32.13/fs/bio.c
  
  	__bio_for_each_segment(bvec, bio, i, 0) {
  		char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.32.13/fs/block_dev.c linux-2.6.32.13/fs/block_dev.c
---- linux-2.6.32.13/fs/block_dev.c	2010-04-29 17:49:38.421500081 -0400
-+++ linux-2.6.32.13/fs/block_dev.c	2010-05-15 13:21:16.839060742 -0400
-@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, 
+diff --git a/fs/block_dev.c b/fs/block_dev.c
+index 4c54c86..f542951 100644
+--- a/fs/block_dev.c
++++ b/fs/block_dev.c
+@@ -647,7 +647,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
  	else if (bdev->bd_contains == bdev)
- 		res = 0;  	 /* is a whole device which isn't held */
- 
--	else if (bdev->bd_contains->bd_holder == bd_claim)
-+	else if (bdev->bd_contains->bd_holder == (void *)bd_claim)
- 		res = 0; 	 /* is a partition of a device that is being partitioned */
- 	else if (bdev->bd_contains->bd_holder != NULL)
- 		res = -EBUSY;	 /* is a partition of a held device */
-diff -urNp linux-2.6.32.13/fs/btrfs/ctree.c linux-2.6.32.13/fs/btrfs/ctree.c
---- linux-2.6.32.13/fs/btrfs/ctree.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/btrfs/ctree.c	2010-05-15 13:21:16.884750763 -0400
-@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran
+ 		return true;  	 /* is a whole device which isn't held */
+ 
+-	else if (whole->bd_holder == bd_claim)
++	else if (whole->bd_holder == (void *)bd_claim)
+ 		return true; 	 /* is a partition of a device that is being partitioned */
+ 	else if (whole->bd_holder != NULL)
+ 		return false;	 /* is a partition of a held device */
+diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
+index c3df14c..50266f4 100644
+--- a/fs/btrfs/ctree.c
++++ b/fs/btrfs/ctree.c
+@@ -468,9 +468,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
+ 		free_extent_buffer(buf);
+ 		add_root_to_dirty_list(root);
+ 	} else {
+-		if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
+-			parent_start = parent->start;
+-		else
++		if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
++			if (parent)
++				parent_start = parent->start;
++			else
++				parent_start = 0;
++		} else
+ 			parent_start = 0;
+ 
+ 		WARN_ON(trans->transid != btrfs_header_generation(parent));
+@@ -3763,7 +3766,6 @@ setup_items_for_insert(struct btrfs_trans_handle *trans,
  
  	ret = 0;
  	if (slot == 0) {
@@ -29977,10 +30805,11 @@ diff -urNp linux-2.6.32.13/fs/btrfs/ctree.c linux-2.6.32.13/fs/btrfs/ctree.c
  		btrfs_cpu_key_to_disk(&disk_key, cpu_key);
  		ret = fixup_low_keys(trans, root, path, &disk_key, 1);
  	}
-diff -urNp linux-2.6.32.13/fs/btrfs/disk-io.c linux-2.6.32.13/fs/btrfs/disk-io.c
---- linux-2.6.32.13/fs/btrfs/disk-io.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/btrfs/disk-io.c	2010-05-15 13:21:16.884750763 -0400
-@@ -39,7 +39,7 @@
+diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
+index 34f7c37..eb89521 100644
+--- a/fs/btrfs/disk-io.c
++++ b/fs/btrfs/disk-io.c
+@@ -40,7 +40,7 @@
  #include "tree-log.h"
  #include "free-space-cache.h"
  
@@ -29989,7 +30818,7 @@ diff -urNp linux-2.6.32.13/fs/btrfs/disk-io.c linux-2.6.32.13/fs/btrfs/disk-io.c
  static void end_workqueue_fn(struct btrfs_work *work);
  static void free_fs_root(struct btrfs_root *root);
  
-@@ -2585,7 +2585,7 @@ out:
+@@ -2597,7 +2597,7 @@ out:
  	return 0;
  }
  
@@ -29998,12 +30827,13 @@ diff -urNp linux-2.6.32.13/fs/btrfs/disk-io.c linux-2.6.32.13/fs/btrfs/disk-io.c
  	.write_cache_pages_lock_hook = btree_lock_page_hook,
  	.readpage_end_io_hook = btree_readpage_end_io_hook,
  	.submit_bio_hook = btree_submit_bio_hook,
-diff -urNp linux-2.6.32.13/fs/btrfs/extent_io.h linux-2.6.32.13/fs/btrfs/extent_io.h
---- linux-2.6.32.13/fs/btrfs/extent_io.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/btrfs/extent_io.h	2010-05-15 13:21:16.911563863 -0400
-@@ -49,36 +49,36 @@ typedef	int (extent_submit_bio_hook_t)(s
+diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
+index 5691c7b..69d077f 100644
+--- a/fs/btrfs/extent_io.h
++++ b/fs/btrfs/extent_io.h
+@@ -51,36 +51,36 @@ typedef	int (extent_submit_bio_hook_t)(struct inode *inode, int rw,
  				       struct bio *bio, int mirror_num,
- 				       unsigned long bio_flags);
+ 				       unsigned long bio_flags, u64 bio_offset);
  struct extent_io_ops {
 -	int (*fill_delalloc)(struct inode *inode, struct page *locked_page,
 +	int (* const fill_delalloc)(struct inode *inode, struct page *locked_page,
@@ -30034,12 +30864,12 @@ diff -urNp linux-2.6.32.13/fs/btrfs/extent_io.h linux-2.6.32.13/fs/btrfs/extent_
 -	int (*writepage_end_io_hook)(struct page *page, u64 start, u64 end,
 +	int (* const writepage_end_io_hook)(struct page *page, u64 start, u64 end,
  				      struct extent_state *state, int uptodate);
--	int (*set_bit_hook)(struct inode *inode, u64 start, u64 end,
-+	int (* const set_bit_hook)(struct inode *inode, u64 start, u64 end,
- 			    unsigned long old, unsigned long bits);
+-	int (*set_bit_hook)(struct inode *inode, struct extent_state *state,
++	int (* const set_bit_hook)(struct inode *inode, struct extent_state *state,
+ 			    int *bits);
 -	int (*clear_bit_hook)(struct inode *inode, struct extent_state *state,
 +	int (* const clear_bit_hook)(struct inode *inode, struct extent_state *state,
- 			      unsigned long bits);
+ 			      int *bits);
 -	int (*merge_extent_hook)(struct inode *inode,
 +	int (* const merge_extent_hook)(struct inode *inode,
  				 struct extent_state *new,
@@ -30052,7 +30882,7 @@ diff -urNp linux-2.6.32.13/fs/btrfs/extent_io.h linux-2.6.32.13/fs/btrfs/extent_
  };
  
  struct extent_io_tree {
-@@ -88,7 +88,7 @@ struct extent_io_tree {
+@@ -90,7 +90,7 @@ struct extent_io_tree {
  	u64 dirty_bytes;
  	spinlock_t lock;
  	spinlock_t buffer_lock;
@@ -30061,10 +30891,11 @@ diff -urNp linux-2.6.32.13/fs/btrfs/extent_io.h linux-2.6.32.13/fs/btrfs/extent_
  };
  
  struct extent_state {
-diff -urNp linux-2.6.32.13/fs/btrfs/free-space-cache.c linux-2.6.32.13/fs/btrfs/free-space-cache.c
---- linux-2.6.32.13/fs/btrfs/free-space-cache.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/btrfs/free-space-cache.c	2010-05-15 13:21:16.918599051 -0400
-@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
+diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
+index f488fac..c0d91fb 100644
+--- a/fs/btrfs/free-space-cache.c
++++ b/fs/btrfs/free-space-cache.c
+@@ -1075,8 +1075,6 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group,
  
  	while(1) {
  		if (entry->bytes < bytes || entry->offset < min_start) {
@@ -30073,7 +30904,7 @@ diff -urNp linux-2.6.32.13/fs/btrfs/free-space-cache.c linux-2.6.32.13/fs/btrfs/
  			node = rb_next(&entry->offset_index);
  			if (!node)
  				break;
-@@ -1226,7 +1224,7 @@ again:
+@@ -1227,7 +1225,7 @@ again:
  	 */
  	while (entry->bitmap || found_bitmap ||
  	       (!entry->bitmap && entry->bytes < min_bytes)) {
@@ -30082,10 +30913,11 @@ diff -urNp linux-2.6.32.13/fs/btrfs/free-space-cache.c linux-2.6.32.13/fs/btrfs/
  
  		if (entry->bitmap && entry->bytes > bytes + empty_size) {
  			ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff -urNp linux-2.6.32.13/fs/btrfs/inode.c linux-2.6.32.13/fs/btrfs/inode.c
---- linux-2.6.32.13/fs/btrfs/inode.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/btrfs/inode.c	2010-05-15 13:21:16.951236359 -0400
-@@ -63,7 +63,7 @@ static const struct inode_operations btr
+diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
+index 1bff92a..69cf07a 100644
+--- a/fs/btrfs/inode.c
++++ b/fs/btrfs/inode.c
+@@ -64,7 +64,7 @@ static const struct inode_operations btrfs_file_inode_operations;
  static const struct address_space_operations btrfs_aops;
  static const struct address_space_operations btrfs_symlink_aops;
  static const struct file_operations btrfs_dir_file_operations;
@@ -30094,7 +30926,7 @@ diff -urNp linux-2.6.32.13/fs/btrfs/inode.c linux-2.6.32.13/fs/btrfs/inode.c
  
  static struct kmem_cache *btrfs_inode_cachep;
  struct kmem_cache *btrfs_trans_handle_cachep;
-@@ -5854,7 +5854,7 @@ static const struct file_operations btrf
+@@ -6958,7 +6958,7 @@ static const struct file_operations btrfs_dir_file_operations = {
  	.fsync		= btrfs_sync_file,
  };
  
@@ -30103,39 +30935,24 @@ diff -urNp linux-2.6.32.13/fs/btrfs/inode.c linux-2.6.32.13/fs/btrfs/inode.c
  	.fill_delalloc = run_delalloc_range,
  	.submit_bio_hook = btrfs_submit_bio_hook,
  	.merge_bio_hook = btrfs_merge_bio_hook,
-diff -urNp linux-2.6.32.13/fs/btrfs/sysfs.c linux-2.6.32.13/fs/btrfs/sysfs.c
---- linux-2.6.32.13/fs/btrfs/sysfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/btrfs/sysfs.c	2010-05-15 13:21:16.956074066 -0400
-@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
- 	complete(&root->kobj_unregister);
- }
- 
--static struct sysfs_ops btrfs_super_attr_ops = {
-+static const struct sysfs_ops btrfs_super_attr_ops = {
- 	.show	= btrfs_super_attr_show,
- 	.store	= btrfs_super_attr_store,
- };
- 
--static struct sysfs_ops btrfs_root_attr_ops = {
-+static const struct sysfs_ops btrfs_root_attr_ops = {
- 	.show	= btrfs_root_attr_show,
- 	.store	= btrfs_root_attr_store,
- };
-diff -urNp linux-2.6.32.13/fs/buffer.c linux-2.6.32.13/fs/buffer.c
---- linux-2.6.32.13/fs/buffer.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/buffer.c	2010-05-15 13:21:16.978563593 -0400
-@@ -25,6 +25,7 @@
- #include <linux/percpu.h>
- #include <linux/slab.h>
- #include <linux/capability.h>
-+#include <linux/security.h>
- #include <linux/blkdev.h>
- #include <linux/file.h>
- #include <linux/quotaops.h>
-diff -urNp linux-2.6.32.13/fs/cachefiles/bind.c linux-2.6.32.13/fs/cachefiles/bind.c
---- linux-2.6.32.13/fs/cachefiles/bind.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/cachefiles/bind.c	2010-05-15 13:21:16.978563593 -0400
-@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
+diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
+index b37d723..bb02b26 100644
+--- a/fs/btrfs/relocation.c
++++ b/fs/btrfs/relocation.c
+@@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
+ 	}
+ 	spin_unlock(&rc->reloc_root_tree.lock);
+ 
+-	BUG_ON((struct btrfs_root *)node->data != root);
++	BUG_ON(!node || (struct btrfs_root *)node->data != root);
+ 
+ 	if (!del) {
+ 		spin_lock(&rc->reloc_root_tree.lock);
+diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
+index 2906077..4f99320 100644
+--- a/fs/cachefiles/bind.c
++++ b/fs/cachefiles/bind.c
+@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
  	       args);
  
  	/* start by checking things over */
@@ -30151,10 +30968,20 @@ diff -urNp linux-2.6.32.13/fs/cachefiles/bind.c linux-2.6.32.13/fs/cachefiles/bi
  	       cache->bcull_percent < cache->brun_percent &&
  	       cache->brun_percent  < 100);
  
-diff -urNp linux-2.6.32.13/fs/cachefiles/daemon.c linux-2.6.32.13/fs/cachefiles/daemon.c
---- linux-2.6.32.13/fs/cachefiles/daemon.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/cachefiles/daemon.c	2010-05-15 13:21:16.995071409 -0400
-@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
+diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
+index c241356..ab93ae5 100644
+--- a/fs/cachefiles/daemon.c
++++ b/fs/cachefiles/daemon.c
+@@ -195,7 +195,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
+ 	if (n > buflen)
+ 		return -EMSGSIZE;
+ 
+-	if (copy_to_user(_buffer, buffer, n) != 0)
++	if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
+ 		return -EFAULT;
+ 
+ 	return n;
+@@ -221,7 +221,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
  	if (test_bit(CACHEFILES_DEAD, &cache->flags))
  		return -EIO;
  
@@ -30163,7 +30990,7 @@ diff -urNp linux-2.6.32.13/fs/cachefiles/daemon.c linux-2.6.32.13/fs/cachefiles/
  		return -EOPNOTSUPP;
  
  	/* drag the command string into the kernel so we can parse it */
-@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struc
+@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
  	if (args[0] != '%' || args[1] != '\0')
  		return -EINVAL;
  
@@ -30172,7 +30999,7 @@ diff -urNp linux-2.6.32.13/fs/cachefiles/daemon.c linux-2.6.32.13/fs/cachefiles/
  		return cachefiles_daemon_range_error(cache, args);
  
  	cache->fstop_percent = fstop;
-@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struc
+@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
  	if (args[0] != '%' || args[1] != '\0')
  		return -EINVAL;
  
@@ -30181,10 +31008,11 @@ diff -urNp linux-2.6.32.13/fs/cachefiles/daemon.c linux-2.6.32.13/fs/cachefiles/
  		return cachefiles_daemon_range_error(cache, args);
  
  	cache->bstop_percent = bstop;
-diff -urNp linux-2.6.32.13/fs/cachefiles/rdwr.c linux-2.6.32.13/fs/cachefiles/rdwr.c
---- linux-2.6.32.13/fs/cachefiles/rdwr.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/cachefiles/rdwr.c	2010-05-15 13:21:16.995071409 -0400
-@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
+diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
+index 0f0d41f..3a97d43 100644
+--- a/fs/cachefiles/rdwr.c
++++ b/fs/cachefiles/rdwr.c
+@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
  			old_fs = get_fs();
  			set_fs(KERNEL_DS);
  			ret = file->f_op->write(
@@ -30193,10 +31021,33 @@ diff -urNp linux-2.6.32.13/fs/cachefiles/rdwr.c linux-2.6.32.13/fs/cachefiles/rd
  			set_fs(old_fs);
  			kunmap(page);
  			if (ret != len)
-diff -urNp linux-2.6.32.13/fs/cifs/cifs_uniupr.h linux-2.6.32.13/fs/cifs/cifs_uniupr.h
---- linux-2.6.32.13/fs/cifs/cifs_uniupr.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/cifs/cifs_uniupr.h	2010-05-15 13:21:16.995071409 -0400
-@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
+diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
+index f94ed3c..01f1d86 100644
+--- a/fs/ceph/dir.c
++++ b/fs/ceph/dir.c
+@@ -228,7 +228,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
+ 	struct ceph_client *client = ceph_inode_to_client(inode);
+ 	struct ceph_mds_client *mdsc = &client->mdsc;
+ 	unsigned frag = fpos_frag(filp->f_pos);
+-	int off = fpos_off(filp->f_pos);
++	unsigned int off = fpos_off(filp->f_pos);
+ 	int err;
+ 	u32 ftype;
+ 	struct ceph_mds_reply_info_parsed *rinfo;
+@@ -357,7 +357,7 @@ more:
+ 	rinfo = &fi->last_readdir->r_reply_info;
+ 	dout("readdir frag %x num %d off %d chunkoff %d\n", frag,
+ 	     rinfo->dir_nr, off, fi->offset);
+-	while (off - fi->offset >= 0 && off - fi->offset < rinfo->dir_nr) {
++	while (off >= fi->offset && off - fi->offset < rinfo->dir_nr) {
+ 		u64 pos = ceph_make_fpos(frag, off);
+ 		struct ceph_mds_reply_inode *in =
+ 			rinfo->dir_in[off - fi->offset].in;
+diff --git a/fs/cifs/cifs_uniupr.h b/fs/cifs/cifs_uniupr.h
+index 18a9d97..97671db 100644
+--- a/fs/cifs/cifs_uniupr.h
++++ b/fs/cifs/cifs_uniupr.h
+@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRange[] = {
  	{0x0490, 0x04cc, UniCaseRangeU0490},
  	{0x1e00, 0x1ffc, UniCaseRangeU1e00},
  	{0xff40, 0xff5a, UniCaseRangeUff40},
@@ -30205,10 +31056,11 @@ diff -urNp linux-2.6.32.13/fs/cifs/cifs_uniupr.h linux-2.6.32.13/fs/cifs/cifs_un
  };
  #endif
  
-diff -urNp linux-2.6.32.13/fs/cifs/link.c linux-2.6.32.13/fs/cifs/link.c
---- linux-2.6.32.13/fs/cifs/link.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/cifs/link.c	2010-05-15 13:21:16.995071409 -0400
-@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
+diff --git a/fs/cifs/link.c b/fs/cifs/link.c
+index 473ca80..609ff0f 100644
+--- a/fs/cifs/link.c
++++ b/fs/cifs/link.c
+@@ -216,7 +216,7 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname)
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
  {
@@ -30217,41 +31069,20 @@ diff -urNp linux-2.6.32.13/fs/cifs/link.c linux-2.6.32.13/fs/cifs/link.c
  	if (!IS_ERR(p))
  		kfree(p);
  }
-diff -urNp linux-2.6.32.13/fs/compat_binfmt_elf.c linux-2.6.32.13/fs/compat_binfmt_elf.c
---- linux-2.6.32.13/fs/compat_binfmt_elf.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/compat_binfmt_elf.c	2010-05-15 13:21:16.995071409 -0400
-@@ -29,10 +29,12 @@
- #undef	elfhdr
- #undef	elf_phdr
- #undef	elf_note
-+#undef	elf_dyn
- #undef	elf_addr_t
- #define elfhdr		elf32_hdr
- #define elf_phdr	elf32_phdr
- #define elf_note	elf32_note
-+#define elf_dyn		Elf32_Dyn
- #define elf_addr_t	Elf32_Addr
- 
- /*
-diff -urNp linux-2.6.32.13/fs/compat.c linux-2.6.32.13/fs/compat.c
---- linux-2.6.32.13/fs/compat.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/compat.c	2010-05-15 13:21:17.027084488 -0400
-@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc,
- 			if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
- 				struct page *page;
+diff --git a/fs/compat.c b/fs/compat.c
+index 34bf9fc..9969114 100644
+--- a/fs/compat.c
++++ b/fs/compat.c
+@@ -590,7 +590,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
+ 		goto out;
  
--#ifdef CONFIG_STACK_GROWSUP
- 				ret = expand_stack_downwards(bprm->vma, pos);
- 				if (ret < 0) {
- 					/* We've exceed the stack rlimit. */
- 					ret = -E2BIG;
- 					goto out;
- 				}
--#endif
- 				ret = get_user_pages(current, bprm->mm, pos,
- 						     1, 1, 1, &page, NULL);
- 				if (ret <= 0) {
-@@ -1463,6 +1461,11 @@ int compat_do_execve(char * filename,
+ 	ret = -EINVAL;
+-	if (nr_segs > UIO_MAXIOV || nr_segs < 0)
++	if (nr_segs > UIO_MAXIOV)
+ 		goto out;
+ 	if (nr_segs > fast_segs) {
+ 		ret = -ENOMEM;
+@@ -1486,6 +1486,11 @@ int compat_do_execve(char * filename,
  	compat_uptr_t __user *envp,
  	struct pt_regs * regs)
  {
@@ -30263,7 +31094,7 @@ diff -urNp linux-2.6.32.13/fs/compat.c linux-2.6.32.13/fs/compat.c
  	struct linux_binprm *bprm;
  	struct file *file;
  	struct files_struct *displaced;
-@@ -1499,6 +1502,14 @@ int compat_do_execve(char * filename,
+@@ -1522,6 +1527,14 @@ int compat_do_execve(char * filename,
  	bprm->filename = filename;
  	bprm->interp = filename;
  
@@ -30278,7 +31109,7 @@ diff -urNp linux-2.6.32.13/fs/compat.c linux-2.6.32.13/fs/compat.c
  	retval = bprm_mm_init(bprm);
  	if (retval)
  		goto out_file;
-@@ -1528,9 +1539,40 @@ int compat_do_execve(char * filename,
+@@ -1551,9 +1564,40 @@ int compat_do_execve(char * filename,
  	if (retval < 0)
  		goto out;
  
@@ -30318,9 +31149,9 @@ diff -urNp linux-2.6.32.13/fs/compat.c linux-2.6.32.13/fs/compat.c
 +		fput(old_exec_file);
 +#endif
  
- 	current->stack_start = current->mm->start_stack;
- 
-@@ -1543,6 +1585,14 @@ int compat_do_execve(char * filename,
+ 	/* execve succeeded */
+ 	current->fs->in_exec = 0;
+@@ -1564,6 +1608,14 @@ int compat_do_execve(char * filename,
  		put_files_struct(displaced);
  	return retval;
  
@@ -30333,34 +31164,44 @@ diff -urNp linux-2.6.32.13/fs/compat.c linux-2.6.32.13/fs/compat.c
 +#endif
 +
  out:
- 	if (bprm->mm)
- 		mmput(bprm->mm);
-diff -urNp linux-2.6.32.13/fs/compat_ioctl.c linux-2.6.32.13/fs/compat_ioctl.c
---- linux-2.6.32.13/fs/compat_ioctl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/compat_ioctl.c	2010-05-15 13:21:17.050796208 -0400
-@@ -1827,15 +1827,15 @@ struct ioctl_trans {
- };
- 
- #define HANDLE_IOCTL(cmd,handler) \
--	{ (cmd), (ioctl_trans_handler_t)(handler) },
-+	{ (cmd), (ioctl_trans_handler_t)(handler), NULL },
- 
- /* pointer to compatible structure or no argument */
- #define COMPATIBLE_IOCTL(cmd) \
--	{ (cmd), do_ioctl32_pointer },
-+	{ (cmd), do_ioctl32_pointer, NULL },
- 
- /* argument is an unsigned long integer, not a pointer */
- #define ULONG_IOCTL(cmd) \
--	{ (cmd), (ioctl_trans_handler_t)sys_ioctl },
-+	{ (cmd), (ioctl_trans_handler_t)sys_ioctl, NULL },
- 
- /* ioctl should not be warned about even if it's not implemented.
-    Valid reasons to use this:
-diff -urNp linux-2.6.32.13/fs/debugfs/inode.c linux-2.6.32.13/fs/debugfs/inode.c
---- linux-2.6.32.13/fs/debugfs/inode.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/debugfs/inode.c	2010-05-15 13:21:17.062663383 -0400
-@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
+ 	if (bprm->mm) {
+ 		acct_arg_size(bprm, 0);
+diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
+index 112e45a..b59845b 100644
+--- a/fs/compat_binfmt_elf.c
++++ b/fs/compat_binfmt_elf.c
+@@ -30,11 +30,13 @@
+ #undef	elf_phdr
+ #undef	elf_shdr
+ #undef	elf_note
++#undef	elf_dyn
+ #undef	elf_addr_t
+ #define elfhdr		elf32_hdr
+ #define elf_phdr	elf32_phdr
+ #define elf_shdr	elf32_shdr
+ #define elf_note	elf32_note
++#define elf_dyn		Elf32_Dyn
+ #define elf_addr_t	Elf32_Addr
+ 
+ /*
+diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
+index 641640d..7a00d9b 100644
+--- a/fs/compat_ioctl.c
++++ b/fs/compat_ioctl.c
+@@ -227,6 +227,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd,
+ 
+ 	err  = get_user(palp, &up->palette);
+ 	err |= get_user(length, &up->length);
++	if (err)
++		return -EFAULT;
+ 
+ 	up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
+ 	err  = put_user(compat_ptr(palp), &up_native->palette);
+diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
+index 30a87b3..f34d2d3 100644
+--- a/fs/debugfs/inode.c
++++ b/fs/debugfs/inode.c
+@@ -129,7 +129,7 @@ static inline int debugfs_positive(struct dentry *dentry)
  
  static int debug_fill_super(struct super_block *sb, void *data, int silent)
  {
@@ -30369,22 +31210,24 @@ diff -urNp linux-2.6.32.13/fs/debugfs/inode.c linux-2.6.32.13/fs/debugfs/inode.c
  
  	return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
  }
-diff -urNp linux-2.6.32.13/fs/dlm/lockspace.c linux-2.6.32.13/fs/dlm/lockspace.c
---- linux-2.6.32.13/fs/dlm/lockspace.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/dlm/lockspace.c	2010-05-15 13:21:17.082686362 -0400
-@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
- 	kfree(ls);
+diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
+index f994a7d..4dca551 100644
+--- a/fs/dlm/lockspace.c
++++ b/fs/dlm/lockspace.c
+@@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset, struct kobject *kobj,
+ 	return 0;
  }
  
--static struct sysfs_ops dlm_attr_ops = {
-+static const struct sysfs_ops dlm_attr_ops = {
- 	.show  = dlm_attr_show,
- 	.store = dlm_attr_store,
+-static struct kset_uevent_ops dlm_uevent_ops = {
++static const struct kset_uevent_ops dlm_uevent_ops = {
+ 	.uevent = dlm_uevent,
  };
-diff -urNp linux-2.6.32.13/fs/ecryptfs/inode.c linux-2.6.32.13/fs/ecryptfs/inode.c
---- linux-2.6.32.13/fs/ecryptfs/inode.c	2010-04-29 17:49:38.429034237 -0400
-+++ linux-2.6.32.13/fs/ecryptfs/inode.c	2010-05-15 13:21:17.090658956 -0400
-@@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc
+ 
+diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
+index db9feb5..c50e2b9 100644
+--- a/fs/ecryptfs/inode.c
++++ b/fs/ecryptfs/inode.c
+@@ -663,7 +663,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
  	old_fs = get_fs();
  	set_fs(get_ds());
  	rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
@@ -30393,19 +31236,42 @@ diff -urNp linux-2.6.32.13/fs/ecryptfs/inode.c linux-2.6.32.13/fs/ecryptfs/inode
  						   lower_bufsiz);
  	set_fs(old_fs);
  	if (rc < 0)
-@@ -701,7 +701,7 @@ static void *ecryptfs_follow_link(struct
+@@ -709,7 +709,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
  	}
  	old_fs = get_fs();
  	set_fs(get_ds());
 -	rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
 +	rc = dentry->d_inode->i_op->readlink(dentry, (__force char __user *)buf, len);
  	set_fs(old_fs);
- 	if (rc < 0)
- 		goto out_free;
-diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
---- linux-2.6.32.13/fs/exec.c	2010-04-04 20:41:50.037938751 -0400
-+++ linux-2.6.32.13/fs/exec.c	2010-05-15 13:21:17.114657511 -0400
-@@ -56,12 +56,24 @@
+ 	if (rc < 0) {
+ 		kfree(buf);
+@@ -724,7 +724,7 @@ out:
+ static void
+ ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
+ {
+-	char *buf = nd_get_link(nd);
++	const char *buf = nd_get_link(nd);
+ 	if (!IS_ERR(buf)) {
+ 		/* Free the char* */
+ 		kfree(buf);
+diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
+index 3745f61..b680a98 100644
+--- a/fs/ecryptfs/miscdev.c
++++ b/fs/ecryptfs/miscdev.c
+@@ -328,7 +328,7 @@ check_list:
+ 		goto out_unlock_msg_ctx;
+ 	i = 5;
+ 	if (msg_ctx->msg) {
+-		if (copy_to_user(&buf[i], packet_length, packet_length_size))
++		if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
+ 			goto out_unlock_msg_ctx;
+ 		i += packet_length_size;
+ 		if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
+diff --git a/fs/exec.c b/fs/exec.c
+index dd8cabd..b2adde2 100644
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -55,12 +55,24 @@
  #include <linux/fsnotify.h>
  #include <linux/fs_struct.h>
  #include <linux/pipe_fs_i.h>
@@ -30430,7 +31296,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  int core_uses_pid;
  char core_pattern[CORENAME_MAX_SIZE] = "core";
  unsigned int core_pipe_limit;
-@@ -115,7 +127,7 @@ SYSCALL_DEFINE1(uselib, const char __use
+@@ -114,7 +126,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
  		goto out;
  
  	file = do_filp_open(AT_FDCWD, tmp,
@@ -30439,7 +31305,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  				MAY_READ | MAY_EXEC | MAY_OPEN);
  	putname(tmp);
  	error = PTR_ERR(file);
-@@ -163,18 +175,10 @@ static struct page *get_arg_page(struct 
+@@ -177,18 +189,10 @@ struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
  		int write)
  {
  	struct page *page;
@@ -30461,19 +31327,19 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  		return NULL;
  
  	if (write) {
-@@ -246,6 +250,11 @@ static int __bprm_mm_init(struct linux_b
+@@ -263,6 +267,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
  	vma->vm_end = STACK_TOP_MAX;
  	vma->vm_start = vma->vm_end - PAGE_SIZE;
- 	vma->vm_flags = VM_STACK_FLAGS;
+ 	vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
 +#endif
 +
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+ 	INIT_LIST_HEAD(&vma->anon_vma_chain);
  	err = insert_vm_struct(mm, vma);
- 	if (err)
-@@ -254,6 +263,12 @@ static int __bprm_mm_init(struct linux_b
+@@ -272,6 +281,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
  	mm->stack_vm = mm->total_vm = 1;
  	up_write(&mm->mmap_sem);
  	bprm->p = vma->vm_end - sizeof(void *);
@@ -30486,7 +31352,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  	return 0;
  err:
  	up_write(&mm->mmap_sem);
-@@ -475,7 +490,7 @@ int copy_strings_kernel(int argc,char **
+@@ -506,7 +521,7 @@ int copy_strings_kernel(int argc,char ** argv, struct linux_binprm *bprm)
  	int r;
  	mm_segment_t oldfs = get_fs();
  	set_fs(KERNEL_DS);
@@ -30495,7 +31361,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  	set_fs(oldfs);
  	return r;
  }
-@@ -505,7 +520,8 @@ static int shift_arg_pages(struct vm_are
+@@ -536,7 +551,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
  	unsigned long new_end = old_end - shift;
  	struct mmu_gather *tlb;
  
@@ -30505,7 +31371,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  
  	/*
  	 * ensure there are no vmas between where we want to go
-@@ -514,6 +530,10 @@ static int shift_arg_pages(struct vm_are
+@@ -545,6 +561,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
  	if (vma != find_vma(mm, new_start))
  		return -EFAULT;
  
@@ -30516,7 +31382,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  	/*
  	 * cover the whole range: [new_start, old_end)
  	 */
-@@ -605,6 +625,14 @@ int setup_arg_pages(struct linux_binprm 
+@@ -640,8 +660,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
  	bprm->exec -= stack_shift;
  
  	down_write(&mm->mmap_sem);
@@ -30530,11 +31396,6 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
 +
  	vm_flags = VM_STACK_FLAGS;
  
- 	/*
-@@ -618,19 +646,24 @@ int setup_arg_pages(struct linux_binprm 
- 		vm_flags &= ~VM_EXEC;
- 	vm_flags |= mm->def_flags;
- 
 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
 +	if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
 +		vm_flags &= ~VM_EXEC;
@@ -30547,9 +31408,10 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
 +	}
 +#endif
 +
- 	ret = mprotect_fixup(vma, &prev, vma->vm_start, vma->vm_end,
- 			vm_flags);
- 	if (ret)
+ 	/*
+ 	 * Adjust stack execute permissions; explicitly enable for
+ 	 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
+@@ -660,13 +700,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
  		goto out_unlock;
  	BUG_ON(prev != vma);
  
@@ -30560,10 +31422,10 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
 -			goto out_unlock;
 -	}
 -
- 	stack_expand = EXTRA_STACK_VM_PAGES * PAGE_SIZE;
- 	stack_size = vma->vm_end - vma->vm_start;
- 	/*
-@@ -667,7 +700,7 @@ struct file *open_exec(const char *name)
+ 	/* mprotect_fixup is overkill to remove the temporary stack flags */
+ 	vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
+ 
+@@ -706,7 +739,7 @@ struct file *open_exec(const char *name)
  	int err;
  
  	file = do_filp_open(AT_FDCWD, name,
@@ -30572,7 +31434,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  				MAY_EXEC | MAY_OPEN);
  	if (IS_ERR(file))
  		goto out;
-@@ -704,7 +737,7 @@ int kernel_read(struct file *file, loff_
+@@ -743,7 +776,7 @@ int kernel_read(struct file *file, loff_t offset,
  	old_fs = get_fs();
  	set_fs(get_ds());
  	/* The cast to a user pointer is valid due to the set_fs() */
@@ -30581,7 +31443,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  	set_fs(old_fs);
  	return result;
  }
-@@ -1110,7 +1143,7 @@ int check_unsafe_exec(struct linux_binpr
+@@ -1161,7 +1194,7 @@ int check_unsafe_exec(struct linux_binprm *bprm)
  	}
  	rcu_read_unlock();
  
@@ -30590,7 +31452,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  		bprm->unsafe |= LSM_UNSAFE_SHARE;
  	} else {
  		res = -EAGAIN;
-@@ -1309,6 +1342,11 @@ int do_execve(char * filename,
+@@ -1357,6 +1390,11 @@ int do_execve(char * filename,
  	char __user *__user *envp,
  	struct pt_regs * regs)
  {
@@ -30602,7 +31464,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  	struct linux_binprm *bprm;
  	struct file *file;
  	struct files_struct *displaced;
-@@ -1345,6 +1383,18 @@ int do_execve(char * filename,
+@@ -1393,6 +1431,18 @@ int do_execve(char * filename,
  	bprm->filename = filename;
  	bprm->interp = filename;
  
@@ -30621,7 +31483,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  	retval = bprm_mm_init(bprm);
  	if (retval)
  		goto out_file;
-@@ -1374,10 +1424,41 @@ int do_execve(char * filename,
+@@ -1422,10 +1472,41 @@ int do_execve(char * filename,
  	if (retval < 0)
  		goto out;
  
@@ -30662,9 +31524,9 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
 +		fput(old_exec_file);
 +#endif
  
- 	current->stack_start = current->mm->start_stack;
- 
-@@ -1390,6 +1471,14 @@ int do_execve(char * filename,
+ 	/* execve succeeded */
+ 	current->fs->in_exec = 0;
+@@ -1436,6 +1517,14 @@ int do_execve(char * filename,
  		put_files_struct(displaced);
  	return retval;
  
@@ -30677,9 +31539,9 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
 +#endif
 +
  out:
- 	if (bprm->mm)
- 		mmput (bprm->mm);
-@@ -1553,6 +1642,169 @@ out:
+ 	if (bprm->mm) {
+ 		acct_arg_size(bprm, 0);
+@@ -1601,6 +1690,217 @@ out:
  	return ispipe;
  }
  
@@ -30818,11 +31680,59 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
 +				 current->comm, task_pid_nr(current), current_uid(), current_euid());
 +	print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
 +	show_regs(regs);
-+	force_sig_specific(SIGKILL, current);
++	force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
 +}
 +#endif
 +
 +#ifdef CONFIG_PAX_USERCOPY
++/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
++int object_is_on_stack(const void *obj, unsigned long len)
++{
++	const void * const stack = task_stack_page(current);
++	const void * const stackend = stack + THREAD_SIZE;
++
++#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
++	const void *frame = NULL;
++	const void *oldframe;
++#endif
++
++	if (obj + len < obj)
++		return -1;
++
++	if (obj + len <= stack || stackend <= obj)
++		return 0;
++
++	if (obj < stack || stackend < obj + len)
++		return -1;
++
++#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
++	oldframe = __builtin_frame_address(1);
++	if (oldframe)
++		frame = __builtin_frame_address(2);
++	/*
++	  low ----------------------------------------------> high
++	  [saved bp][saved ip][args][local vars][saved bp][saved ip]
++			      ^----------------^
++			  allow copies only within here
++	*/
++	while (stack <= frame && frame < stackend) {
++		/* if obj + len extends past the last frame, this
++		   check won't pass and the next frame will be 0,
++		   causing us to bail out and correctly report
++		   the copy as invalid
++		*/
++		if (obj + len <= frame)
++			return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
++		oldframe = frame;
++		frame = *(const void * const *)frame;
++	}
++	return -1;
++#else
++	return 1;
++#endif
++}
++
++
 +void pax_report_leak_to_user(const void *ptr, unsigned long len)
 +{
 +	if (current->signal->curr_ip)
@@ -30846,10 +31756,10 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
 +}
 +#endif
 +
- static int zap_process(struct task_struct *start)
+ static int zap_process(struct task_struct *start, int exit_code)
  {
  	struct task_struct *t;
-@@ -1755,17 +2007,17 @@ static void wait_for_dump_helpers(struct
+@@ -1811,17 +2111,17 @@ static void wait_for_dump_helpers(struct file *file)
  	pipe = file->f_path.dentry->d_inode->i_pipe;
  
  	pipe_lock(pipe);
@@ -30872,7 +31782,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  	pipe_unlock(pipe);
  
  }
-@@ -1836,6 +2088,10 @@ void do_coredump(long signr, int exit_co
+@@ -1929,6 +2229,10 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
  	 */
  	clear_thread_flag(TIF_SIGPENDING);
  
@@ -30883,10 +31793,11 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
  	/*
  	 * lock_kernel() because format_corename() is controlled by sysctl, which
  	 * uses lock_kernel()
-diff -urNp linux-2.6.32.13/fs/ext2/balloc.c linux-2.6.32.13/fs/ext2/balloc.c
---- linux-2.6.32.13/fs/ext2/balloc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ext2/balloc.c	2010-05-15 13:21:17.118672646 -0400
-@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
+diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
+index e8766a3..62245ac 100644
+--- a/fs/ext2/balloc.c
++++ b/fs/ext2/balloc.c
+@@ -1193,7 +1193,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
  	root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
@@ -30895,10 +31806,11 @@ diff -urNp linux-2.6.32.13/fs/ext2/balloc.c linux-2.6.32.13/fs/ext2/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-2.6.32.13/fs/ext2/xattr.c linux-2.6.32.13/fs/ext2/xattr.c
---- linux-2.6.32.13/fs/ext2/xattr.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ext2/xattr.c	2010-05-15 13:21:17.122783817 -0400
-@@ -85,8 +85,8 @@
+diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
+index 7c39157..c3f9e6c 100644
+--- a/fs/ext2/xattr.c
++++ b/fs/ext2/xattr.c
+@@ -86,8 +86,8 @@
  		printk("\n"); \
  	} while (0)
  #else
@@ -30909,10 +31821,11 @@ diff -urNp linux-2.6.32.13/fs/ext2/xattr.c linux-2.6.32.13/fs/ext2/xattr.c
  #endif
  
  static int ext2_xattr_set2(struct inode *, struct buffer_head *,
-diff -urNp linux-2.6.32.13/fs/ext3/balloc.c linux-2.6.32.13/fs/ext3/balloc.c
---- linux-2.6.32.13/fs/ext3/balloc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ext3/balloc.c	2010-05-15 13:21:17.135016428 -0400
-@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
+diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
+index 4a32511..411de07 100644
+--- a/fs/ext3/balloc.c
++++ b/fs/ext3/balloc.c
+@@ -1422,7 +1422,7 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi)
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
  	root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
@@ -30921,10 +31834,11 @@ diff -urNp linux-2.6.32.13/fs/ext3/balloc.c linux-2.6.32.13/fs/ext3/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-2.6.32.13/fs/ext3/namei.c linux-2.6.32.13/fs/ext3/namei.c
---- linux-2.6.32.13/fs/ext3/namei.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ext3/namei.c	2010-05-15 13:21:17.155157464 -0400
-@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
+diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
+index ee18408..b08bcca 100644
+--- a/fs/ext3/namei.c
++++ b/fs/ext3/namei.c
+@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
  	char *data1 = (*bh)->b_data, *data2;
  	unsigned split, move, size;
  	struct ext3_dir_entry_2 *de = NULL, *de2;
@@ -30933,9 +31847,10 @@ diff -urNp linux-2.6.32.13/fs/ext3/namei.c linux-2.6.32.13/fs/ext3/namei.c
  
  	bh2 = ext3_append (handle, dir, &newblock, &err);
  	if (!(bh2)) {
-diff -urNp linux-2.6.32.13/fs/ext3/xattr.c linux-2.6.32.13/fs/ext3/xattr.c
---- linux-2.6.32.13/fs/ext3/xattr.c	2010-04-29 17:49:38.429034237 -0400
-+++ linux-2.6.32.13/fs/ext3/xattr.c	2010-05-15 13:21:17.158583972 -0400
+diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
+index 71fb8d6..8205204 100644
+--- a/fs/ext3/xattr.c
++++ b/fs/ext3/xattr.c
 @@ -89,8 +89,8 @@
  		printk("\n"); \
  	} while (0)
@@ -30947,10 +31862,11 @@ diff -urNp linux-2.6.32.13/fs/ext3/xattr.c linux-2.6.32.13/fs/ext3/xattr.c
  #endif
  
  static void ext3_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.32.13/fs/ext4/balloc.c linux-2.6.32.13/fs/ext4/balloc.c
---- linux-2.6.32.13/fs/ext4/balloc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ext4/balloc.c	2010-05-15 13:21:17.158583972 -0400
-@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_
+diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
+index 95b7594..b31eded 100644
+--- a/fs/ext4/balloc.c
++++ b/fs/ext4/balloc.c
+@@ -522,7 +522,7 @@ int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks)
  	/* Hm, nope.  Are (enough) root reserved blocks available? */
  	if (sbi->s_resuid == current_fsuid() ||
  	    ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
@@ -30959,23 +31875,11 @@ diff -urNp linux-2.6.32.13/fs/ext4/balloc.c linux-2.6.32.13/fs/ext4/balloc.c
  		if (free_blocks >= (nblocks + dirty_blocks))
  			return 1;
  	}
-diff -urNp linux-2.6.32.13/fs/ext4/ioctl.c linux-2.6.32.13/fs/ext4/ioctl.c
---- linux-2.6.32.13/fs/ext4/ioctl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ext4/ioctl.c	2010-05-15 13:21:17.158583972 -0400
-@@ -221,6 +221,9 @@ setversion_out:
- 		struct file *donor_filp;
- 		int err;
- 
-+		/* temporary workaround for bugs in here */
-+		return -EOPNOTSUPP;
-+
- 		if (!(filp->f_mode & FMODE_READ) ||
- 		    !(filp->f_mode & FMODE_WRITE))
- 			return -EBADF;
-diff -urNp linux-2.6.32.13/fs/ext4/namei.c linux-2.6.32.13/fs/ext4/namei.c
---- linux-2.6.32.13/fs/ext4/namei.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ext4/namei.c	2010-05-15 13:21:17.183216444 -0400
-@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
+diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
+index a43e661..f54a4b5 100644
+--- a/fs/ext4/namei.c
++++ b/fs/ext4/namei.c
+@@ -1197,7 +1197,7 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
  	char *data1 = (*bh)->b_data, *data2;
  	unsigned split, move, size;
  	struct ext4_dir_entry_2 *de = NULL, *de2;
@@ -30984,21 +31888,10 @@ diff -urNp linux-2.6.32.13/fs/ext4/namei.c linux-2.6.32.13/fs/ext4/namei.c
  
  	bh2 = ext4_append (handle, dir, &newblock, &err);
  	if (!(bh2)) {
-diff -urNp linux-2.6.32.13/fs/ext4/super.c linux-2.6.32.13/fs/ext4/super.c
---- linux-2.6.32.13/fs/ext4/super.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ext4/super.c	2010-05-15 13:21:17.215811745 -0400
-@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje
- }
- 
- 
--static struct sysfs_ops ext4_attr_ops = {
-+static const struct sysfs_ops ext4_attr_ops = {
- 	.show	= ext4_attr_show,
- 	.store	= ext4_attr_store,
- };
-diff -urNp linux-2.6.32.13/fs/ext4/xattr.c linux-2.6.32.13/fs/ext4/xattr.c
---- linux-2.6.32.13/fs/ext4/xattr.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ext4/xattr.c	2010-05-15 13:21:17.227060881 -0400
+diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
+index 0433800..b87677c 100644
+--- a/fs/ext4/xattr.c
++++ b/fs/ext4/xattr.c
 @@ -82,8 +82,8 @@
  		printk("\n"); \
  	} while (0)
@@ -31010,31 +31903,35 @@ diff -urNp linux-2.6.32.13/fs/ext4/xattr.c linux-2.6.32.13/fs/ext4/xattr.c
  #endif
  
  static void ext4_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.32.13/fs/fcntl.c linux-2.6.32.13/fs/fcntl.c
---- linux-2.6.32.13/fs/fcntl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/fcntl.c	2010-05-15 13:21:17.227060881 -0400
-@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in
+diff --git a/fs/fcntl.c b/fs/fcntl.c
+index 9d175d6..7a6ae20 100644
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
+ 	if (err)
+ 		return err;
+ 
++	if (gr_handle_chroot_fowner(pid, type))
++		return -ENOENT;
++	if (gr_check_protected_task_fowner(pid, type))
++		return -EACCES;
++
+ 	f_modown(filp, pid, type, force);
+ 	return 0;
+ }
+@@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
  	switch (cmd) {
  	case F_DUPFD:
  	case F_DUPFD_CLOEXEC:
 +		gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
- 		if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
+ 		if (arg >= rlimit(RLIMIT_NOFILE))
  			break;
  		err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
-@@ -500,7 +501,8 @@ static inline int sigio_perm(struct task
- 	ret = ((fown->euid == 0 ||
- 		fown->euid == cred->suid || fown->euid == cred->uid ||
- 		fown->uid  == cred->suid || fown->uid  == cred->uid) &&
--	       !security_file_send_sigiotask(p, fown, sig));
-+	       !security_file_send_sigiotask(p, fown, sig) &&
-+	       !gr_check_protected_task(p) && !gr_pid_is_chrooted(p));
- 	rcu_read_unlock();
- 	return ret;
- }
-diff -urNp linux-2.6.32.13/fs/fifo.c linux-2.6.32.13/fs/fifo.c
---- linux-2.6.32.13/fs/fifo.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/fifo.c	2010-05-15 13:21:17.252844788 -0400
-@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
+diff --git a/fs/fifo.c b/fs/fifo.c
+index 5d6606f..c41db6c 100644
+--- a/fs/fifo.c
++++ b/fs/fifo.c
+@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
  	 */
  		filp->f_op = &read_pipefifo_fops;
  		pipe->r_counter++;
@@ -31047,7 +31944,7 @@ diff -urNp linux-2.6.32.13/fs/fifo.c linux-2.6.32.13/fs/fifo.c
  			if ((filp->f_flags & O_NONBLOCK)) {
  				/* suppress POLLHUP until we have
  				 * seen a writer */
-@@ -83,15 +83,15 @@ static int fifo_open(struct inode *inode
+@@ -82,15 +82,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
  	 *  errno=ENXIO when there is no process reading the FIFO.
  	 */
  		ret = -ENXIO;
@@ -31066,7 +31963,7 @@ diff -urNp linux-2.6.32.13/fs/fifo.c linux-2.6.32.13/fs/fifo.c
  			wait_for_partner(inode, &pipe->r_counter);
  			if (signal_pending(current))
  				goto err_wr;
-@@ -107,11 +107,11 @@ static int fifo_open(struct inode *inode
+@@ -106,11 +106,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
  	 */
  		filp->f_op = &rdwr_pipefifo_fops;
  
@@ -31081,7 +31978,7 @@ diff -urNp linux-2.6.32.13/fs/fifo.c linux-2.6.32.13/fs/fifo.c
  			wake_up_partner(inode);
  		break;
  
-@@ -125,19 +125,19 @@ static int fifo_open(struct inode *inode
+@@ -124,19 +124,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
  	return 0;
  
  err_rd:
@@ -31104,9 +32001,10 @@ diff -urNp linux-2.6.32.13/fs/fifo.c linux-2.6.32.13/fs/fifo.c
  		free_pipe_info(inode);
  
  err_nocleanup:
-diff -urNp linux-2.6.32.13/fs/file.c linux-2.6.32.13/fs/file.c
---- linux-2.6.32.13/fs/file.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/file.c	2010-05-15 13:21:17.256078508 -0400
+diff --git a/fs/file.c b/fs/file.c
+index 34bb7f7..599ad88 100644
+--- a/fs/file.c
++++ b/fs/file.c
 @@ -14,6 +14,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
@@ -31115,59 +32013,53 @@ diff -urNp linux-2.6.32.13/fs/file.c linux-2.6.32.13/fs/file.c
  #include <linux/fdtable.h>
  #include <linux/bitops.h>
  #include <linux/interrupt.h>
-@@ -257,6 +258,8 @@ int expand_files(struct files_struct *fi
+@@ -257,6 +258,7 @@ int expand_files(struct files_struct *files, int nr)
  	 * N.B. For clone tasks sharing a files structure, this test
  	 * will limit the total number of files that can be opened.
  	 */
-+
 +	gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
- 	if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
+ 	if (nr >= rlimit(RLIMIT_NOFILE))
  		return -EMFILE;
  
-diff -urNp linux-2.6.32.13/fs/fs_struct.c linux-2.6.32.13/fs/fs_struct.c
---- linux-2.6.32.13/fs/fs_struct.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/fs_struct.c	2010-05-15 13:21:17.256078508 -0400
-@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo
- 	struct task_struct *g, *p;
- 	struct fs_struct *fs;
- 	int count = 0;
-+	unsigned long flags;
+diff --git a/fs/fs_struct.c b/fs/fs_struct.c
+index eee0590..ef5bc0e 100644
+--- a/fs/fs_struct.c
++++ b/fs/fs_struct.c
+@@ -4,6 +4,7 @@
+ #include <linux/path.h>
+ #include <linux/slab.h>
+ #include <linux/fs_struct.h>
++#include <linux/grsecurity.h>
  
- 	read_lock(&tasklist_lock);
- 	do_each_thread(g, p) {
- 		task_lock(p);
-+		gr_fs_write_lock_irqsave(p, flags);
- 		fs = p->fs;
- 		if (fs) {
- 			write_lock(&fs->lock);
-@@ -66,6 +68,7 @@ void chroot_fs_refs(struct path *old_roo
+ /*
+  * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
+@@ -17,6 +18,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
+ 	old_root = fs->root;
+ 	fs->root = *path;
+ 	path_get(path);
++	gr_set_chroot_entries(current, path);
+ 	write_unlock(&fs->lock);
+ 	if (old_root.dentry)
+ 		path_put(&old_root);
+@@ -56,6 +58,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
+ 			    && fs->root.mnt == old_root->mnt) {
+ 				path_get(new_root);
+ 				fs->root = *new_root;
++				gr_set_chroot_entries(p, new_root);
+ 				count++;
  			}
- 			write_unlock(&fs->lock);
- 		}
-+		gr_fs_write_unlock_irqrestore(p, flags);
- 		task_unlock(p);
- 	} while_each_thread(g, p);
- 	read_unlock(&tasklist_lock);
-@@ -83,14 +86,17 @@ void free_fs_struct(struct fs_struct *fs
- void exit_fs(struct task_struct *tsk)
- {
- 	struct fs_struct *fs = tsk->fs;
-+	unsigned long flags;
- 
- 	if (fs) {
- 		int kill;
+ 			if (fs->pwd.dentry == old_root->dentry
+@@ -89,7 +92,8 @@ void exit_fs(struct task_struct *tsk)
  		task_lock(tsk);
-+		gr_fs_write_lock_irqsave(tsk, flags);
  		write_lock(&fs->lock);
  		tsk->fs = NULL;
 -		kill = !--fs->users;
++		gr_clear_chroot_entries(tsk);
 +		kill = !atomic_dec_return(&fs->users);
  		write_unlock(&fs->lock);
-+		gr_fs_write_unlock_irqrestore(tsk, flags);
  		task_unlock(tsk);
  		if (kill)
- 			free_fs_struct(fs);
-@@ -102,7 +108,7 @@ struct fs_struct *copy_fs_struct(struct 
+@@ -102,7 +106,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
  	struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
  	/* We don't need to lock fs - think why ;-) */
  	if (fs) {
@@ -31176,27 +32068,18 @@ diff -urNp linux-2.6.32.13/fs/fs_struct.c linux-2.6.32.13/fs/fs_struct.c
  		fs->in_exec = 0;
  		rwlock_init(&fs->lock);
  		fs->umask = old->umask;
-@@ -121,15 +127,18 @@ int unshare_fs_struct(void)
- 	struct fs_struct *fs = current->fs;
- 	struct fs_struct *new_fs = copy_fs_struct(fs);
- 	int kill;
-+	unsigned long flags;
- 
- 	if (!new_fs)
- 		return -ENOMEM;
+@@ -127,8 +131,9 @@ int unshare_fs_struct(void)
  
  	task_lock(current);
-+	gr_fs_write_lock_irqsave(current, flags);
  	write_lock(&fs->lock);
 -	kill = !--fs->users;
 +	kill = !atomic_dec_return(&fs->users);
  	current->fs = new_fs;
++	gr_set_chroot_entries(current, &new_fs->root);
  	write_unlock(&fs->lock);
-+	gr_fs_write_unlock_irqrestore(current, flags);
  	task_unlock(current);
  
- 	if (kill)
-@@ -147,7 +156,7 @@ EXPORT_SYMBOL(current_umask);
+@@ -147,7 +152,7 @@ EXPORT_SYMBOL(current_umask);
  
  /* to be mentioned only in INIT_TASK */
  struct fs_struct init_fs = {
@@ -31205,15 +32088,7 @@ diff -urNp linux-2.6.32.13/fs/fs_struct.c linux-2.6.32.13/fs/fs_struct.c
  	.lock		= __RW_LOCK_UNLOCKED(init_fs.lock),
  	.umask		= 0022,
  };
-@@ -155,6 +164,7 @@ struct fs_struct init_fs = {
- void daemonize_fs_struct(void)
- {
- 	struct fs_struct *fs = current->fs;
-+	unsigned long flags;
- 
- 	if (fs) {
- 		int kill;
-@@ -162,13 +172,15 @@ void daemonize_fs_struct(void)
+@@ -162,12 +167,13 @@ void daemonize_fs_struct(void)
  		task_lock(current);
  
  		write_lock(&init_fs.lock);
@@ -31221,20 +32096,19 @@ diff -urNp linux-2.6.32.13/fs/fs_struct.c linux-2.6.32.13/fs/fs_struct.c
 +		atomic_inc(&init_fs.users);
  		write_unlock(&init_fs.lock);
  
-+		gr_fs_write_lock_irqsave(current, flags);
  		write_lock(&fs->lock);
  		current->fs = &init_fs;
 -		kill = !--fs->users;
++		gr_set_chroot_entries(current, &current->fs->root);
 +		kill = !atomic_dec_return(&fs->users);
  		write_unlock(&fs->lock);
-+		gr_fs_write_unlock_irqrestore(current, flags);
  
  		task_unlock(current);
- 		if (kill)
-diff -urNp linux-2.6.32.13/fs/fuse/control.c linux-2.6.32.13/fs/fuse/control.c
---- linux-2.6.32.13/fs/fuse/control.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/fuse/control.c	2010-05-15 13:21:17.271074520 -0400
-@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
+diff --git a/fs/fuse/control.c b/fs/fuse/control.c
+index 3773fd6..68aa1ab 100644
+--- a/fs/fuse/control.c
++++ b/fs/fuse/control.c
+@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc)
  
  static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
  {
@@ -31243,10 +32117,11 @@ diff -urNp linux-2.6.32.13/fs/fuse/control.c linux-2.6.32.13/fs/fuse/control.c
  	struct fuse_conn *fc;
  	int err;
  
-diff -urNp linux-2.6.32.13/fs/fuse/cuse.c linux-2.6.32.13/fs/fuse/cuse.c
---- linux-2.6.32.13/fs/fuse/cuse.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/fuse/cuse.c	2010-05-15 13:21:17.289230785 -0400
-@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
+diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
+index e1f8171..4b621f0 100644
+--- a/fs/fuse/cuse.c
++++ b/fs/fuse/cuse.c
+@@ -529,8 +529,18 @@ static int cuse_channel_release(struct inode *inode, struct file *file)
  	return rc;
  }
  
@@ -31267,7 +32142,7 @@ diff -urNp linux-2.6.32.13/fs/fuse/cuse.c linux-2.6.32.13/fs/fuse/cuse.c
  
  /**************************************************************************
   * Misc stuff and module initializatiion
-@@ -575,12 +585,6 @@ static int __init cuse_init(void)
+@@ -576,12 +586,6 @@ static int __init cuse_init(void)
  	for (i = 0; i < CUSE_CONNTBL_LEN; i++)
  		INIT_LIST_HEAD(&cuse_conntbl[i]);
  
@@ -31280,98 +32155,74 @@ diff -urNp linux-2.6.32.13/fs/fuse/cuse.c linux-2.6.32.13/fs/fuse/cuse.c
  	cuse_class = class_create(THIS_MODULE, "cuse");
  	if (IS_ERR(cuse_class))
  		return PTR_ERR(cuse_class);
-diff -urNp linux-2.6.32.13/fs/fuse/dev.c linux-2.6.32.13/fs/fuse/dev.c
---- linux-2.6.32.13/fs/fuse/dev.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/fuse/dev.c	2010-05-15 13:21:17.290606220 -0400
-@@ -745,7 +745,7 @@ __releases(&fc->lock)
-  * request_end().  Otherwise add it to the processing list, and set
-  * the 'sent' flag.
-  */
+diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
+index e5cdabf..ed87427 100644
+--- a/fs/fuse/dev.c
++++ b/fs/fuse/dev.c
+@@ -1031,7 +1031,7 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file,
+ 	return err;
+ }
+ 
 -static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
 +ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
  			      unsigned long nr_segs, loff_t pos)
  {
- 	int err;
-@@ -827,6 +827,7 @@ static ssize_t fuse_dev_read(struct kioc
- 	spin_unlock(&fc->lock);
- 	return err;
+ 	struct fuse_copy_state cs;
+@@ -1045,6 +1045,8 @@ static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
+ 	return fuse_dev_do_read(fc, file, &cs, iov_length(iov, nr_segs));
  }
-+EXPORT_SYMBOL_GPL(fuse_dev_read);
- 
- static int fuse_notify_poll(struct fuse_conn *fc, unsigned int size,
- 			    struct fuse_copy_state *cs)
-@@ -885,7 +886,7 @@ static int fuse_notify_inval_entry(struc
- {
- 	struct fuse_notify_inval_entry_out outarg;
- 	int err = -EINVAL;
--	char buf[FUSE_NAME_MAX+1];
-+	char *buf = NULL;
- 	struct qstr name;
- 
- 	if (size < sizeof(outarg))
-@@ -899,6 +900,11 @@ static int fuse_notify_inval_entry(struc
- 	if (outarg.namelen > FUSE_NAME_MAX)
- 		goto err;
  
-+	err = -ENOMEM;
-+	buf = kmalloc(FUSE_NAME_MAX+1, GFP_KERNEL);
-+	if (!buf)
-+		goto err;
++EXPORT_SYMBOL_GPL(fuse_dev_read);
 +
- 	name.name = buf;
- 	name.len = outarg.namelen;
- 	err = fuse_copy_one(cs, buf, outarg.namelen + 1);
-@@ -910,17 +916,15 @@ static int fuse_notify_inval_entry(struc
- 
- 	down_read(&fc->killsb);
- 	err = -ENOENT;
--	if (!fc->sb)
--		goto err_unlock;
--
--	err = fuse_reverse_inval_entry(fc->sb, outarg.parent, &name);
--
--err_unlock:
-+	if (fc->sb)
-+		err = fuse_reverse_inval_entry(fc->sb, outarg.parent, &name);
- 	up_read(&fc->killsb);
-+	kfree(buf);
- 	return err;
+ static int fuse_dev_pipe_buf_steal(struct pipe_inode_info *pipe,
+ 				   struct pipe_buffer *buf)
+ {
+@@ -1088,7 +1090,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
+ 	ret = 0;
+ 	pipe_lock(pipe);
  
- err:
- 	fuse_copy_finish(cs);
-+	kfree(buf);
+-	if (!pipe->readers) {
++	if (!atomic_read(&pipe->readers)) {
+ 		send_sig(SIGPIPE, current, 0);
+ 		if (!ret)
+ 			ret = -EPIPE;
+@@ -1387,7 +1389,7 @@ static ssize_t fuse_dev_do_write(struct fuse_conn *fc,
  	return err;
  }
  
-@@ -987,7 +991,7 @@ static int copy_out_args(struct fuse_cop
-  * it from the list and copy the rest of the buffer to the request.
-  * The request is finished by calling request_end()
-  */
 -static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
 +ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
- 			       unsigned long nr_segs, loff_t pos)
+ 			      unsigned long nr_segs, loff_t pos)
  {
- 	int err;
-@@ -1083,8 +1087,9 @@ static ssize_t fuse_dev_write(struct kio
- 	fuse_copy_finish(&cs);
- 	return err;
+ 	struct fuse_copy_state cs;
+@@ -1400,6 +1402,8 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
+ 	return fuse_dev_do_write(fc, &cs, iov_length(iov, nr_segs));
  }
+ 
 +EXPORT_SYMBOL_GPL(fuse_dev_write);
++
+ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,
+ 				     struct file *out, loff_t *ppos,
+ 				     size_t len, unsigned int flags)
+@@ -1478,7 +1482,7 @@ out:
+ 	return ret;
+ }
  
 -static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
 +unsigned fuse_dev_poll(struct file *file, poll_table *wait)
  {
  	unsigned mask = POLLOUT | POLLWRNORM;
  	struct fuse_conn *fc = fuse_get_conn(file);
-@@ -1102,6 +1107,7 @@ static unsigned fuse_dev_poll(struct fil
- 
+@@ -1497,6 +1501,8 @@ static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
  	return mask;
  }
-+EXPORT_SYMBOL_GPL(fuse_dev_poll);
  
++EXPORT_SYMBOL_GPL(fuse_dev_poll);
++
  /*
   * Abort all requests on the given list (pending or processing)
-@@ -1210,7 +1216,7 @@ int fuse_dev_release(struct inode *inode
+  *
+@@ -1612,7 +1618,7 @@ int fuse_dev_release(struct inode *inode, struct file *file)
  }
  EXPORT_SYMBOL_GPL(fuse_dev_release);
  
@@ -31380,18 +32231,20 @@ diff -urNp linux-2.6.32.13/fs/fuse/dev.c linux-2.6.32.13/fs/fuse/dev.c
  {
  	struct fuse_conn *fc = fuse_get_conn(file);
  	if (!fc)
-@@ -1219,6 +1225,7 @@ static int fuse_dev_fasync(int fd, struc
- 	/* No locking - fasync_helper does its own locking */
+@@ -1622,6 +1628,8 @@ static int fuse_dev_fasync(int fd, struct file *file, int on)
  	return fasync_helper(fd, file, on, &fc->fasync);
  }
-+EXPORT_SYMBOL_GPL(fuse_dev_fasync);
  
++EXPORT_SYMBOL_GPL(fuse_dev_fasync);
++
  const struct file_operations fuse_dev_operations = {
  	.owner		= THIS_MODULE,
-diff -urNp linux-2.6.32.13/fs/fuse/dir.c linux-2.6.32.13/fs/fuse/dir.c
---- linux-2.6.32.13/fs/fuse/dir.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/fuse/dir.c	2010-05-15 13:21:17.295063654 -0400
-@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
+ 	.llseek		= no_llseek,
+diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
+index 3cdc5f7..f6c6f3c 100644
+--- a/fs/fuse/dir.c
++++ b/fs/fuse/dir.c
+@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *dentry)
  	return link;
  }
  
@@ -31400,10 +32253,11 @@ diff -urNp linux-2.6.32.13/fs/fuse/dir.c linux-2.6.32.13/fs/fuse/dir.c
  {
  	if (!IS_ERR(link))
  		free_page((unsigned long) link);
-diff -urNp linux-2.6.32.13/fs/fuse/fuse_i.h linux-2.6.32.13/fs/fuse/fuse_i.h
---- linux-2.6.32.13/fs/fuse/fuse_i.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/fuse/fuse_i.h	2010-05-15 13:21:17.298596794 -0400
-@@ -521,6 +521,16 @@ extern const struct file_operations fuse
+diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
+index 8f309f0..e8be634 100644
+--- a/fs/fuse/fuse_i.h
++++ b/fs/fuse/fuse_i.h
+@@ -524,6 +524,16 @@ extern const struct file_operations fuse_dev_operations;
  
  extern const struct dentry_operations fuse_dentry_operations;
  
@@ -31420,31 +32274,11 @@ diff -urNp linux-2.6.32.13/fs/fuse/fuse_i.h linux-2.6.32.13/fs/fuse/fuse_i.h
  /**
   * Inode to nodeid comparison.
   */
-diff -urNp linux-2.6.32.13/fs/gfs2/sys.c linux-2.6.32.13/fs/gfs2/sys.c
---- linux-2.6.32.13/fs/gfs2/sys.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/gfs2/sys.c	2010-05-15 13:21:17.323073000 -0400
-@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
- 	return a->store ? a->store(sdp, buf, len) : len;
- }
- 
--static struct sysfs_ops gfs2_attr_ops = {
-+static const struct sysfs_ops gfs2_attr_ops = {
- 	.show  = gfs2_attr_show,
- 	.store = gfs2_attr_store,
- };
-@@ -584,7 +584,7 @@ static int gfs2_uevent(struct kset *kset
- 	return 0;
- }
- 
--static struct kset_uevent_ops gfs2_uevent_ops = {
-+static const struct kset_uevent_ops gfs2_uevent_ops = {
- 	.uevent = gfs2_uevent,
- };
- 
-diff -urNp linux-2.6.32.13/fs/hfs/inode.c linux-2.6.32.13/fs/hfs/inode.c
---- linux-2.6.32.13/fs/hfs/inode.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/hfs/inode.c	2010-05-15 13:21:17.331804288 -0400
-@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
+diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
+index 14f5cb1..52c88ce 100644
+--- a/fs/hfs/inode.c
++++ b/fs/hfs/inode.c
+@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, struct writeback_control *wbc)
  
  	if (S_ISDIR(main_inode->i_mode)) {
  		if (fd.entrylength < sizeof(struct hfs_cat_dir))
@@ -31453,7 +32287,7 @@ diff -urNp linux-2.6.32.13/fs/hfs/inode.c linux-2.6.32.13/fs/hfs/inode.c
  		hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
  			   sizeof(struct hfs_cat_dir));
  		if (rec.type != HFS_CDR_DIR ||
-@@ -444,7 +444,7 @@ int hfs_write_inode(struct inode *inode,
+@@ -444,7 +444,7 @@ int hfs_write_inode(struct inode *inode, struct writeback_control *wbc)
  				sizeof(struct hfs_cat_file));
  	} else {
  		if (fd.entrylength < sizeof(struct hfs_cat_file))
@@ -31462,10 +32296,11 @@ diff -urNp linux-2.6.32.13/fs/hfs/inode.c linux-2.6.32.13/fs/hfs/inode.c
  		hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
  			   sizeof(struct hfs_cat_file));
  		if (rec.type != HFS_CDR_FIL ||
-diff -urNp linux-2.6.32.13/fs/hfsplus/inode.c linux-2.6.32.13/fs/hfsplus/inode.c
---- linux-2.6.32.13/fs/hfsplus/inode.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/hfsplus/inode.c	2010-05-15 13:21:17.338586981 -0400
-@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode 
+diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
+index 9bbb829..b390a55 100644
+--- a/fs/hfsplus/inode.c
++++ b/fs/hfsplus/inode.c
+@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd)
  		struct hfsplus_cat_folder *folder = &entry.folder;
  
  		if (fd->entrylength < sizeof(struct hfsplus_cat_folder))
@@ -31474,7 +32309,7 @@ diff -urNp linux-2.6.32.13/fs/hfsplus/inode.c linux-2.6.32.13/fs/hfsplus/inode.c
  		hfs_bnode_read(fd->bnode, &entry, fd->entryoffset,
  					sizeof(struct hfsplus_cat_folder));
  		hfsplus_get_perms(inode, &folder->permissions, 1);
-@@ -423,7 +423,7 @@ int hfsplus_cat_read_inode(struct inode 
+@@ -423,7 +423,7 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd)
  		struct hfsplus_cat_file *file = &entry.file;
  
  		if (fd->entrylength < sizeof(struct hfsplus_cat_file))
@@ -31483,7 +32318,7 @@ diff -urNp linux-2.6.32.13/fs/hfsplus/inode.c linux-2.6.32.13/fs/hfsplus/inode.c
  		hfs_bnode_read(fd->bnode, &entry, fd->entryoffset,
  					sizeof(struct hfsplus_cat_file));
  
-@@ -479,7 +479,7 @@ int hfsplus_cat_write_inode(struct inode
+@@ -479,7 +479,7 @@ int hfsplus_cat_write_inode(struct inode *inode)
  		struct hfsplus_cat_folder *folder = &entry.folder;
  
  		if (fd.entrylength < sizeof(struct hfsplus_cat_folder))
@@ -31492,7 +32327,7 @@ diff -urNp linux-2.6.32.13/fs/hfsplus/inode.c linux-2.6.32.13/fs/hfsplus/inode.c
  		hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
  					sizeof(struct hfsplus_cat_folder));
  		/* simple node checks? */
-@@ -501,7 +501,7 @@ int hfsplus_cat_write_inode(struct inode
+@@ -501,7 +501,7 @@ int hfsplus_cat_write_inode(struct inode *inode)
  		struct hfsplus_cat_file *file = &entry.file;
  
  		if (fd.entrylength < sizeof(struct hfsplus_cat_file))
@@ -31501,10 +32336,11 @@ diff -urNp linux-2.6.32.13/fs/hfsplus/inode.c linux-2.6.32.13/fs/hfsplus/inode.c
  		hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
  					sizeof(struct hfsplus_cat_file));
  		hfsplus_inode_write_fork(inode, &file->data_fork);
-diff -urNp linux-2.6.32.13/fs/hugetlbfs/inode.c linux-2.6.32.13/fs/hugetlbfs/inode.c
---- linux-2.6.32.13/fs/hugetlbfs/inode.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/hugetlbfs/inode.c	2010-05-15 13:21:17.367723130 -0400
-@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
+diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
+index a4e9a7e..5122666 100644
+--- a/fs/hugetlbfs/inode.c
++++ b/fs/hugetlbfs/inode.c
+@@ -908,7 +908,7 @@ static struct file_system_type hugetlbfs_fs_type = {
  	.kill_sb	= kill_litter_super,
  };
  
@@ -31513,10 +32349,11 @@ diff -urNp linux-2.6.32.13/fs/hugetlbfs/inode.c linux-2.6.32.13/fs/hugetlbfs/ino
  
  static int can_do_hugetlb_shm(void)
  {
-diff -urNp linux-2.6.32.13/fs/ioctl.c linux-2.6.32.13/fs/ioctl.c
---- linux-2.6.32.13/fs/ioctl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ioctl.c	2010-05-15 13:21:17.367723130 -0400
-@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
+diff --git a/fs/ioctl.c b/fs/ioctl.c
+index 2d140a7..ff73ae1 100644
+--- a/fs/ioctl.c
++++ b/fs/ioctl.c
+@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiemap_extent_info *fieinfo, u64 logical,
  			    u64 phys, u64 len, u32 flags)
  {
  	struct fiemap_extent extent;
@@ -31525,7 +32362,7 @@ diff -urNp linux-2.6.32.13/fs/ioctl.c linux-2.6.32.13/fs/ioctl.c
  
  	/* only count the extents */
  	if (fieinfo->fi_extents_max == 0) {
-@@ -207,7 +207,7 @@ static int ioctl_fiemap(struct file *fil
+@@ -207,7 +207,7 @@ static int ioctl_fiemap(struct file *filp, unsigned long arg)
  
  	fieinfo.fi_flags = fiemap.fm_flags;
  	fieinfo.fi_extents_max = fiemap.fm_extent_count;
@@ -31534,7 +32371,7 @@ diff -urNp linux-2.6.32.13/fs/ioctl.c linux-2.6.32.13/fs/ioctl.c
  
  	if (fiemap.fm_extent_count != 0 &&
  	    !access_ok(VERIFY_WRITE, fieinfo.fi_extents_start,
-@@ -220,7 +220,7 @@ static int ioctl_fiemap(struct file *fil
+@@ -220,7 +220,7 @@ static int ioctl_fiemap(struct file *filp, unsigned long arg)
  	error = inode->i_op->fiemap(inode, &fieinfo, fiemap.fm_start, len);
  	fiemap.fm_flags = fieinfo.fi_flags;
  	fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped;
@@ -31543,9 +32380,10 @@ diff -urNp linux-2.6.32.13/fs/ioctl.c linux-2.6.32.13/fs/ioctl.c
  		error = -EFAULT;
  
  	return error;
-diff -urNp linux-2.6.32.13/fs/jffs2/debug.h linux-2.6.32.13/fs/jffs2/debug.h
---- linux-2.6.32.13/fs/jffs2/debug.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/jffs2/debug.h	2010-05-15 13:21:17.378571837 -0400
+diff --git a/fs/jffs2/debug.h b/fs/jffs2/debug.h
+index a113ecc..b6498fb 100644
+--- a/fs/jffs2/debug.h
++++ b/fs/jffs2/debug.h
 @@ -52,13 +52,13 @@
  #if CONFIG_JFFS2_FS_DEBUG > 0
  #define D1(x) x
@@ -31647,10 +32485,11 @@ diff -urNp linux-2.6.32.13/fs/jffs2/debug.h linux-2.6.32.13/fs/jffs2/debug.h
  #endif 
  
  /* "Sanity" checks */
-diff -urNp linux-2.6.32.13/fs/jffs2/erase.c linux-2.6.32.13/fs/jffs2/erase.c
---- linux-2.6.32.13/fs/jffs2/erase.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/jffs2/erase.c	2010-05-15 13:21:17.386577527 -0400
-@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
+diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
+index 6286ad9..1ae791d 100644
+--- a/fs/jffs2/erase.c
++++ b/fs/jffs2/erase.c
+@@ -438,7 +438,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
  		struct jffs2_unknown_node marker = {
  			.magic =	cpu_to_je16(JFFS2_MAGIC_BITMASK),
  			.nodetype =	cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
@@ -31660,10 +32499,11 @@ diff -urNp linux-2.6.32.13/fs/jffs2/erase.c linux-2.6.32.13/fs/jffs2/erase.c
  		};
  
  		jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.32.13/fs/jffs2/summary.h linux-2.6.32.13/fs/jffs2/summary.h
---- linux-2.6.32.13/fs/jffs2/summary.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/jffs2/summary.h	2010-05-15 13:21:17.386577527 -0400
-@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
+diff --git a/fs/jffs2/summary.h b/fs/jffs2/summary.h
+index 60207a2..6d00658 100644
+--- a/fs/jffs2/summary.h
++++ b/fs/jffs2/summary.h
+@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb
  
  #define jffs2_sum_active() (0)
  #define jffs2_sum_init(a) (0)
@@ -31691,10 +32531,11 @@ diff -urNp linux-2.6.32.13/fs/jffs2/summary.h linux-2.6.32.13/fs/jffs2/summary.h
  #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
  
  #endif /* CONFIG_JFFS2_SUMMARY */
-diff -urNp linux-2.6.32.13/fs/jffs2/wbuf.c linux-2.6.32.13/fs/jffs2/wbuf.c
---- linux-2.6.32.13/fs/jffs2/wbuf.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/jffs2/wbuf.c	2010-05-15 13:21:17.386577527 -0400
-@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
+diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
+index 07ee154..d8b657a 100644
+--- a/fs/jffs2/wbuf.c
++++ b/fs/jffs2/wbuf.c
+@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
  {
  	.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
  	.nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
@@ -31704,10 +32545,11 @@ diff -urNp linux-2.6.32.13/fs/jffs2/wbuf.c linux-2.6.32.13/fs/jffs2/wbuf.c
  };
  
  /*
-diff -urNp linux-2.6.32.13/fs/lockd/svc.c linux-2.6.32.13/fs/lockd/svc.c
---- linux-2.6.32.13/fs/lockd/svc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/lockd/svc.c	2010-05-15 13:21:17.394616660 -0400
-@@ -43,7 +43,7 @@
+diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
+index f1bacf1..d3f9466 100644
+--- a/fs/lockd/svc.c
++++ b/fs/lockd/svc.c
+@@ -42,7 +42,7 @@
  
  static struct svc_program	nlmsvc_program;
  
@@ -31716,10 +32558,11 @@ diff -urNp linux-2.6.32.13/fs/lockd/svc.c linux-2.6.32.13/fs/lockd/svc.c
  EXPORT_SYMBOL_GPL(nlmsvc_ops);
  
  static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.32.13/fs/locks.c linux-2.6.32.13/fs/locks.c
---- linux-2.6.32.13/fs/locks.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/locks.c	2010-05-15 13:21:17.398591192 -0400
-@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
+diff --git a/fs/locks.c b/fs/locks.c
+index ab24d49..90aa5d0 100644
+--- a/fs/locks.c
++++ b/fs/locks.c
+@@ -2008,16 +2008,16 @@ void locks_remove_flock(struct file *filp)
  		return;
  
  	if (filp->f_op && filp->f_op->flock) {
@@ -31740,19 +32583,20 @@ diff -urNp linux-2.6.32.13/fs/locks.c linux-2.6.32.13/fs/locks.c
  	}
  
  	lock_kernel();
-diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
---- linux-2.6.32.13/fs/namei.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/namei.c	2010-05-15 13:21:17.402570795 -0400
-@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l
- 	cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
- 	error = PTR_ERR(cookie);
- 	if (!IS_ERR(cookie)) {
+diff --git a/fs/namei.c b/fs/namei.c
+index 868d0cb..2a48e82 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -548,7 +548,7 @@ __do_follow_link(struct path *path, struct nameidata *nd, void **p)
+ 	*p = dentry->d_inode->i_op->follow_link(dentry, nd);
+ 	error = PTR_ERR(*p);
+ 	if (!IS_ERR(*p)) {
 -		char *s = nd_get_link(nd);
 +		const char *s = nd_get_link(nd);
  		error = 0;
  		if (s)
  			error = __vfs_follow_link(nd, s);
-@@ -669,6 +669,13 @@ static inline int do_follow_link(struct 
+@@ -581,6 +581,13 @@ static inline int do_follow_link(struct path *path, struct nameidata *nd)
  	err = security_inode_follow_link(path->dentry, nd);
  	if (err)
  		goto loop;
@@ -31766,11 +32610,11 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  	current->link_count++;
  	current->total_link_count++;
  	nd->depth++;
-@@ -1016,11 +1023,18 @@ return_reval:
+@@ -965,11 +972,18 @@ return_reval:
  				break;
  		}
  return_base:
-+		if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
++		if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
 +			path_put(&nd->path);
 +			return -ENOENT;
 +		}
@@ -31779,17 +32623,17 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  		path_put_conditional(&next, nd);
  		break;
  	}
-+	if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
++	if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
 +		err = -ENOENT;
 +
  	path_put(&nd->path);
  return_err:
  	return err;
-@@ -1621,12 +1635,19 @@ static int __open_namei_create(struct na
+@@ -1506,12 +1520,19 @@ static int __open_namei_create(struct nameidata *nd, struct path *path,
  	int error;
  	struct dentry *dir = nd->path.dentry;
  
-+	if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, nd->path.mnt, flag, mode)) {
++	if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, nd->path.mnt, open_flag, mode)) {
 +		error = -EACCES;
 +		goto out_unlock;
 +	}
@@ -31805,22 +32649,30 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  out_unlock:
  	mutex_unlock(&dir->d_inode->i_mutex);
  	dput(nd->path.dentry);
-@@ -1709,6 +1730,22 @@ struct file *do_filp_open(int dfd, const
- 					 &nd, flag);
- 		if (error)
- 			return ERR_PTR(error);
+@@ -1614,6 +1635,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
+ 			    int mode, const char *pathname)
+ {
+ 	struct dentry *dir = nd->path.dentry;
++	int flag = open_to_namei_flags(open_flag);
+ 	struct file *filp;
+ 	int error = -EISDIR;
+ 
+@@ -1662,6 +1684,22 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
+ 		}
+ 		path_to_nameidata(path, nd);
+ 		audit_inode(pathname, nd->path.dentry);
 +
-+		if (gr_handle_rofs_blockwrite(nd.path.dentry, nd.path.mnt, acc_mode)) {
++		if (gr_handle_rofs_blockwrite(nd->path.dentry, nd->path.mnt, acc_mode)) {
 +			error = -EPERM;
 +			goto exit;
 +		}
 +
-+		if (gr_handle_rawio(nd.path.dentry->d_inode)) {
++		if (gr_handle_rawio(nd->path.dentry->d_inode)) {
 +			error = -EPERM;
 +			goto exit;
 +		}
 +
-+		if (!gr_acl_handle_open(nd.path.dentry, nd.path.mnt, flag)) {
++		if (!gr_acl_handle_open(nd->path.dentry, nd->path.mnt, flag)) {
 +			error = -EACCES;
 +			goto exit;
 +		}
@@ -31828,46 +32680,32 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  		goto ok;
  	}
  
-@@ -1795,6 +1832,24 @@ do_last:
+@@ -1714,6 +1752,24 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
  	/*
  	 * It already exists.
  	 */
 +
-+	if (gr_handle_rofs_blockwrite(path.dentry, nd.path.mnt, acc_mode)) {
++	if (gr_handle_rofs_blockwrite(path->dentry, nd->path.mnt, acc_mode)) {
 +		error = -EPERM;
 +		goto exit_mutex_unlock;
 +	}
-+	if (gr_handle_rawio(path.dentry->d_inode)) {
++	if (gr_handle_rawio(path->dentry->d_inode)) {
 +		error = -EPERM;
 +		goto exit_mutex_unlock;
 +	}
-+	if (!gr_acl_handle_open(path.dentry, nd.path.mnt, flag)) {
++	if (!gr_acl_handle_open(path->dentry, nd->path.mnt, flag)) {
 +		error = -EACCES;
 +		goto exit_mutex_unlock;
 +	}
-+	if (gr_handle_fifo(path.dentry, nd.path.mnt, dir, flag, acc_mode)) {
++	if (gr_handle_fifo(path->dentry, nd->path.mnt, dir, flag, acc_mode)) {
 +		error = -EACCES;
 +		goto exit_mutex_unlock;
 +	}
 +
  	mutex_unlock(&dir->d_inode->i_mutex);
- 	audit_inode(pathname, path.dentry);
+ 	audit_inode(pathname, path->dentry);
  
-@@ -1887,6 +1942,13 @@ do_link:
- 	error = security_inode_follow_link(path.dentry, &nd);
- 	if (error)
- 		goto exit_dput;
-+
-+	if (gr_handle_follow_link(path.dentry->d_parent->d_inode, path.dentry->d_inode,
-+				  path.dentry, nd.path.mnt)) {
-+		error = -EACCES;
-+		goto exit_dput;
-+	}
-+
- 	error = __do_follow_link(&path, &nd);
- 	if (error) {
- 		/* Does someone understand code flow here? Or it is only
-@@ -2061,6 +2123,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2034,6 +2090,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
  	error = may_mknod(mode);
  	if (error)
  		goto out_dput;
@@ -31885,7 +32723,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2081,6 +2154,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2054,6 +2121,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
  	}
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
@@ -31895,7 +32733,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  out_dput:
  	dput(dentry);
  out_unlock:
-@@ -2134,6 +2210,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2106,6 +2176,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
  	if (IS_ERR(dentry))
  		goto out_unlock;
  
@@ -31907,7 +32745,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  	if (!IS_POSIXACL(nd.path.dentry->d_inode))
  		mode &= ~current_umask();
  	error = mnt_want_write(nd.path.mnt);
-@@ -2145,6 +2226,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2117,6 +2192,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
  	error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
@@ -31918,7 +32756,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  out_dput:
  	dput(dentry);
  out_unlock:
-@@ -2226,6 +2311,8 @@ static long do_rmdir(int dfd, const char
+@@ -2198,6 +2277,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
  	char * name;
  	struct dentry *dentry;
  	struct nameidata nd;
@@ -31927,7 +32765,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2250,6 +2337,19 @@ static long do_rmdir(int dfd, const char
+@@ -2222,6 +2303,19 @@ static long do_rmdir(int dfd, const char __user *pathname)
  	error = PTR_ERR(dentry);
  	if (IS_ERR(dentry))
  		goto exit2;
@@ -31947,7 +32785,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto exit3;
-@@ -2257,6 +2357,8 @@ static long do_rmdir(int dfd, const char
+@@ -2229,6 +2323,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
  	if (error)
  		goto exit4;
  	error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -31956,7 +32794,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  exit4:
  	mnt_drop_write(nd.path.mnt);
  exit3:
-@@ -2318,6 +2420,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2291,6 +2387,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
  	struct dentry *dentry;
  	struct nameidata nd;
  	struct inode *inode = NULL;
@@ -31965,7 +32803,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2337,8 +2441,19 @@ static long do_unlinkat(int dfd, const c
+@@ -2310,8 +2408,19 @@ static long do_unlinkat(int dfd, const char __user *pathname)
  		if (nd.last.name[nd.last.len])
  			goto slashes;
  		inode = dentry->d_inode;
@@ -31986,7 +32824,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  		error = mnt_want_write(nd.path.mnt);
  		if (error)
  			goto exit2;
-@@ -2346,6 +2461,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2319,6 +2428,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
  		if (error)
  			goto exit3;
  		error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -31995,7 +32833,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  exit3:
  		mnt_drop_write(nd.path.mnt);
  	exit2:
-@@ -2424,6 +2541,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2396,6 +2507,11 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
  	if (IS_ERR(dentry))
  		goto out_unlock;
  
@@ -32007,7 +32845,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2431,6 +2553,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2403,6 +2519,8 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
  	if (error)
  		goto out_drop_write;
  	error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
@@ -32016,7 +32854,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -2524,6 +2648,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2495,6 +2613,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
  	error = PTR_ERR(new_dentry);
  	if (IS_ERR(new_dentry))
  		goto out_unlock;
@@ -32037,7 +32875,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2531,6 +2669,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2502,6 +2634,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
  	if (error)
  		goto out_drop_write;
  	error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
@@ -32046,7 +32884,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -2764,6 +2904,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2735,6 +2869,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
  	if (new_dentry == trap)
  		goto exit5;
  
@@ -32059,7 +32897,7 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  	error = mnt_want_write(oldnd.path.mnt);
  	if (error)
  		goto exit5;
-@@ -2773,6 +2919,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2744,6 +2884,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
  		goto exit6;
  	error = vfs_rename(old_dir->d_inode, old_dentry,
  				   new_dir->d_inode, new_dentry);
@@ -32069,10 +32907,11 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
  exit6:
  	mnt_drop_write(oldnd.path.mnt);
  exit5:
-diff -urNp linux-2.6.32.13/fs/namespace.c linux-2.6.32.13/fs/namespace.c
---- linux-2.6.32.13/fs/namespace.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/namespace.c	2010-05-15 13:21:17.430740691 -0400
-@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
+diff --git a/fs/namespace.c b/fs/namespace.c
+index 32dcd24..7536f64 100644
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1099,6 +1099,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
  		if (!(sb->s_flags & MS_RDONLY))
  			retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
  		up_write(&sb->s_umount);
@@ -32082,8 +32921,8 @@ diff -urNp linux-2.6.32.13/fs/namespace.c linux-2.6.32.13/fs/namespace.c
  		return retval;
  	}
  
-@@ -1104,6 +1107,9 @@ static int do_umount(struct vfsmount *mn
- 		security_sb_umount_busy(mnt);
+@@ -1118,6 +1121,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
+ 	spin_unlock(&vfsmount_lock);
  	up_write(&namespace_sem);
  	release_mounts(&umount_list);
 +
@@ -32092,9 +32931,9 @@ diff -urNp linux-2.6.32.13/fs/namespace.c linux-2.6.32.13/fs/namespace.c
  	return retval;
  }
  
-@@ -1955,6 +1961,16 @@ long do_mount(char *dev_name, char *dir_
- 	if (retval)
- 		goto dput_out;
+@@ -1988,6 +1994,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
+ 		   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
+ 		   MS_STRICTATIME);
  
 +	if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
 +		retval = -EPERM;
@@ -32109,7 +32948,7 @@ diff -urNp linux-2.6.32.13/fs/namespace.c linux-2.6.32.13/fs/namespace.c
  	if (flags & MS_REMOUNT)
  		retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
  				    data_page);
-@@ -1969,6 +1985,9 @@ long do_mount(char *dev_name, char *dir_
+@@ -2002,6 +2018,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
  				      dev_name, data_page);
  dput_out:
  	path_put(&path);
@@ -32119,7 +32958,7 @@ diff -urNp linux-2.6.32.13/fs/namespace.c linux-2.6.32.13/fs/namespace.c
  	return retval;
  }
  
-@@ -2175,6 +2194,12 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2208,6 +2227,12 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
  		goto out1;
  	}
  
@@ -32132,10 +32971,11 @@ diff -urNp linux-2.6.32.13/fs/namespace.c linux-2.6.32.13/fs/namespace.c
  	read_lock(&current->fs->lock);
  	root = current->fs->root;
  	path_get(&current->fs->root);
-diff -urNp linux-2.6.32.13/fs/nfs/inode.c linux-2.6.32.13/fs/nfs/inode.c
---- linux-2.6.32.13/fs/nfs/inode.c	2010-04-04 20:41:50.045778117 -0400
-+++ linux-2.6.32.13/fs/nfs/inode.c	2010-05-15 13:21:17.459288785 -0400
-@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
+diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
+index 099b351..f4966db 100644
+--- a/fs/nfs/inode.c
++++ b/fs/nfs/inode.c
+@@ -915,16 +915,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
  	return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
  }
  
@@ -32155,10 +32995,11 @@ diff -urNp linux-2.6.32.13/fs/nfs/inode.c linux-2.6.32.13/fs/nfs/inode.c
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
---- linux-2.6.32.13/fs/nfs/nfs4proc.c	2010-04-29 17:49:38.445067399 -0400
-+++ linux-2.6.32.13/fs/nfs/nfs4proc.c	2010-05-15 13:21:17.510781468 -0400
-@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct 
+diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
+index f7b7698..9ff1136 100644
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -1166,7 +1166,7 @@ static int _nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state
  static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
  {
  	struct nfs_server *server = NFS_SERVER(state->inode);
@@ -32167,7 +33008,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = _nfs4_do_open_reclaim(ctx, state);
-@@ -1173,7 +1173,7 @@ static int _nfs4_open_delegation_recall(
+@@ -1208,7 +1208,7 @@ static int _nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs
  
  int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid)
  {
@@ -32176,8 +33017,8 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	struct nfs_server *server = NFS_SERVER(state->inode);
  	int err;
  	do {
-@@ -1493,7 +1493,7 @@ static int _nfs4_open_expired(struct nfs
- static inline int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state)
+@@ -1581,7 +1581,7 @@ static int _nfs4_open_expired(struct nfs_open_context *ctx, struct nfs4_state *s
+ static int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state)
  {
  	struct nfs_server *server = NFS_SERVER(state->inode);
 -	struct nfs4_exception exception = { };
@@ -32185,7 +33026,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  
  	do {
-@@ -1593,7 +1593,7 @@ out_err:
+@@ -1697,7 +1697,7 @@ out_err:
  
  static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred)
  {
@@ -32194,7 +33035,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	struct nfs4_state *res;
  	int status;
  
-@@ -1684,7 +1684,7 @@ static int nfs4_do_setattr(struct inode 
+@@ -1788,7 +1788,7 @@ static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,
  			   struct nfs4_state *state)
  {
  	struct nfs_server *server = NFS_SERVER(inode);
@@ -32203,7 +33044,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(server,
-@@ -2050,7 +2050,7 @@ static int _nfs4_server_capabilities(str
+@@ -2166,7 +2166,7 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f
  
  int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)
  {
@@ -32212,7 +33053,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(server,
-@@ -2084,7 +2084,7 @@ static int _nfs4_lookup_root(struct nfs_
+@@ -2200,7 +2200,7 @@ static int _nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,
  static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,
  		struct nfs_fsinfo *info)
  {
@@ -32221,7 +33062,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(server,
-@@ -2173,7 +2173,7 @@ static int _nfs4_proc_getattr(struct nfs
+@@ -2289,7 +2289,7 @@ static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle,
  
  static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
  {
@@ -32230,7 +33071,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(server,
-@@ -2261,7 +2261,7 @@ static int nfs4_proc_lookupfh(struct nfs
+@@ -2377,7 +2377,7 @@ static int nfs4_proc_lookupfh(struct nfs_server *server, struct nfs_fh *dirfh,
  			      struct qstr *name, struct nfs_fh *fhandle,
  			      struct nfs_fattr *fattr)
  {
@@ -32239,7 +33080,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr);
-@@ -2290,7 +2290,7 @@ static int _nfs4_proc_lookup(struct inod
+@@ -2406,7 +2406,7 @@ static int _nfs4_proc_lookup(struct inode *dir, const struct qstr *name,
  
  static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
  {
@@ -32248,7 +33089,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2354,7 +2354,7 @@ static int _nfs4_proc_access(struct inod
+@@ -2473,7 +2473,7 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry
  
  static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry)
  {
@@ -32257,7 +33098,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2410,7 +2410,7 @@ static int _nfs4_proc_readlink(struct in
+@@ -2529,7 +2529,7 @@ static int _nfs4_proc_readlink(struct inode *inode, struct page *page,
  static int nfs4_proc_readlink(struct inode *inode, struct page *page,
  		unsigned int pgbase, unsigned int pglen)
  {
@@ -32266,7 +33107,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2508,7 +2508,7 @@ static int _nfs4_proc_remove(struct inod
+@@ -2625,7 +2625,7 @@ out:
  
  static int nfs4_proc_remove(struct inode *dir, struct qstr *name)
  {
@@ -32275,7 +33116,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2582,7 +2582,7 @@ static int _nfs4_proc_rename(struct inod
+@@ -2700,7 +2700,7 @@ out:
  static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name,
  		struct inode *new_dir, struct qstr *new_name)
  {
@@ -32284,7 +33125,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(NFS_SERVER(old_dir),
-@@ -2629,7 +2629,7 @@ static int _nfs4_proc_link(struct inode 
+@@ -2749,7 +2749,7 @@ out:
  
  static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
  {
@@ -32293,7 +33134,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2721,7 +2721,7 @@ out:
+@@ -2841,7 +2841,7 @@ out:
  static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,
  		struct page *page, unsigned int len, struct iattr *sattr)
  {
@@ -32302,7 +33143,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2752,7 +2752,7 @@ out:
+@@ -2872,7 +2872,7 @@ out:
  static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
  		struct iattr *sattr)
  {
@@ -32311,7 +33152,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2801,7 +2801,7 @@ static int _nfs4_proc_readdir(struct den
+@@ -2921,7 +2921,7 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
  static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
                    u64 cookie, struct page *page, unsigned int count, int plus)
  {
@@ -32320,7 +33161,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode),
-@@ -2849,7 +2849,7 @@ out:
+@@ -2969,7 +2969,7 @@ out:
  static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry,
  		struct iattr *sattr, dev_t rdev)
  {
@@ -32329,7 +33170,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2881,7 +2881,7 @@ static int _nfs4_proc_statfs(struct nfs_
+@@ -3001,7 +3001,7 @@ static int _nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle,
  
  static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat)
  {
@@ -32338,7 +33179,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(server,
-@@ -2912,7 +2912,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
+@@ -3032,7 +3032,7 @@ static int _nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle,
  
  static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo)
  {
@@ -32347,7 +33188,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  
  	do {
-@@ -2958,7 +2958,7 @@ static int _nfs4_proc_pathconf(struct nf
+@@ -3078,7 +3078,7 @@ static int _nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle
  static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,
  		struct nfs_pathconf *pathconf)
  {
@@ -32356,7 +33197,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  
  	do {
-@@ -3257,7 +3257,7 @@ out_free:
+@@ -3399,7 +3399,7 @@ out_free:
  
  static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen)
  {
@@ -32365,7 +33206,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	ssize_t ret;
  	do {
  		ret = __nfs4_get_acl_uncached(inode, buf, buflen);
-@@ -3313,7 +3313,7 @@ static int __nfs4_proc_set_acl(struct in
+@@ -3455,7 +3455,7 @@ static int __nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t bufl
  
  static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen)
  {
@@ -32374,7 +33215,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -3578,7 +3578,7 @@ out:
+@@ -3742,7 +3742,7 @@ out:
  int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync)
  {
  	struct nfs_server *server = NFS_SERVER(inode);
@@ -32383,7 +33224,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  	do {
  		err = _nfs4_proc_delegreturn(inode, cred, stateid, issync);
-@@ -3651,7 +3651,7 @@ out:
+@@ -3815,7 +3815,7 @@ out:
  
  static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request)
  {
@@ -32392,7 +33233,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  
  	do {
-@@ -4044,7 +4044,7 @@ static int _nfs4_do_setlk(struct nfs4_st
+@@ -4229,7 +4229,7 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f
  static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request)
  {
  	struct nfs_server *server = NFS_SERVER(state->inode);
@@ -32401,7 +33242,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  
  	do {
-@@ -4062,7 +4062,7 @@ static int nfs4_lock_reclaim(struct nfs4
+@@ -4247,7 +4247,7 @@ static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request
  static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request)
  {
  	struct nfs_server *server = NFS_SERVER(state->inode);
@@ -32410,7 +33251,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  
  	err = nfs4_set_lock_state(state, request);
-@@ -4120,7 +4120,7 @@ out:
+@@ -4312,7 +4312,7 @@ out:
  
  static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
  {
@@ -32419,7 +33260,7 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  
  	do {
-@@ -4180,7 +4180,7 @@ nfs4_proc_lock(struct file *filp, int cm
+@@ -4372,7 +4372,7 @@ nfs4_proc_lock(struct file *filp, int cmd, struct file_lock *request)
  int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl)
  {
  	struct nfs_server *server = NFS_SERVER(state->inode);
@@ -32428,10 +33269,11 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
  	int err;
  
  	err = nfs4_set_lock_state(state, fl);
-diff -urNp linux-2.6.32.13/fs/nfsd/lockd.c linux-2.6.32.13/fs/nfsd/lockd.c
---- linux-2.6.32.13/fs/nfsd/lockd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/nfsd/lockd.c	2010-05-15 13:21:17.510781468 -0400
-@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
+diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
+index 0c6d816..fd7bce7 100644
+--- a/fs/nfsd/lockd.c
++++ b/fs/nfsd/lockd.c
+@@ -61,7 +61,7 @@ nlm_fclose(struct file *filp)
  	fput(filp);
  }
  
@@ -32440,10 +33282,24 @@ diff -urNp linux-2.6.32.13/fs/nfsd/lockd.c linux-2.6.32.13/fs/nfsd/lockd.c
  	.fopen		= nlm_fopen,		/* open file for locking */
  	.fclose		= nlm_fclose,		/* close file */
  };
-diff -urNp linux-2.6.32.13/fs/nfsd/vfs.c linux-2.6.32.13/fs/nfsd/vfs.c
---- linux-2.6.32.13/fs/nfsd/vfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/nfsd/vfs.c	2010-05-15 13:21:17.539124101 -0400
-@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
+diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
+index 508941c..8f565ca 100644
+--- a/fs/nfsd/nfsctl.c
++++ b/fs/nfsd/nfsctl.c
+@@ -163,7 +163,7 @@ static int export_features_open(struct inode *inode, struct file *file)
+ 	return single_open(file, export_features_show, NULL);
+ }
+ 
+-static struct file_operations export_features_operations = {
++static const struct file_operations export_features_operations = {
+ 	.open		= export_features_open,
+ 	.read		= seq_read,
+ 	.llseek		= seq_lseek,
+diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
+index 3c11112..d7dbf3f 100644
+--- a/fs/nfsd/vfs.c
++++ b/fs/nfsd/vfs.c
+@@ -933,7 +933,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
  	} else {
  		oldfs = get_fs();
  		set_fs(KERNEL_DS);
@@ -32452,7 +33308,7 @@ diff -urNp linux-2.6.32.13/fs/nfsd/vfs.c linux-2.6.32.13/fs/nfsd/vfs.c
  		set_fs(oldfs);
  	}
  
-@@ -1060,7 +1060,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s
+@@ -1056,7 +1056,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
  
  	/* Write the data. */
  	oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -32461,7 +33317,7 @@ diff -urNp linux-2.6.32.13/fs/nfsd/vfs.c linux-2.6.32.13/fs/nfsd/vfs.c
  	set_fs(oldfs);
  	if (host_err < 0)
  		goto out_nfserr;
-@@ -1535,7 +1535,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
+@@ -1541,7 +1541,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
  	 */
  
  	oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -32470,10 +33326,11 @@ diff -urNp linux-2.6.32.13/fs/nfsd/vfs.c linux-2.6.32.13/fs/nfsd/vfs.c
  	set_fs(oldfs);
  
  	if (host_err < 0)
-diff -urNp linux-2.6.32.13/fs/nls/nls_base.c linux-2.6.32.13/fs/nls/nls_base.c
---- linux-2.6.32.13/fs/nls/nls_base.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/nls/nls_base.c	2010-05-15 13:21:17.550577951 -0400
-@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
+diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
+index 44a88a9..cad829e 100644
+--- a/fs/nls/nls_base.c
++++ b/fs/nls/nls_base.c
+@@ -41,7 +41,7 @@ static const struct utf8_table utf8_table[] =
      {0xF8,  0xF0,   3*6,    0x1FFFFF,       0x10000,   /* 4 byte sequence */},
      {0xFC,  0xF8,   4*6,    0x3FFFFFF,      0x200000,  /* 5 byte sequence */},
      {0xFE,  0xFC,   5*6,    0x7FFFFFFF,     0x4000000, /* 6 byte sequence */},
@@ -32482,10 +33339,24 @@ diff -urNp linux-2.6.32.13/fs/nls/nls_base.c linux-2.6.32.13/fs/nls/nls_base.c
  };
  
  #define UNICODE_MAX	0x0010ffff
-diff -urNp linux-2.6.32.13/fs/ntfs/file.c linux-2.6.32.13/fs/ntfs/file.c
---- linux-2.6.32.13/fs/ntfs/file.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ntfs/file.c	2010-05-15 13:21:17.582652999 -0400
-@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
+diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
+index 0f48e7c..3cba773 100644
+--- a/fs/ntfs/dir.c
++++ b/fs/ntfs/dir.c
+@@ -1329,7 +1329,7 @@ find_next_index_buffer:
+ 	ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
+ 			~(s64)(ndir->itype.index.block_size - 1)));
+ 	/* Bounds checks. */
+-	if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
++	if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
+ 		ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
+ 				"inode 0x%lx or driver bug.", vdir->i_ino);
+ 		goto err_out;
+diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
+index 113ebd9..08de6ee 100644
+--- a/fs/ntfs/file.c
++++ b/fs/ntfs/file.c
+@@ -2223,6 +2223,6 @@ const struct inode_operations ntfs_file_inode_ops = {
  #endif /* NTFS_RW */
  };
  
@@ -32494,34 +33365,24 @@ diff -urNp linux-2.6.32.13/fs/ntfs/file.c linux-2.6.32.13/fs/ntfs/file.c
  
 -const struct inode_operations ntfs_empty_inode_ops = {};
 +const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-2.6.32.13/fs/ocfs2/cluster/masklog.c linux-2.6.32.13/fs/ocfs2/cluster/masklog.c
---- linux-2.6.32.13/fs/ocfs2/cluster/masklog.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ocfs2/cluster/masklog.c	2010-05-15 13:21:17.582652999 -0400
-@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
- 	return mlog_mask_store(mlog_attr->mask, buf, count);
- }
- 
--static struct sysfs_ops mlog_attr_ops = {
-+static const struct sysfs_ops mlog_attr_ops = {
- 	.show  = mlog_show,
- 	.store = mlog_store,
- };
-diff -urNp linux-2.6.32.13/fs/ocfs2/localalloc.c linux-2.6.32.13/fs/ocfs2/localalloc.c
---- linux-2.6.32.13/fs/ocfs2/localalloc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ocfs2/localalloc.c	2010-05-15 13:21:17.587704007 -0400
-@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
+diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
+index ec6adbf..f129c5e 100644
+--- a/fs/ocfs2/localalloc.c
++++ b/fs/ocfs2/localalloc.c
+@@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
  		goto bail;
  	}
  
 -	atomic_inc(&osb->alloc_stats.moves);
 +	atomic_inc_unchecked(&osb->alloc_stats.moves);
  
- 	status = 0;
  bail:
-diff -urNp linux-2.6.32.13/fs/ocfs2/ocfs2.h linux-2.6.32.13/fs/ocfs2/ocfs2.h
---- linux-2.6.32.13/fs/ocfs2/ocfs2.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ocfs2/ocfs2.h	2010-05-15 13:21:17.612604736 -0400
-@@ -217,11 +217,11 @@ enum ocfs2_vol_state
+ 	if (handle)
+diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
+index c67003b..ff0d1d8 100644
+--- a/fs/ocfs2/ocfs2.h
++++ b/fs/ocfs2/ocfs2.h
+@@ -223,11 +223,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
  {
@@ -32538,10 +33399,11 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/ocfs2.h linux-2.6.32.13/fs/ocfs2/ocfs2.h
  };
  
  enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.32.13/fs/ocfs2/suballoc.c linux-2.6.32.13/fs/ocfs2/suballoc.c
---- linux-2.6.32.13/fs/ocfs2/suballoc.c	2010-04-29 17:49:38.449086403 -0400
-+++ linux-2.6.32.13/fs/ocfs2/suballoc.c	2010-05-15 13:21:17.655985201 -0400
-@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
+diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
+index a8e6a95..48cbcff 100644
+--- a/fs/ocfs2/suballoc.c
++++ b/fs/ocfs2/suballoc.c
+@@ -856,7 +856,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
  				mlog_errno(status);
  			goto bail;
  		}
@@ -32550,25 +33412,25 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/suballoc.c linux-2.6.32.13/fs/ocfs2/suballoc
  
  		/* You should never ask for this much metadata */
  		BUG_ON(bits_wanted >
-@@ -1654,7 +1654,7 @@ int ocfs2_claim_metadata(struct ocfs2_su
+@@ -1968,7 +1968,7 @@ int ocfs2_claim_metadata(handle_t *handle,
  		mlog_errno(status);
  		goto bail;
  	}
--	atomic_inc(&osb->alloc_stats.bg_allocs);
-+	atomic_inc_unchecked(&osb->alloc_stats.bg_allocs);
+-	atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
++	atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
  
- 	*blkno_start = bg_blkno + (u64) *suballoc_bit_start;
- 	ac->ac_bits_given += (*num_bits);
-@@ -1728,7 +1728,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s
+ 	*suballoc_loc = res.sr_bg_blkno;
+ 	*suballoc_bit_start = res.sr_bit_offset;
+@@ -2045,7 +2045,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
  		mlog_errno(status);
  		goto bail;
  	}
--	atomic_inc(&osb->alloc_stats.bg_allocs);
-+	atomic_inc_unchecked(&osb->alloc_stats.bg_allocs);
+-	atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
++	atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
  
- 	BUG_ON(num_bits != 1);
+ 	BUG_ON(res.sr_bits != 1);
  
-@@ -1830,7 +1830,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
+@@ -2150,7 +2150,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
  						      cluster_start,
  						      num_clusters);
  		if (!status)
@@ -32577,19 +33439,20 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/suballoc.c linux-2.6.32.13/fs/ocfs2/suballoc
  	} else {
  		if (min_clusters > (osb->bitmap_cpg - 1)) {
  			/* The only paths asking for contiguousness
-@@ -1858,7 +1858,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
+@@ -2176,7 +2176,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
  				ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
- 								 bg_blkno,
- 								 bg_bit_off);
+ 								 res.sr_bg_blkno,
+ 								 res.sr_bit_offset);
 -			atomic_inc(&osb->alloc_stats.bitmap_data);
 +			atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
+ 			*num_clusters = res.sr_bits;
  		}
  	}
- 	if (status < 0) {
-diff -urNp linux-2.6.32.13/fs/ocfs2/super.c linux-2.6.32.13/fs/ocfs2/super.c
---- linux-2.6.32.13/fs/ocfs2/super.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/ocfs2/super.c	2010-05-15 13:21:17.677940986 -0400
-@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
+diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
+index 0eaa929..e60cd1e 100644
+--- a/fs/ocfs2/super.c
++++ b/fs/ocfs2/super.c
+@@ -293,11 +293,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
  			"%10s => GlobalAllocs: %d  LocalAllocs: %d  "
  			"SubAllocs: %d  LAWinMoves: %d  SAExtends: %d\n",
  			"Stats",
@@ -32606,9 +33469,9 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/super.c linux-2.6.32.13/fs/ocfs2/super.c
  
  	out += snprintf(buf + out, len - out,
  			"%10s => State: %u  Descriptor: %llu  Size: %u bits  "
-@@ -1998,11 +1998,11 @@ static int ocfs2_initialize_super(struct
+@@ -2047,11 +2047,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
  	spin_lock_init(&osb->osb_xattr_lock);
- 	ocfs2_init_inode_steal_slot(osb);
+ 	ocfs2_init_steal_slots(osb);
  
 -	atomic_set(&osb->alloc_stats.moves, 0);
 -	atomic_set(&osb->alloc_stats.local_data, 0);
@@ -32623,10 +33486,24 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/super.c linux-2.6.32.13/fs/ocfs2/super.c
  
  	/* Copy the blockcheck stats from the superblock probe */
  	osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.32.13/fs/open.c linux-2.6.32.13/fs/open.c
---- linux-2.6.32.13/fs/open.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/open.c	2010-05-15 13:21:17.687346474 -0400
-@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
+diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
+index 9975457..7a170f2 100644
+--- a/fs/ocfs2/symlink.c
++++ b/fs/ocfs2/symlink.c
+@@ -148,7 +148,7 @@ bail:
+ 
+ static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
+ {
+-	char *link = nd_get_link(nd);
++	const char *link = nd_get_link(nd);
+ 	if (!IS_ERR(link))
+ 		kfree(link);
+ }
+diff --git a/fs/open.c b/fs/open.c
+index 5463266..fbbbe4c 100644
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -42,6 +42,9 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
  	if (length < 0)
  		return -EINVAL;
  
@@ -32636,7 +33513,7 @@ diff -urNp linux-2.6.32.13/fs/open.c linux-2.6.32.13/fs/open.c
  	newattrs.ia_size = length;
  	newattrs.ia_valid = ATTR_SIZE | time_attrs;
  	if (filp) {
-@@ -511,6 +514,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con
+@@ -345,6 +348,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
  	if (__mnt_is_readonly(path.mnt))
  		res = -EROFS;
  
@@ -32646,7 +33523,7 @@ diff -urNp linux-2.6.32.13/fs/open.c linux-2.6.32.13/fs/open.c
  out_path_release:
  	path_put(&path);
  out:
-@@ -537,6 +543,8 @@ SYSCALL_DEFINE1(chdir, const char __user
+@@ -371,6 +377,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
  	if (error)
  		goto dput_and_out;
  
@@ -32655,7 +33532,7 @@ diff -urNp linux-2.6.32.13/fs/open.c linux-2.6.32.13/fs/open.c
  	set_fs_pwd(current->fs, &path);
  
  dput_and_out:
-@@ -563,6 +571,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd
+@@ -397,6 +405,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
  		goto out_putf;
  
  	error = inode_permission(inode, MAY_EXEC | MAY_ACCESS);
@@ -32669,8 +33546,8 @@ diff -urNp linux-2.6.32.13/fs/open.c linux-2.6.32.13/fs/open.c
  	if (!error)
  		set_fs_pwd(current->fs, &file->f_path);
  out_putf:
-@@ -588,7 +603,18 @@ SYSCALL_DEFINE1(chroot, const char __use
- 	if (!capable(CAP_SYS_CHROOT))
+@@ -425,7 +440,18 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
+ 	if (error)
  		goto dput_and_out;
  
 +	if (gr_handle_chroot_chroot(path.dentry, path.mnt))
@@ -32688,121 +33565,73 @@ diff -urNp linux-2.6.32.13/fs/open.c linux-2.6.32.13/fs/open.c
  	error = 0;
  dput_and_out:
  	path_put(&path);
-@@ -616,13 +642,28 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
+@@ -453,12 +479,25 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd, mode_t, mode)
  	err = mnt_want_write_file(file);
  	if (err)
  		goto out_putf;
 +
+ 	mutex_lock(&inode->i_mutex);
++
 +	if (!gr_acl_handle_fchmod(dentry, file->f_path.mnt, mode)) {
 +		err = -EACCES;
-+		goto out_drop_write;
++		goto out_unlock;
 +	}
 +
- 	mutex_lock(&inode->i_mutex);
+ 	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_path.mnt, mode)) {
-+		err = -EPERM;
-+		mutex_unlock(&inode->i_mutex);
-+		goto out_drop_write;
++		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);
- 	mutex_unlock(&inode->i_mutex);
-+
-+out_drop_write:
- 	mnt_drop_write(file->f_path.mnt);
- out_putf:
- 	fput(file);
-@@ -645,13 +686,28 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -486,12 +525,25 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, mode_t, mode)
  	error = mnt_want_write(path.mnt);
  	if (error)
  		goto dput_and_out;
 +
+ 	mutex_lock(&inode->i_mutex);
++
 +	if (!gr_acl_handle_chmod(path.dentry, path.mnt, mode)) {
 +		error = -EACCES;
-+		goto out_drop_write;
++		goto out_unlock;
 +	}
 +
- 	mutex_lock(&inode->i_mutex);
+ 	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)) {
 +		error = -EACCES;
-+		mutex_unlock(&inode->i_mutex);
-+		goto out_drop_write;
++		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);
- 	mutex_unlock(&inode->i_mutex);
-+
-+out_drop_write:
- 	mnt_drop_write(path.mnt);
- dput_and_out:
- 	path_put(&path);
-@@ -664,12 +720,15 @@ SYSCALL_DEFINE2(chmod, const char __user
- 	return sys_fchmodat(AT_FDCWD, filename, mode);
- }
- 
--static int chown_common(struct dentry * dentry, uid_t user, gid_t group)
-+static int chown_common(struct dentry * dentry, uid_t user, gid_t group, struct vfsmount *mnt)
- {
- 	struct inode *inode = dentry->d_inode;
+@@ -515,6 +567,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
  	int error;
  	struct iattr newattrs;
  
-+	if (!gr_acl_handle_chown(dentry, mnt))
++	if (!gr_acl_handle_chown(path->dentry, path->mnt))
 +		return -EACCES;
 +
  	newattrs.ia_valid =  ATTR_CTIME;
  	if (user != (uid_t) -1) {
  		newattrs.ia_valid |= ATTR_UID;
-@@ -700,7 +759,7 @@ SYSCALL_DEFINE3(chown, const char __user
- 	error = mnt_want_write(path.mnt);
- 	if (error)
- 		goto out_release;
--	error = chown_common(path.dentry, user, group);
-+	error = chown_common(path.dentry, user, group, path.mnt);
- 	mnt_drop_write(path.mnt);
- out_release:
- 	path_put(&path);
-@@ -725,7 +784,7 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
- 	error = mnt_want_write(path.mnt);
- 	if (error)
- 		goto out_release;
--	error = chown_common(path.dentry, user, group);
-+	error = chown_common(path.dentry, user, group, path.mnt);
- 	mnt_drop_write(path.mnt);
- out_release:
- 	path_put(&path);
-@@ -744,7 +803,7 @@ SYSCALL_DEFINE3(lchown, const char __use
- 	error = mnt_want_write(path.mnt);
- 	if (error)
- 		goto out_release;
--	error = chown_common(path.dentry, user, group);
-+	error = chown_common(path.dentry, user, group, path.mnt);
- 	mnt_drop_write(path.mnt);
- out_release:
- 	path_put(&path);
-@@ -767,7 +826,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd
- 		goto out_fput;
- 	dentry = file->f_path.dentry;
- 	audit_inode(NULL, dentry);
--	error = chown_common(dentry, user, group);
-+	error = chown_common(dentry, user, group, file->f_path.mnt);
- 	mnt_drop_write(file->f_path.mnt);
- out_fput:
- 	fput(file);
-diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
---- linux-2.6.32.13/fs/pipe.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/pipe.c	2010-05-15 13:21:17.687346474 -0400
-@@ -401,9 +401,9 @@ redo:
+diff --git a/fs/pipe.c b/fs/pipe.c
+index a58d7ee..e17c9f2 100644
+--- a/fs/pipe.c
++++ b/fs/pipe.c
+@@ -420,9 +420,9 @@ redo:
  		}
  		if (bufs)	/* More to do? */
  			continue;
@@ -32814,7 +33643,7 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
  			/* syscall merging: Usually we must not sleep
  			 * if O_NONBLOCK is set, or if we got some data.
  			 * But if a writer sleeps in kernel space, then
-@@ -462,7 +462,7 @@ pipe_write(struct kiocb *iocb, const str
+@@ -481,7 +481,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
  	mutex_lock(&inode->i_mutex);
  	pipe = inode->i_pipe;
  
@@ -32823,7 +33652,7 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
  		send_sig(SIGPIPE, current, 0);
  		ret = -EPIPE;
  		goto out;
-@@ -511,7 +511,7 @@ redo1:
+@@ -530,7 +530,7 @@ redo1:
  	for (;;) {
  		int bufs;
  
@@ -32832,7 +33661,7 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
  			send_sig(SIGPIPE, current, 0);
  			if (!ret)
  				ret = -EPIPE;
-@@ -597,9 +597,9 @@ redo2:
+@@ -616,9 +616,9 @@ redo2:
  			kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
  			do_wakeup = 0;
  		}
@@ -32844,7 +33673,7 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
  	}
  out:
  	mutex_unlock(&inode->i_mutex);
-@@ -666,7 +666,7 @@ pipe_poll(struct file *filp, poll_table 
+@@ -685,7 +685,7 @@ pipe_poll(struct file *filp, poll_table *wait)
  	mask = 0;
  	if (filp->f_mode & FMODE_READ) {
  		mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
@@ -32853,7 +33682,7 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
  			mask |= POLLHUP;
  	}
  
-@@ -676,7 +676,7 @@ pipe_poll(struct file *filp, poll_table 
+@@ -695,7 +695,7 @@ pipe_poll(struct file *filp, poll_table *wait)
  		 * Most Unices do not set POLLERR for FIFOs but on Linux they
  		 * behave exactly like pipes for poll().
  		 */
@@ -32862,7 +33691,7 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
  			mask |= POLLERR;
  	}
  
-@@ -690,10 +690,10 @@ pipe_release(struct inode *inode, int de
+@@ -709,10 +709,10 @@ pipe_release(struct inode *inode, int decr, int decw)
  
  	mutex_lock(&inode->i_mutex);
  	pipe = inode->i_pipe;
@@ -32876,7 +33705,7 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
  		free_pipe_info(inode);
  	} else {
  		wake_up_interruptible_sync(&pipe->wait);
-@@ -783,7 +783,7 @@ pipe_read_open(struct inode *inode, stru
+@@ -802,7 +802,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
  
  	if (inode->i_pipe) {
  		ret = 0;
@@ -32885,7 +33714,7 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
  	}
  
  	mutex_unlock(&inode->i_mutex);
-@@ -800,7 +800,7 @@ pipe_write_open(struct inode *inode, str
+@@ -819,7 +819,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
  
  	if (inode->i_pipe) {
  		ret = 0;
@@ -32894,7 +33723,7 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
  	}
  
  	mutex_unlock(&inode->i_mutex);
-@@ -818,9 +818,9 @@ pipe_rdwr_open(struct inode *inode, stru
+@@ -837,9 +837,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
  	if (inode->i_pipe) {
  		ret = 0;
  		if (filp->f_mode & FMODE_READ)
@@ -32906,16 +33735,16 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
  	}
  
  	mutex_unlock(&inode->i_mutex);
-@@ -905,7 +905,7 @@ void free_pipe_info(struct inode *inode)
+@@ -931,7 +931,7 @@ void free_pipe_info(struct inode *inode)
  	inode->i_pipe = NULL;
  }
  
 -static struct vfsmount *pipe_mnt __read_mostly;
 +struct vfsmount *pipe_mnt __read_mostly;
- static int pipefs_delete_dentry(struct dentry *dentry)
- {
- 	/*
-@@ -945,7 +945,8 @@ static struct inode * get_pipe_inode(voi
+ 
+ /*
+  * pipefs_dname() is called from d_path().
+@@ -959,7 +959,8 @@ static struct inode * get_pipe_inode(void)
  		goto fail_iput;
  	inode->i_pipe = pipe;
  
@@ -32925,12 +33754,52 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
  	inode->i_fop = &rdwr_pipefifo_fops;
  
  	/*
-diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c
---- linux-2.6.32.13/fs/proc/array.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/array.c	2010-05-15 13:21:17.690587811 -0400
-@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct
+diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
+index 50f8f06..c5755df 100644
+--- a/fs/proc/Kconfig
++++ b/fs/proc/Kconfig
+@@ -30,12 +30,12 @@ config PROC_FS
+ 
+ config PROC_KCORE
+ 	bool "/proc/kcore support" if !ARM
+-	depends on PROC_FS && MMU
++	depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
+ 
+ config PROC_VMCORE
+         bool "/proc/vmcore support (EXPERIMENTAL)"
+-        depends on PROC_FS && CRASH_DUMP
+-	default y
++        depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
++	default n
+         help
+         Exports the dump image of crashed kernel in ELF format.
+ 
+@@ -59,8 +59,8 @@ config PROC_SYSCTL
+ 	  limited in memory.
+ 
+ config PROC_PAGE_MONITOR
+- 	default y
+-	depends on PROC_FS && MMU
++ 	default n
++	depends on PROC_FS && MMU && !GRKERNSEC
+ 	bool "Enable /proc page monitoring" if EMBEDDED
+  	help
+ 	  Various /proc files exist to monitor process memory utilization:
+diff --git a/fs/proc/array.c b/fs/proc/array.c
+index fff6572..7e9ce8c 100644
+--- a/fs/proc/array.c
++++ b/fs/proc/array.c
+@@ -60,6 +60,7 @@
+ #include <linux/tty.h>
+ #include <linux/string.h>
+ #include <linux/mman.h>
++#include <linux/grsecurity.h>
+ #include <linux/proc_fs.h>
+ #include <linux/ioport.h>
+ #include <linux/uaccess.h>
+@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
+ 	seq_printf(m, "\n");
  }
- #endif		/* CONFIG_MMU */
  
 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
 +static inline void task_pax(struct seq_file *m, struct task_struct *p)
@@ -32950,15 +33819,19 @@ diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c
  int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
  			struct pid *pid, struct task_struct *task)
  {
-@@ -430,9 +445,20 @@ int proc_pid_status(struct seq_file *m, 
+@@ -357,9 +373,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
+ 	task_show_regs(m, task);
  #endif
  	task_context_switch_counts(m, task);
- 	task_show_stack_usage(m, task);
 +
 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
 +	task_pax(m, task);
 +#endif
 +
++#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
++	task_grsec_rbac(m, task);
++#endif
++
  	return 0;
  }
  
@@ -32971,8 +33844,8 @@ diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c
  static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  			struct pid *pid, struct task_struct *task, int whole)
  {
-@@ -529,6 +555,19 @@ static int do_task_stat(struct seq_file 
- 		gtime = task_gtime(task);
+@@ -452,6 +483,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+ 		gtime = task->gtime;
  	}
  
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
@@ -32991,23 +33864,23 @@ diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c
  	/* scale priority and nice values from timeslices to -20..20 */
  	/* to make it look like a "normal" Unix priority/nice value  */
  	priority = task_prio(task);
-@@ -569,9 +608,15 @@ static int do_task_stat(struct seq_file 
+@@ -492,9 +536,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  		vsize,
  		mm ? get_mm_rss(mm) : 0,
  		rsslim,
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
 +		PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->start_code : 0),
 +		PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->end_code : 0),
-+		PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? task->stack_start : 0),
++		PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
 +#else
  		mm ? mm->start_code : 0,
  		mm ? mm->end_code : 0,
- 		(permitted && mm) ? task->stack_start : 0,
+ 		(permitted && mm) ? mm->start_stack : 0,
 +#endif
  		esp,
  		eip,
  		/* The signal information here is obsolete.
-@@ -624,3 +669,10 @@ int proc_pid_statm(struct seq_file *m, s
+@@ -547,3 +597,10 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
  
  	return 0;
  }
@@ -33018,10 +33891,11 @@ diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c
 +	return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
 +}
 +#endif
-diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
---- linux-2.6.32.13/fs/proc/base.c	2010-05-15 13:20:19.242597763 -0400
-+++ linux-2.6.32.13/fs/proc/base.c	2010-05-15 13:21:17.690587811 -0400
-@@ -102,6 +102,22 @@ struct pid_entry {
+diff --git a/fs/proc/base.c b/fs/proc/base.c
+index acb7ef8..ea8797b 100644
+--- a/fs/proc/base.c
++++ b/fs/proc/base.c
+@@ -103,6 +103,22 @@ struct pid_entry {
  	union proc_op op;
  };
  
@@ -33044,7 +33918,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  #define NOD(NAME, MODE, IOP, FOP, OP) {			\
  	.name = (NAME),					\
  	.len  = sizeof(NAME) - 1,			\
-@@ -213,6 +229,9 @@ static int check_mem_permission(struct t
+@@ -202,6 +218,9 @@ static int check_mem_permission(struct task_struct *task)
  	if (task == current)
  		return 0;
  
@@ -33054,7 +33928,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  	/*
  	 * If current is actively ptrace'ing, and would also be
  	 * permitted to freshly attach with ptrace now, permit it.
-@@ -260,6 +279,9 @@ static int proc_pid_cmdline(struct task_
+@@ -249,6 +268,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
  	if (!mm->arg_end)
  		goto out_mm;	/* Shh! No looking before we're done */
  
@@ -33064,7 +33938,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
   	len = mm->arg_end - mm->arg_start;
   
  	if (len > PAGE_SIZE)
-@@ -287,12 +309,26 @@ out:
+@@ -276,12 +298,28 @@ out:
  	return res;
  }
  
@@ -33082,7 +33956,9 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  		unsigned int nwords = 0;
 +
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
-+		if (PAX_RAND_FLAGS(mm)) {
++		/* allow if we're currently ptracing this task */
++		if (PAX_RAND_FLAGS(mm) &&
++		    (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
 +			mmput(mm);
 +			return res;
 +		}
@@ -33091,7 +33967,16 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  		do {
  			nwords += 2;
  		} while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
-@@ -328,7 +364,7 @@ static int proc_pid_wchan(struct task_st
+@@ -295,7 +333,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
+ }
+ 
+ 
+-#ifdef CONFIG_KALLSYMS
++#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
+ /*
+  * Provides a wchan file via kallsyms in a proper one-value-per-file format.
+  * Returns the resolved symbol.  If that fails, simply return the address.
+@@ -317,7 +355,7 @@ static int proc_pid_wchan(struct task_struct *task, char *buffer)
  }
  #endif /* CONFIG_KALLSYMS */
  
@@ -33100,7 +33985,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  
  #define MAX_STACK_TRACE_DEPTH	64
  
-@@ -522,7 +558,7 @@ static int proc_pid_limits(struct task_s
+@@ -511,7 +549,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
  	return count;
  }
  
@@ -33109,7 +33994,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  static int proc_pid_syscall(struct task_struct *task, char *buffer)
  {
  	long nr;
-@@ -936,6 +972,9 @@ static ssize_t environ_read(struct file 
+@@ -920,6 +958,9 @@ static ssize_t environ_read(struct file *file, char __user *buf,
  	if (!task)
  		goto out_no_task;
  
@@ -33119,7 +34004,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  	if (!ptrace_may_access(task, PTRACE_MODE_READ))
  		goto out;
  
-@@ -1456,7 +1495,11 @@ static struct inode *proc_pid_make_inode
+@@ -1514,7 +1555,11 @@ static struct inode *proc_pid_make_inode(struct super_block * sb, struct task_st
  		rcu_read_lock();
  		cred = __task_cred(task);
  		inode->i_uid = cred->euid;
@@ -33131,7 +34016,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  		rcu_read_unlock();
  	}
  	security_task_to_inode(task, inode);
-@@ -1474,6 +1517,9 @@ static int pid_getattr(struct vfsmount *
+@@ -1532,6 +1577,9 @@ static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat
  	struct inode *inode = dentry->d_inode;
  	struct task_struct *task;
  	const struct cred *cred;
@@ -33141,7 +34026,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  
  	generic_fillattr(inode, stat);
  
-@@ -1481,12 +1527,34 @@ static int pid_getattr(struct vfsmount *
+@@ -1539,12 +1587,34 @@ static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat
  	stat->uid = 0;
  	stat->gid = 0;
  	task = pid_task(proc_pid(inode), PIDTYPE_PID);
@@ -33177,7 +34062,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  		}
  	}
  	rcu_read_unlock();
-@@ -1518,11 +1586,20 @@ static int pid_revalidate(struct dentry 
+@@ -1576,11 +1646,20 @@ static int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
  
  	if (task) {
  		if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
@@ -33198,7 +34083,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  			rcu_read_unlock();
  		} else {
  			inode->i_uid = 0;
-@@ -1643,7 +1720,8 @@ static int proc_fd_info(struct inode *in
+@@ -1701,7 +1780,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
  	int fd = proc_fd(inode);
  
  	if (task) {
@@ -33208,7 +34093,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  		put_task_struct(task);
  	}
  	if (files) {
-@@ -1895,12 +1973,22 @@ static const struct file_operations proc
+@@ -1953,12 +2033,22 @@ static const struct file_operations proc_fd_operations = {
  static int proc_fd_permission(struct inode *inode, int mask)
  {
  	int rv;
@@ -33233,7 +34118,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  	return rv;
  }
  
-@@ -2009,6 +2097,9 @@ static struct dentry *proc_pident_lookup
+@@ -2067,6 +2157,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
  	if (!task)
  		goto out_no_task;
  
@@ -33243,7 +34128,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/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.
-@@ -2053,6 +2144,9 @@ static int proc_pident_readdir(struct fi
+@@ -2111,6 +2204,9 @@ static int proc_pident_readdir(struct file *filp,
  	if (!task)
  		goto out_no_task;
  
@@ -33253,7 +34138,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  	ret = 0;
  	i = filp->f_pos;
  	switch (i) {
-@@ -2320,7 +2414,7 @@ static void *proc_self_follow_link(struc
+@@ -2380,7 +2476,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
  static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
  				void *cookie)
  {
@@ -33262,27 +34147,21 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  	if (!IS_ERR(s))
  		__putname(s);
  }
-@@ -2433,6 +2527,9 @@ static struct dentry *proc_base_lookup(s
- 	if (p > last)
- 		goto out;
- 
-+	if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
-+		goto out;
-+
- 	error = proc_base_instantiate(dir, dentry, task, p);
- 
- out:
-@@ -2519,7 +2616,7 @@ static const struct pid_entry tgid_base_
- #ifdef CONFIG_SCHED_DEBUG
+@@ -2580,7 +2676,7 @@ static const struct pid_entry tgid_base_stuff[] = {
  	REG("sched",      S_IRUGO|S_IWUSR, proc_pid_sched_operations),
  #endif
+ 	REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
  	INF("syscall",    S_IRUSR, proc_pid_syscall),
  #endif
  	INF("cmdline",    S_IRUGO, proc_pid_cmdline),
-@@ -2547,7 +2644,7 @@ static const struct pid_entry tgid_base_
- #ifdef CONFIG_KALLSYMS
+@@ -2605,10 +2701,10 @@ static const struct pid_entry tgid_base_stuff[] = {
+ #ifdef CONFIG_SECURITY
+ 	DIR("attr",       S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
+ #endif
+-#ifdef CONFIG_KALLSYMS
++#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
  	INF("wchan",      S_IRUGO, proc_pid_wchan),
  #endif
 -#ifdef CONFIG_STACKTRACE
@@ -33290,7 +34169,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  	ONE("stack",      S_IRUSR, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-@@ -2577,6 +2674,9 @@ static const struct pid_entry tgid_base_
+@@ -2638,6 +2734,9 @@ static const struct pid_entry tgid_base_stuff[] = {
  #ifdef CONFIG_TASK_IO_ACCOUNTING
  	INF("io",	S_IRUGO, proc_tgid_io_accounting),
  #endif
@@ -33300,7 +34179,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  };
  
  static int proc_tgid_base_readdir(struct file * filp,
-@@ -2701,7 +2801,14 @@ static struct dentry *proc_pid_instantia
+@@ -2762,7 +2861,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
  	if (!inode)
  		goto out;
  
@@ -33315,11 +34194,11 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  	inode->i_op = &proc_tgid_base_inode_operations;
  	inode->i_fop = &proc_tgid_base_operations;
  	inode->i_flags|=S_IMMUTABLE;
-@@ -2743,7 +2850,11 @@ struct dentry *proc_pid_lookup(struct in
+@@ -2804,7 +2910,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
  	if (!task)
  		goto out;
  
-+	if (gr_check_hidden_task(task))
++	if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
 +		goto out_put_task;
 +
  	result = proc_pid_instantiate(dir, dentry, task, NULL);
@@ -33327,7 +34206,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  	put_task_struct(task);
  out:
  	return result;
-@@ -2808,6 +2919,11 @@ int proc_pid_readdir(struct file * filp,
+@@ -2869,6 +2979,11 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
  {
  	unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
  	struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
@@ -33339,7 +34218,7 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  	struct tgid_iter iter;
  	struct pid_namespace *ns;
  
-@@ -2826,8 +2942,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -2887,8 +3002,27 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
  	for (iter = next_tgid(ns, iter);
  	     iter.task;
  	     iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -33368,17 +34247,21 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  			put_task_struct(iter.task);
  			goto out;
  		}
-@@ -2853,7 +2988,7 @@ static const struct pid_entry tid_base_s
- #ifdef CONFIG_SCHED_DEBUG
+@@ -2915,7 +3049,7 @@ static const struct pid_entry tid_base_stuff[] = {
  	REG("sched",     S_IRUGO|S_IWUSR, proc_pid_sched_operations),
  #endif
+ 	REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
  	INF("syscall",   S_IRUSR, proc_pid_syscall),
  #endif
  	INF("cmdline",   S_IRUGO, proc_pid_cmdline),
-@@ -2880,7 +3015,7 @@ static const struct pid_entry tid_base_s
- #ifdef CONFIG_KALLSYMS
+@@ -2939,10 +3073,10 @@ static const struct pid_entry tid_base_stuff[] = {
+ #ifdef CONFIG_SECURITY
+ 	DIR("attr",      S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
+ #endif
+-#ifdef CONFIG_KALLSYMS
++#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
  	INF("wchan",     S_IRUGO, proc_pid_wchan),
  #endif
 -#ifdef CONFIG_STACKTRACE
@@ -33386,10 +34269,11 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
  	ONE("stack",      S_IRUSR, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.32.13/fs/proc/cmdline.c linux-2.6.32.13/fs/proc/cmdline.c
---- linux-2.6.32.13/fs/proc/cmdline.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/cmdline.c	2010-05-15 13:21:17.694581759 -0400
-@@ -23,7 +23,11 @@ static const struct file_operations cmdl
+diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
+index 82676e3..5f8518a 100644
+--- a/fs/proc/cmdline.c
++++ b/fs/proc/cmdline.c
+@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
  
  static int __init proc_cmdline_init(void)
  {
@@ -33401,10 +34285,11 @@ diff -urNp linux-2.6.32.13/fs/proc/cmdline.c linux-2.6.32.13/fs/proc/cmdline.c
  	return 0;
  }
  module_init(proc_cmdline_init);
-diff -urNp linux-2.6.32.13/fs/proc/devices.c linux-2.6.32.13/fs/proc/devices.c
---- linux-2.6.32.13/fs/proc/devices.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/devices.c	2010-05-15 13:21:17.706647417 -0400
-@@ -64,7 +64,11 @@ static const struct file_operations proc
+diff --git a/fs/proc/devices.c b/fs/proc/devices.c
+index 59ee7da..469b4b6 100644
+--- a/fs/proc/devices.c
++++ b/fs/proc/devices.c
+@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
  
  static int __init proc_devices_init(void)
  {
@@ -33416,10 +34301,11 @@ diff -urNp linux-2.6.32.13/fs/proc/devices.c linux-2.6.32.13/fs/proc/devices.c
  	return 0;
  }
  module_init(proc_devices_init);
-diff -urNp linux-2.6.32.13/fs/proc/inode.c linux-2.6.32.13/fs/proc/inode.c
---- linux-2.6.32.13/fs/proc/inode.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/inode.c	2010-05-15 13:21:17.710596393 -0400
-@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
+diff --git a/fs/proc/inode.c b/fs/proc/inode.c
+index aea8502..641e6e5 100644
+--- a/fs/proc/inode.c
++++ b/fs/proc/inode.c
+@@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino,
  		if (de->mode) {
  			inode->i_mode = de->mode;
  			inode->i_uid = de->uid;
@@ -33431,10 +34317,11 @@ diff -urNp linux-2.6.32.13/fs/proc/inode.c linux-2.6.32.13/fs/proc/inode.c
  		}
  		if (de->size)
  			inode->i_size = de->size;
-diff -urNp linux-2.6.32.13/fs/proc/internal.h linux-2.6.32.13/fs/proc/internal.h
---- linux-2.6.32.13/fs/proc/internal.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/internal.h	2010-05-15 13:21:17.714628011 -0400
-@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
+diff --git a/fs/proc/internal.h b/fs/proc/internal.h
+index 1f24a3e..635e58a 100644
+--- a/fs/proc/internal.h
++++ b/fs/proc/internal.h
+@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
  				struct pid *pid, struct task_struct *task);
  extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
  				struct pid *pid, struct task_struct *task);
@@ -33444,40 +34331,55 @@ diff -urNp linux-2.6.32.13/fs/proc/internal.h linux-2.6.32.13/fs/proc/internal.h
  extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
  
  extern const struct file_operations proc_maps_operations;
-diff -urNp linux-2.6.32.13/fs/proc/Kconfig linux-2.6.32.13/fs/proc/Kconfig
---- linux-2.6.32.13/fs/proc/Kconfig	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/Kconfig	2010-05-15 13:21:17.722605604 -0400
-@@ -30,12 +30,12 @@ config PROC_FS
- 
- config PROC_KCORE
- 	bool "/proc/kcore support" if !ARM
--	depends on PROC_FS && MMU
-+	depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
- 
- config PROC_VMCORE
-         bool "/proc/vmcore support (EXPERIMENTAL)"
--        depends on PROC_FS && CRASH_DUMP
--	default y
-+        depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
-+	default n
-         help
-         Exports the dump image of crashed kernel in ELF format.
- 
-@@ -59,8 +59,8 @@ config PROC_SYSCTL
- 	  limited in memory.
+diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
+index 6f37c39..37eb168 100644
+--- a/fs/proc/kcore.c
++++ b/fs/proc/kcore.c
+@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
+ 	 * the addresses in the elf_phdr on our list.
+ 	 */
+ 	start = kc_offset_to_vaddr(*fpos - elf_buflen);
+-	if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
++	tsz = PAGE_SIZE - (start & ~PAGE_MASK);
++	if (tsz > buflen)
+ 		tsz = buflen;
+-		
++
+ 	while (buflen) {
+ 		struct kcore_list *m;
  
- config PROC_PAGE_MONITOR
-- 	default y
--	depends on PROC_FS && MMU
-+ 	default n
-+	depends on PROC_FS && MMU && !GRKERNSEC
- 	bool "Enable /proc page monitoring" if EMBEDDED
-  	help
- 	  Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-2.6.32.13/fs/proc/kcore.c linux-2.6.32.13/fs/proc/kcore.c
---- linux-2.6.32.13/fs/proc/kcore.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/kcore.c	2010-05-15 13:21:17.730660780 -0400
-@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use
+@@ -509,20 +510,18 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
+ 			kfree(elf_buf);
+ 		} else {
+ 			if (kern_addr_valid(start)) {
+-				unsigned long n;
+-
+-				n = copy_to_user(buffer, (char *)start, tsz);
+-				/*
+-				 * We cannot distingush between fault on source
+-				 * and fault on destination. When this happens
+-				 * we clear too and hope it will trigger the
+-				 * EFAULT again.
+-				 */
+-				if (n) { 
+-					if (clear_user(buffer + tsz - n,
+-								n))
++				char *elf_buf;
++
++				elf_buf = kmalloc(tsz, GFP_KERNEL);
++				if (!elf_buf)
++					return -ENOMEM;
++				if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
++					if (copy_to_user(buffer, elf_buf, tsz)) {
++						kfree(elf_buf);
+ 						return -EFAULT;
++					}
+ 				}
++				kfree(elf_buf);
+ 			} else {
+ 				if (clear_user(buffer, tsz))
+ 					return -EFAULT;
+@@ -542,6 +541,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
  
  static int open_kcore(struct inode *inode, struct file *filp)
  {
@@ -33487,10 +34389,11 @@ diff -urNp linux-2.6.32.13/fs/proc/kcore.c linux-2.6.32.13/fs/proc/kcore.c
  	if (!capable(CAP_SYS_RAWIO))
  		return -EPERM;
  	if (kcore_need_update)
-diff -urNp linux-2.6.32.13/fs/proc/meminfo.c linux-2.6.32.13/fs/proc/meminfo.c
---- linux-2.6.32.13/fs/proc/meminfo.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/meminfo.c	2010-05-15 13:21:17.734637714 -0400
-@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
+diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
+index a65239c..c97c1c5 100644
+--- a/fs/proc/meminfo.c
++++ b/fs/proc/meminfo.c
+@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
  		vmi.used >> 10,
  		vmi.largest_chunk >> 10
  #ifdef CONFIG_MEMORY_FAILURE
@@ -33499,10 +34402,11 @@ diff -urNp linux-2.6.32.13/fs/proc/meminfo.c linux-2.6.32.13/fs/proc/meminfo.c
  #endif
  		);
  
-diff -urNp linux-2.6.32.13/fs/proc/nommu.c linux-2.6.32.13/fs/proc/nommu.c
---- linux-2.6.32.13/fs/proc/nommu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/nommu.c	2010-05-15 13:21:17.738599356 -0400
-@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
+diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
+index b1822dd..df622cb 100644
+--- a/fs/proc/nommu.c
++++ b/fs/proc/nommu.c
+@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
  		if (len < 1)
  			len = 1;
  		seq_printf(m, "%*c", len, ' ');
@@ -33511,10 +34415,11 @@ diff -urNp linux-2.6.32.13/fs/proc/nommu.c linux-2.6.32.13/fs/proc/nommu.c
  	}
  
  	seq_putc(m, '\n');
-diff -urNp linux-2.6.32.13/fs/proc/proc_net.c linux-2.6.32.13/fs/proc/proc_net.c
---- linux-2.6.32.13/fs/proc/proc_net.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/proc_net.c	2010-05-15 13:21:17.742599005 -0400
-@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
+diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
+index 9020ac1..15a7335 100644
+--- a/fs/proc/proc_net.c
++++ b/fs/proc/proc_net.c
+@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(struct inode *dir)
  	struct task_struct *task;
  	struct nsproxy *ns;
  	struct net *net = NULL;
@@ -33532,9 +34437,10 @@ diff -urNp linux-2.6.32.13/fs/proc/proc_net.c linux-2.6.32.13/fs/proc/proc_net.c
  
  	rcu_read_lock();
  	task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.32.13/fs/proc/proc_sysctl.c linux-2.6.32.13/fs/proc/proc_sysctl.c
---- linux-2.6.32.13/fs/proc/proc_sysctl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/proc_sysctl.c	2010-05-15 13:21:17.746588317 -0400
+diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
+index 6ff9981..46d8853 100644
+--- a/fs/proc/proc_sysctl.c
++++ b/fs/proc/proc_sysctl.c
 @@ -7,6 +7,8 @@
  #include <linux/security.h>
  #include "internal.h"
@@ -33544,7 +34450,7 @@ diff -urNp linux-2.6.32.13/fs/proc/proc_sysctl.c linux-2.6.32.13/fs/proc/proc_sy
  static const struct dentry_operations proc_sys_dentry_operations;
  static const struct file_operations proc_sys_file_operations;
  static const struct inode_operations proc_sys_inode_operations;
-@@ -109,6 +111,9 @@ static struct dentry *proc_sys_lookup(st
+@@ -109,6 +111,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
  	if (!p)
  		goto out;
  
@@ -33554,7 +34460,7 @@ diff -urNp linux-2.6.32.13/fs/proc/proc_sysctl.c linux-2.6.32.13/fs/proc/proc_sy
  	err = ERR_PTR(-ENOMEM);
  	inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p);
  	if (h)
-@@ -228,6 +233,9 @@ static int scan(struct ctl_table_header 
+@@ -228,6 +233,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
  		if (*pos < file->f_pos)
  			continue;
  
@@ -33564,7 +34470,7 @@ diff -urNp linux-2.6.32.13/fs/proc/proc_sysctl.c linux-2.6.32.13/fs/proc/proc_sy
  		res = proc_sys_fill_cache(file, dirent, filldir, head, table);
  		if (res)
  			return res;
-@@ -344,6 +352,9 @@ static int proc_sys_getattr(struct vfsmo
+@@ -344,6 +352,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
  	if (IS_ERR(head))
  		return PTR_ERR(head);
  
@@ -33574,10 +34480,11 @@ diff -urNp linux-2.6.32.13/fs/proc/proc_sysctl.c linux-2.6.32.13/fs/proc/proc_sy
  	generic_fillattr(inode, stat);
  	if (table)
  		stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.32.13/fs/proc/root.c linux-2.6.32.13/fs/proc/root.c
---- linux-2.6.32.13/fs/proc/root.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/root.c	2010-05-15 13:21:17.750584298 -0400
-@@ -134,7 +134,15 @@ void __init proc_root_init(void)
+diff --git a/fs/proc/root.c b/fs/proc/root.c
+index 4258384..bee1b70 100644
+--- a/fs/proc/root.c
++++ b/fs/proc/root.c
+@@ -133,7 +133,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
  	proc_device_tree_init();
  #endif
@@ -33593,16 +34500,17 @@ diff -urNp linux-2.6.32.13/fs/proc/root.c linux-2.6.32.13/fs/proc/root.c
  	proc_sys_init();
  }
  
-diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c
---- linux-2.6.32.13/fs/proc/task_mmu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/task_mmu.c	2010-05-15 13:21:17.758934117 -0400
-@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
- 		"VmStk:\t%8lu kB\n"
+diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
+index 271afc4..ae1a977 100644
+--- a/fs/proc/task_mmu.c
++++ b/fs/proc/task_mmu.c
+@@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
  		"VmExe:\t%8lu kB\n"
  		"VmLib:\t%8lu kB\n"
--		"VmPTE:\t%8lu kB\n",
+ 		"VmPTE:\t%8lu kB\n"
+-		"VmSwap:\t%8lu kB\n",
 -		hiwater_vm << (PAGE_SHIFT-10),
-+		"VmPTE:\t%8lu kB\n"
++		"VmSwap:\t%8lu kB\n"
 +
 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
 +		"CsBase:\t%8lx\nCsLim:\t%8lx\n"
@@ -33612,11 +34520,12 @@ diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c
  		(total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
  		mm->locked_vm << (PAGE_SHIFT-10),
  		hiwater_rss << (PAGE_SHIFT-10),
- 		total_rss << (PAGE_SHIFT-10),
+@@ -58,7 +63,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
  		data << (PAGE_SHIFT-10),
  		mm->stack_vm << (PAGE_SHIFT-10), text, lib,
--		(PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10);
-+		(PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10
+ 		(PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
+-		swap << (PAGE_SHIFT-10));
++		swap << (PAGE_SHIFT-10)
 +
 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
 +		, mm->context.user_cs_base, mm->context.user_cs_limit
@@ -33626,7 +34535,7 @@ diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c
  }
  
  unsigned long task_vsize(struct mm_struct *mm)
-@@ -199,6 +210,12 @@ static int do_maps_open(struct inode *in
+@@ -203,6 +214,12 @@ static int do_maps_open(struct inode *inode, struct file *file,
  	return ret;
  }
  
@@ -33639,15 +34548,31 @@ diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c
  static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
  {
  	struct mm_struct *mm = vma->vm_mm;
-@@ -217,13 +234,22 @@ static void show_map_vma(struct seq_file
+@@ -210,7 +227,6 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
+ 	int flags = vma->vm_flags;
+ 	unsigned long ino = 0;
+ 	unsigned long long pgoff = 0;
+-	unsigned long start;
+ 	dev_t dev = 0;
+ 	int len;
+ 
+@@ -221,20 +237,24 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
+ 		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
  	}
  
+-	/* We don't show the stack guard page in /proc/maps */
+-	start = vma->vm_start;
+-	if (vma->vm_flags & VM_GROWSDOWN)
+-		if (!vma_stack_continue(vma->vm_prev, vma->vm_start))
+-			start += PAGE_SIZE;
+ 
  	seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
+-			start,
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
 +			PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start,
 +			PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end,
 +#else
- 			vma->vm_start,
++			vma->vm_start,
  			vma->vm_end,
 +#endif
  			flags & VM_READ ? 'r' : '-',
@@ -33662,7 +34587,7 @@ diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c
  			MAJOR(dev), MINOR(dev), ino, &len);
  
  	/*
-@@ -232,16 +258,16 @@ static void show_map_vma(struct seq_file
+@@ -243,16 +263,16 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
  	 */
  	if (file) {
  		pad_len_spaces(m, len);
@@ -33682,29 +34607,31 @@ diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c
 +					   (vma->vm_start <= mm->start_stack &&
 +					    vma->vm_end >= mm->start_stack)) {
  					name = "[stack]";
- 				} else {
- 					unsigned long stack_start;
-@@ -403,9 +429,16 @@ static int show_smap(struct seq_file *m,
+ 				}
+ 			} else {
+@@ -394,11 +414,16 @@ static int show_smap(struct seq_file *m, void *v)
  	};
  
  	memset(&mss, 0, sizeof mss);
 -	mss.vma = vma;
+-	/* mmap_sem is held in m_start */
 -	if (vma->vm_mm && !is_vm_hugetlb_page(vma))
 -		walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
-+
+-
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
 +	if (!PAX_RAND_FLAGS(vma->vm_mm)) {
 +#endif
 +		mss.vma = vma;
++		/* mmap_sem is held in m_start */
 +		if (vma->vm_mm && !is_vm_hugetlb_page(vma))
 +			walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
 +	}
 +#endif
- 
  	show_map_vma(m, vma);
  
-@@ -421,7 +454,11 @@ static int show_smap(struct seq_file *m,
+ 	seq_printf(m,
+@@ -413,7 +438,11 @@ static int show_smap(struct seq_file *m, void *v)
  		   "Swap:           %8lu kB\n"
  		   "KernelPageSize: %8lu kB\n"
  		   "MMUPageSize:    %8lu kB\n",
@@ -33716,10 +34643,11 @@ diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c
  		   mss.resident >> 10,
  		   (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
  		   mss.shared_clean  >> 10,
-diff -urNp linux-2.6.32.13/fs/proc/task_nommu.c linux-2.6.32.13/fs/proc/task_nommu.c
---- linux-2.6.32.13/fs/proc/task_nommu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/proc/task_nommu.c	2010-05-15 13:21:17.758934117 -0400
-@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
+diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
+index cb6306e..f296149 100644
+--- a/fs/proc/task_nommu.c
++++ b/fs/proc/task_nommu.c
+@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
  	else
  		bytes += kobjsize(mm);
  	
@@ -33728,18 +34656,19 @@ diff -urNp linux-2.6.32.13/fs/proc/task_nommu.c linux-2.6.32.13/fs/proc/task_nom
  		sbytes += kobjsize(current->fs);
  	else
  		bytes += kobjsize(current->fs);
-@@ -154,7 +154,7 @@ static int nommu_vma_show(struct seq_fil
- 		if (len < 1)
- 			len = 1;
- 		seq_printf(m, "%*c", len, ' ');
+@@ -165,7 +165,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
+ 
+ 	if (file) {
+ 		pad_len_spaces(m, len);
 -		seq_path(m, &file->f_path, "");
 +		seq_path(m, &file->f_path, "\n\\");
- 	}
- 
- 	seq_putc(m, '\n');
-diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c
---- linux-2.6.32.13/fs/readdir.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/readdir.c	2010-05-15 13:21:17.778956743 -0400
+ 	} else if (mm) {
+ 		if (vma->vm_start <= mm->start_stack &&
+ 			vma->vm_end >= mm->start_stack) {
+diff --git a/fs/readdir.c b/fs/readdir.c
+index 7723401..36be2e6 100644
+--- a/fs/readdir.c
++++ b/fs/readdir.c
 @@ -16,6 +16,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -33756,7 +34685,7 @@ diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c
  	int result;
  };
  
-@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, cons
+@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
  		buf->result = -EOVERFLOW;
  		return -EOVERFLOW;
  	}
@@ -33767,7 +34696,7 @@ diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c
  	buf->result++;
  	dirent = buf->dirent;
  	if (!access_ok(VERIFY_WRITE, dirent,
-@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned in
+@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
  
  	buf.result = 0;
  	buf.dirent = dirent;
@@ -33783,7 +34712,7 @@ diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c
  	int count;
  	int error;
  };
-@@ -162,6 +170,10 @@ static int filldir(void * __buf, const c
+@@ -162,6 +170,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
  		buf->error = -EOVERFLOW;
  		return -EOVERFLOW;
  	}
@@ -33794,7 +34723,7 @@ diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c
  	dirent = buf->previous;
  	if (dirent) {
  		if (__put_user(offset, &dirent->d_off))
-@@ -209,6 +221,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, 
+@@ -209,6 +221,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
  	buf.previous = NULL;
  	buf.count = count;
  	buf.error = 0;
@@ -33810,7 +34739,7 @@ diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c
  	int count;
  	int error;
  };
-@@ -242,6 +256,10 @@ static int filldir64(void * __buf, const
+@@ -242,6 +256,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
  	buf->error = -EINVAL;	/* only used if we fail.. */
  	if (reclen > buf->count)
  		return -EINVAL;
@@ -33821,7 +34750,7 @@ diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c
  	dirent = buf->previous;
  	if (dirent) {
  		if (__put_user(offset, &dirent->d_off))
-@@ -289,6 +307,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int
+@@ -289,6 +307,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
  
  	buf.current_dir = dirent;
  	buf.previous = NULL;
@@ -33829,10 +34758,11 @@ diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c
  	buf.count = count;
  	buf.error = 0;
  
-diff -urNp linux-2.6.32.13/fs/reiserfs/do_balan.c linux-2.6.32.13/fs/reiserfs/do_balan.c
---- linux-2.6.32.13/fs/reiserfs/do_balan.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/reiserfs/do_balan.c	2010-05-15 13:21:17.786600991 -0400
-@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
+diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
+index 60c0804..d814f98 100644
+--- a/fs/reiserfs/do_balan.c
++++ b/fs/reiserfs/do_balan.c
+@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,	/* tree_balance structure */
  		return;
  	}
  
@@ -33841,10 +34771,11 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/do_balan.c linux-2.6.32.13/fs/reiserfs/do
  	do_balance_starts(tb);
  
  	/* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-2.6.32.13/fs/reiserfs/item_ops.c linux-2.6.32.13/fs/reiserfs/item_ops.c
---- linux-2.6.32.13/fs/reiserfs/item_ops.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/reiserfs/item_ops.c	2010-05-15 13:21:17.794567981 -0400
-@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
+diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
+index 72cb1cc..d0e3181 100644
+--- a/fs/reiserfs/item_ops.c
++++ b/fs/reiserfs/item_ops.c
+@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_item *vi)
  			 vi->vi_index, vi->vi_type, vi->vi_ih);
  }
  
@@ -33853,7 +34784,7 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/item_ops.c linux-2.6.32.13/fs/reiserfs/it
  	.bytes_number = sd_bytes_number,
  	.decrement_key = sd_decrement_key,
  	.is_left_mergeable = sd_is_left_mergeable,
-@@ -196,7 +196,7 @@ static void direct_print_vi(struct virtu
+@@ -196,7 +196,7 @@ static void direct_print_vi(struct virtual_item *vi)
  			 vi->vi_index, vi->vi_type, vi->vi_ih);
  }
  
@@ -33862,7 +34793,7 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/item_ops.c linux-2.6.32.13/fs/reiserfs/it
  	.bytes_number = direct_bytes_number,
  	.decrement_key = direct_decrement_key,
  	.is_left_mergeable = direct_is_left_mergeable,
-@@ -341,7 +341,7 @@ static void indirect_print_vi(struct vir
+@@ -341,7 +341,7 @@ static void indirect_print_vi(struct virtual_item *vi)
  			 vi->vi_index, vi->vi_type, vi->vi_ih);
  }
  
@@ -33871,7 +34802,7 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/item_ops.c linux-2.6.32.13/fs/reiserfs/it
  	.bytes_number = indirect_bytes_number,
  	.decrement_key = indirect_decrement_key,
  	.is_left_mergeable = indirect_is_left_mergeable,
-@@ -628,7 +628,7 @@ static void direntry_print_vi(struct vir
+@@ -628,7 +628,7 @@ static void direntry_print_vi(struct virtual_item *vi)
  	printk("\n");
  }
  
@@ -33880,7 +34811,7 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/item_ops.c linux-2.6.32.13/fs/reiserfs/it
  	.bytes_number = direntry_bytes_number,
  	.decrement_key = direntry_decrement_key,
  	.is_left_mergeable = direntry_is_left_mergeable,
-@@ -724,7 +724,7 @@ static void errcatch_print_vi(struct vir
+@@ -724,7 +724,7 @@ static void errcatch_print_vi(struct virtual_item *vi)
  			 "Invalid item type observed, run fsck ASAP");
  }
  
@@ -33889,7 +34820,7 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/item_ops.c linux-2.6.32.13/fs/reiserfs/it
  	errcatch_bytes_number,
  	errcatch_decrement_key,
  	errcatch_is_left_mergeable,
-@@ -746,7 +746,7 @@ static struct item_operations errcatch_o
+@@ -746,7 +746,7 @@ static struct item_operations errcatch_ops = {
  #error Item types must use disk-format assigned values.
  #endif
  
@@ -33898,10 +34829,11 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/item_ops.c linux-2.6.32.13/fs/reiserfs/it
  	&stat_data_ops,
  	&indirect_ops,
  	&direct_ops,
-diff -urNp linux-2.6.32.13/fs/reiserfs/procfs.c linux-2.6.32.13/fs/reiserfs/procfs.c
---- linux-2.6.32.13/fs/reiserfs/procfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/reiserfs/procfs.c	2010-05-15 13:21:17.802593961 -0400
-@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
+diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
+index 7a99811..a7c96c4 100644
+--- a/fs/reiserfs/procfs.c
++++ b/fs/reiserfs/procfs.c
+@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
  		   "SMALL_TAILS " : "NO_TAILS ",
  		   replay_only(sb) ? "REPLAY_ONLY " : "",
  		   convert_reiserfs(sb) ? "CONV " : "",
@@ -33910,9 +34842,10 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/procfs.c linux-2.6.32.13/fs/reiserfs/proc
  		   SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
  		   SF(s_do_balance), SF(s_unneeded_left_neighbor),
  		   SF(s_good_search_by_key_reada), SF(s_bmaps),
-diff -urNp linux-2.6.32.13/fs/select.c linux-2.6.32.13/fs/select.c
---- linux-2.6.32.13/fs/select.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/select.c	2010-05-15 13:21:17.806683634 -0400
+diff --git a/fs/select.c b/fs/select.c
+index 500a669..3a77828 100644
+--- a/fs/select.c
++++ b/fs/select.c
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -33921,18 +34854,19 @@ diff -urNp linux-2.6.32.13/fs/select.c linux-2.6.32.13/fs/select.c
  #include <linux/personality.h> /* for STICKY_TIMEOUTS */
  #include <linux/file.h>
  #include <linux/fdtable.h>
-@@ -821,6 +822,7 @@ int do_sys_poll(struct pollfd __user *uf
+@@ -838,6 +839,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
   	struct poll_list *walk = head;
   	unsigned long todo = nfds;
  
 +	gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
- 	if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
+ 	if (nfds > rlimit(RLIMIT_NOFILE))
  		return -EINVAL;
  
-diff -urNp linux-2.6.32.13/fs/seq_file.c linux-2.6.32.13/fs/seq_file.c
---- linux-2.6.32.13/fs/seq_file.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/seq_file.c	2010-05-15 13:21:17.810601731 -0400
-@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
+diff --git a/fs/seq_file.c b/fs/seq_file.c
+index e1f437b..cbc4cf1 100644
+--- a/fs/seq_file.c
++++ b/fs/seq_file.c
+@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, loff_t offset)
  		return 0;
  	}
  	if (!m->buf) {
@@ -33942,7 +34876,7 @@ diff -urNp linux-2.6.32.13/fs/seq_file.c linux-2.6.32.13/fs/seq_file.c
  		if (!m->buf)
  			return -ENOMEM;
  	}
-@@ -116,7 +117,8 @@ static int traverse(struct seq_file *m, 
+@@ -116,7 +117,8 @@ static int traverse(struct seq_file *m, loff_t offset)
  Eoverflow:
  	m->op->stop(m, p);
  	kfree(m->buf);
@@ -33952,7 +34886,7 @@ diff -urNp linux-2.6.32.13/fs/seq_file.c linux-2.6.32.13/fs/seq_file.c
  	return !m->buf ? -ENOMEM : -EAGAIN;
  }
  
-@@ -169,7 +171,8 @@ ssize_t seq_read(struct file *file, char
+@@ -169,7 +171,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
  	m->version = file->f_version;
  	/* grab buffer if we didn't have one */
  	if (!m->buf) {
@@ -33962,7 +34896,7 @@ diff -urNp linux-2.6.32.13/fs/seq_file.c linux-2.6.32.13/fs/seq_file.c
  		if (!m->buf)
  			goto Enomem;
  	}
-@@ -210,7 +213,8 @@ ssize_t seq_read(struct file *file, char
+@@ -210,7 +213,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
  			goto Fill;
  		m->op->stop(m, p);
  		kfree(m->buf);
@@ -33972,10 +34906,11 @@ diff -urNp linux-2.6.32.13/fs/seq_file.c linux-2.6.32.13/fs/seq_file.c
  		if (!m->buf)
  			goto Enomem;
  		m->count = 0;
-diff -urNp linux-2.6.32.13/fs/smbfs/symlink.c linux-2.6.32.13/fs/smbfs/symlink.c
---- linux-2.6.32.13/fs/smbfs/symlink.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/smbfs/symlink.c	2010-05-15 13:21:17.810601731 -0400
-@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
+diff --git a/fs/smbfs/symlink.c b/fs/smbfs/symlink.c
+index 00b2909..2ace383 100644
+--- a/fs/smbfs/symlink.c
++++ b/fs/smbfs/symlink.c
+@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dentry *dentry, struct nameidata *nd)
  
  static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -33984,10 +34919,11 @@ diff -urNp linux-2.6.32.13/fs/smbfs/symlink.c linux-2.6.32.13/fs/smbfs/symlink.c
  	if (!IS_ERR(s))
  		__putname(s);
  }
-diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
---- linux-2.6.32.13/fs/splice.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/splice.c	2010-05-15 13:21:17.818603295 -0400
-@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
+diff --git a/fs/splice.c b/fs/splice.c
+index 188f61a..c918341 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
  	pipe_lock(pipe);
  
  	for (;;) {
@@ -33996,7 +34932,7 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
  			send_sig(SIGPIPE, current, 0);
  			if (!ret)
  				ret = -EPIPE;
-@@ -239,9 +239,9 @@ ssize_t splice_to_pipe(struct pipe_inode
+@@ -240,9 +240,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
  			do_wakeup = 0;
  		}
  
@@ -34008,7 +34944,7 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
  	}
  
  	pipe_unlock(pipe);
-@@ -531,7 +531,7 @@ static ssize_t kernel_readv(struct file 
+@@ -566,7 +566,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
  	old_fs = get_fs();
  	set_fs(get_ds());
  	/* The cast to a user pointer is valid due to the set_fs() */
@@ -34017,7 +34953,7 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
  	set_fs(old_fs);
  
  	return res;
-@@ -546,7 +546,7 @@ static ssize_t kernel_write(struct file 
+@@ -581,7 +581,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
  	old_fs = get_fs();
  	set_fs(get_ds());
  	/* The cast to a user pointer is valid due to the set_fs() */
@@ -34026,16 +34962,16 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
  	set_fs(old_fs);
  
  	return res;
-@@ -588,7 +588,7 @@ ssize_t default_file_splice_read(struct 
+@@ -634,7 +634,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
  			goto err;
  
  		this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
 -		vec[i].iov_base = (void __user *) page_address(page);
 +		vec[i].iov_base = (__force void __user *) page_address(page);
  		vec[i].iov_len = this_len;
- 		pages[i] = page;
+ 		spd.pages[i] = page;
  		spd.nr_pages++;
-@@ -808,10 +808,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
+@@ -861,10 +861,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
  int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
  {
  	while (!pipe->nrbufs) {
@@ -34048,7 +34984,7 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
  			return 0;
  
  		if (sd->flags & SPLICE_F_NONBLOCK)
-@@ -1146,7 +1146,7 @@ ssize_t splice_direct_to_actor(struct fi
+@@ -1201,7 +1201,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
  		 * out of the pipe right after the splice_to_pipe(). So set
  		 * PIPE_READERS appropriately.
  		 */
@@ -34057,7 +34993,7 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
  
  		current->splice_pipe = pipe;
  	}
-@@ -1704,9 +1704,9 @@ static int ipipe_prep(struct pipe_inode_
+@@ -1757,9 +1757,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
  			ret = -ERESTARTSYS;
  			break;
  		}
@@ -34069,16 +35005,16 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
  			if (flags & SPLICE_F_NONBLOCK) {
  				ret = -EAGAIN;
  				break;
-@@ -1738,7 +1738,7 @@ static int opipe_prep(struct pipe_inode_
+@@ -1791,7 +1791,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
  	pipe_lock(pipe);
  
- 	while (pipe->nrbufs >= PIPE_BUFFERS) {
+ 	while (pipe->nrbufs >= pipe->buffers) {
 -		if (!pipe->readers) {
 +		if (!atomic_read(&pipe->readers)) {
  			send_sig(SIGPIPE, current, 0);
  			ret = -EPIPE;
  			break;
-@@ -1751,9 +1751,9 @@ static int opipe_prep(struct pipe_inode_
+@@ -1804,9 +1804,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
  			ret = -ERESTARTSYS;
  			break;
  		}
@@ -34090,7 +35026,7 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
  	}
  
  	pipe_unlock(pipe);
-@@ -1789,14 +1789,14 @@ retry:
+@@ -1842,14 +1842,14 @@ retry:
  	pipe_double_lock(ipipe, opipe);
  
  	do {
@@ -34107,7 +35043,7 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
  			break;
  
  		/*
-@@ -1896,7 +1896,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1949,7 +1949,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
  	pipe_double_lock(ipipe, opipe);
  
  	do {
@@ -34116,7 +35052,7 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
  			send_sig(SIGPIPE, current, 0);
  			if (!ret)
  				ret = -EPIPE;
-@@ -1941,7 +1941,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1994,7 +1994,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
  	 * return EAGAIN if we have the potential of some data in the
  	 * future, otherwise just return 0
  	 */
@@ -34125,49 +35061,11 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
  		ret = -EAGAIN;
  
  	pipe_unlock(ipipe);
-diff -urNp linux-2.6.32.13/fs/sysfs/file.c linux-2.6.32.13/fs/sysfs/file.c
---- linux-2.6.32.13/fs/sysfs/file.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/sysfs/file.c	2010-05-15 13:21:17.818603295 -0400
-@@ -53,7 +53,7 @@ struct sysfs_buffer {
- 	size_t			count;
- 	loff_t			pos;
- 	char			* page;
--	struct sysfs_ops	* ops;
-+	const struct sysfs_ops	* ops;
- 	struct mutex		mutex;
- 	int			needs_read_fill;
- 	int			event;
-@@ -75,7 +75,7 @@ static int fill_read_buffer(struct dentr
- {
- 	struct sysfs_dirent *attr_sd = dentry->d_fsdata;
- 	struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
--	struct sysfs_ops * ops = buffer->ops;
-+	const struct sysfs_ops * ops = buffer->ops;
- 	int ret = 0;
- 	ssize_t count;
- 
-@@ -199,7 +199,7 @@ flush_write_buffer(struct dentry * dentr
- {
- 	struct sysfs_dirent *attr_sd = dentry->d_fsdata;
- 	struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
--	struct sysfs_ops * ops = buffer->ops;
-+	const struct sysfs_ops * ops = buffer->ops;
- 	int rc;
- 
- 	/* need attr_sd for attr and ops, its parent for kobj */
-@@ -335,7 +335,7 @@ static int sysfs_open_file(struct inode 
- 	struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
- 	struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
- 	struct sysfs_buffer *buffer;
--	struct sysfs_ops *ops;
-+	const struct sysfs_ops *ops;
- 	int error = -EACCES;
- 	char *p;
- 
-diff -urNp linux-2.6.32.13/fs/sysfs/symlink.c linux-2.6.32.13/fs/sysfs/symlink.c
---- linux-2.6.32.13/fs/sysfs/symlink.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/sysfs/symlink.c	2010-05-15 13:21:17.822590321 -0400
-@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
+diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
+index a7ac78f..02158e1 100644
+--- a/fs/sysfs/symlink.c
++++ b/fs/sysfs/symlink.c
+@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
  
  static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
  {
@@ -34176,35 +35074,11 @@ diff -urNp linux-2.6.32.13/fs/sysfs/symlink.c linux-2.6.32.13/fs/sysfs/symlink.c
  	if (!IS_ERR(page))
  		free_page((unsigned long)page);
  }
-diff -urNp linux-2.6.32.13/fs/udf/balloc.c linux-2.6.32.13/fs/udf/balloc.c
---- linux-2.6.32.13/fs/udf/balloc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/udf/balloc.c	2010-05-15 13:21:17.834616935 -0400
-@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
- 
- 	mutex_lock(&sbi->s_alloc_mutex);
- 	partmap = &sbi->s_partmaps[bloc->partitionReferenceNum];
--	if (bloc->logicalBlockNum < 0 ||
--	    (bloc->logicalBlockNum + count) >
--		partmap->s_partition_len) {
-+	if ((bloc->logicalBlockNum + count) > partmap->s_partition_len) {
- 		udf_debug("%d < %d || %d + %d > %d\n",
- 			  bloc->logicalBlockNum, 0, bloc->logicalBlockNum,
- 			  count, partmap->s_partition_len);
-@@ -436,9 +434,7 @@ static void udf_table_free_blocks(struct
- 
- 	mutex_lock(&sbi->s_alloc_mutex);
- 	partmap = &sbi->s_partmaps[bloc->partitionReferenceNum];
--	if (bloc->logicalBlockNum < 0 ||
--	    (bloc->logicalBlockNum + count) >
--		partmap->s_partition_len) {
-+	if ((bloc->logicalBlockNum + count) > partmap->s_partition_len) {
- 		udf_debug("%d < %d || %d + %d > %d\n",
- 			  bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
- 			  partmap->s_partition_len);
-diff -urNp linux-2.6.32.13/fs/udf/misc.c linux-2.6.32.13/fs/udf/misc.c
---- linux-2.6.32.13/fs/udf/misc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/udf/misc.c	2010-05-15 13:21:17.834616935 -0400
-@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
+diff --git a/fs/udf/misc.c b/fs/udf/misc.c
+index 9215700..ff5daaf 100644
+--- a/fs/udf/misc.c
++++ b/fs/udf/misc.c
+@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedattr(struct inode *inode, uint32_t size,
  		iinfo->i_lenEAttr += size;
  		return (struct genericFormat *)&ea[offset];
  	}
@@ -34215,9 +35089,10 @@ diff -urNp linux-2.6.32.13/fs/udf/misc.c linux-2.6.32.13/fs/udf/misc.c
  
  	return NULL;
  }
-diff -urNp linux-2.6.32.13/fs/udf/udfdecl.h linux-2.6.32.13/fs/udf/udfdecl.h
---- linux-2.6.32.13/fs/udf/udfdecl.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/udf/udfdecl.h	2010-05-15 13:21:17.859848219 -0400
+diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
+index 2bac035..57b71d6 100644
+--- a/fs/udf/udfdecl.h
++++ b/fs/udf/udfdecl.h
 @@ -26,7 +26,7 @@ do { \
  	printk(f, ##a); \
  } while (0)
@@ -34227,9 +35102,10 @@ diff -urNp linux-2.6.32.13/fs/udf/udfdecl.h linux-2.6.32.13/fs/udf/udfdecl.h
  #endif
  
  #define udf_info(f, a...) \
-diff -urNp linux-2.6.32.13/fs/utimes.c linux-2.6.32.13/fs/utimes.c
---- linux-2.6.32.13/fs/utimes.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/utimes.c	2010-05-15 13:21:17.859848219 -0400
+diff --git a/fs/utimes.c b/fs/utimes.c
+index e4c75db..b4df0e0 100644
+--- a/fs/utimes.c
++++ b/fs/utimes.c
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -34238,7 +35114,7 @@ diff -urNp linux-2.6.32.13/fs/utimes.c linux-2.6.32.13/fs/utimes.c
  #include <linux/linkage.h>
  #include <linux/mount.h>
  #include <linux/namei.h>
-@@ -101,6 +102,12 @@ static int utimes_common(struct path *pa
+@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
  				goto mnt_drop_write_and_out;
  		}
  	}
@@ -34251,22 +35127,24 @@ diff -urNp linux-2.6.32.13/fs/utimes.c linux-2.6.32.13/fs/utimes.c
  	mutex_lock(&inode->i_mutex);
  	error = notify_change(path->dentry, &newattrs);
  	mutex_unlock(&inode->i_mutex);
-diff -urNp linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c	2010-05-15 13:21:17.862604779 -0400
-@@ -134,7 +134,7 @@ xfs_find_handle(
+diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
+index 82a74f6..b24f5ba 100644
+--- a/fs/xfs/linux-2.6/xfs_ioctl.c
++++ b/fs/xfs/linux-2.6/xfs_ioctl.c
+@@ -136,7 +136,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) ||
++	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-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c	2010-04-29 17:49:38.453075413 -0400
-+++ linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c	2010-05-15 13:21:17.866593235 -0400
-@@ -468,7 +468,7 @@ xfs_vn_put_link(
+diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
+index 44f0b2d..a0ac4cf 100644
+--- a/fs/xfs/linux-2.6/xfs_iops.c
++++ b/fs/xfs/linux-2.6/xfs_iops.c
+@@ -480,7 +480,7 @@ xfs_vn_put_link(
  	struct nameidata *nd,
  	void		*p)
  {
@@ -34275,10 +35153,11 @@ diff -urNp linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.13/fs/xfs/li
  
  	if (!IS_ERR(s))
  		kfree(s);
-diff -urNp linux-2.6.32.13/fs/xfs/xfs_bmap.c linux-2.6.32.13/fs/xfs/xfs_bmap.c
---- linux-2.6.32.13/fs/xfs/xfs_bmap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/fs/xfs/xfs_bmap.c	2010-05-15 13:21:17.902607196 -0400
-@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
+diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
+index 99587de..765b7cc 100644
+--- a/fs/xfs/xfs_bmap.c
++++ b/fs/xfs/xfs_bmap.c
+@@ -296,7 +296,7 @@ xfs_bmap_validate_ret(
  	int			nmap,
  	int			ret_nmap);
  #else
@@ -34286,120 +35165,1049 @@ diff -urNp linux-2.6.32.13/fs/xfs/xfs_bmap.c linux-2.6.32.13/fs/xfs/xfs_bmap.c
 +#define	xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
  #endif /* DEBUG */
  
- #if defined(XFS_RW_TRACE)
-diff -urNp linux-2.6.32.13/grsecurity/gracl_alloc.c linux-2.6.32.13/grsecurity/gracl_alloc.c
---- linux-2.6.32.13/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/gracl_alloc.c	2010-05-15 13:21:17.902607196 -0400
-@@ -0,0 +1,105 @@
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/gracl.h>
-+#include <linux/grsecurity.h>
+ STATIC int
+diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
+new file mode 100644
+index 0000000..40992e3
+--- /dev/null
++++ b/grsecurity/Kconfig
+@@ -0,0 +1,995 @@
++#
++# grecurity configuration
++#
 +
-+static unsigned long alloc_stack_next = 1;
-+static unsigned long alloc_stack_size = 1;
-+static void **alloc_stack;
++menu "Grsecurity"
 +
-+static __inline__ int
-+alloc_pop(void)
-+{
-+	if (alloc_stack_next == 1)
-+		return 0;
++config GRKERNSEC
++	bool "Grsecurity"
++	select CRYPTO
++	select CRYPTO_SHA256
++	help
++	  If you say Y here, you will be able to configure many features
++	  that will enhance the security of your system.  It is highly
++	  recommended that you say Y here and read through the help
++	  for each option so that you fully understand the features and
++	  can evaluate their usefulness for your machine.
 +
-+	kfree(alloc_stack[alloc_stack_next - 2]);
++choice
++	prompt "Security Level"
++	depends on GRKERNSEC
++	default GRKERNSEC_CUSTOM
 +
-+	alloc_stack_next--;
++config GRKERNSEC_LOW
++	bool "Low"
++	select GRKERNSEC_LINK
++	select GRKERNSEC_FIFO
++	select GRKERNSEC_EXECVE
++	select GRKERNSEC_RANDNET
++	select GRKERNSEC_DMESG
++	select GRKERNSEC_CHROOT
++	select GRKERNSEC_CHROOT_CHDIR
 +
-+	return 1;
-+}
++	help
++	  If you choose this option, several of the grsecurity options will
++	  be enabled that will give you greater protection against a number
++	  of attacks, while assuring that none of your software will have any
++	  conflicts with the additional security measures.  If you run a lot
++	  of unusual software, or you are having problems with the higher
++	  security levels, you should say Y here.  With this option, the
++	  following features are enabled:
 +
-+static __inline__ int
-+alloc_push(void *buf)
-+{
-+	if (alloc_stack_next >= alloc_stack_size)
-+		return 1;
++	  - Linking restrictions
++	  - FIFO restrictions
++	  - Enforcing RLIMIT_NPROC on execve
++	  - Restricted dmesg
++	  - Enforced chdir("/") on chroot
++	  - Runtime module disabling
 +
-+	alloc_stack[alloc_stack_next - 1] = buf;
++config GRKERNSEC_MEDIUM
++	bool "Medium"
++	select PAX
++	select PAX_EI_PAX
++	select PAX_PT_PAX_FLAGS
++	select PAX_HAVE_ACL_FLAGS
++	select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
++	select GRKERNSEC_CHROOT
++	select GRKERNSEC_CHROOT_SYSCTL
++	select GRKERNSEC_LINK
++	select GRKERNSEC_FIFO
++	select GRKERNSEC_EXECVE
++	select GRKERNSEC_DMESG
++	select GRKERNSEC_RANDNET
++	select GRKERNSEC_FORKFAIL
++	select GRKERNSEC_TIME
++	select GRKERNSEC_SIGNAL
++	select GRKERNSEC_CHROOT
++	select GRKERNSEC_CHROOT_UNIX
++	select GRKERNSEC_CHROOT_MOUNT
++	select GRKERNSEC_CHROOT_PIVOT
++	select GRKERNSEC_CHROOT_DOUBLE
++	select GRKERNSEC_CHROOT_CHDIR
++	select GRKERNSEC_CHROOT_MKNOD
++	select GRKERNSEC_PROC
++	select GRKERNSEC_PROC_USERGROUP
++	select PAX_RANDUSTACK
++	select PAX_ASLR
++	select PAX_RANDMMAP
++	select PAX_REFCOUNT if (X86 || SPARC64)
++	select PAX_USERCOPY if ((X86 || SPARC32 || SPARC64 || PPC) && (SLAB || SLUB || SLOB))
 +
-+	alloc_stack_next++;
++	help
++	  If you say Y here, several features in addition to those included
++	  in the low additional security level will be enabled.  These
++	  features provide even more security to your system, though in rare
++	  cases they may be incompatible with very old or poorly written
++	  software.  If you enable this option, make sure that your auth
++	  service (identd) is running as gid 1001.  With this option, 
++	  the following features (in addition to those provided in the 
++	  low additional security level) will be enabled:
 +
-+	return 0;
-+}
++	  - Failed fork logging
++	  - Time change logging
++	  - Signal logging
++	  - Deny mounts in chroot
++	  - Deny double chrooting
++	  - Deny sysctl writes in chroot
++	  - Deny mknod in chroot
++	  - Deny access to abstract AF_UNIX sockets out of chroot
++	  - Deny pivot_root in chroot
++	  - Denied writes of /dev/kmem, /dev/mem, and /dev/port
++	  - /proc restrictions with special GID set to 10 (usually wheel)
++	  - Address Space Layout Randomization (ASLR)
++	  - Prevent exploitation of most refcount overflows
++	  - Bounds checking of copying between the kernel and userland
 +
-+void *
-+acl_alloc(unsigned long len)
-+{
-+	void *ret = NULL;
++config GRKERNSEC_HIGH
++	bool "High"
++	select GRKERNSEC_LINK
++	select GRKERNSEC_FIFO
++	select GRKERNSEC_EXECVE
++	select GRKERNSEC_DMESG
++	select GRKERNSEC_FORKFAIL
++	select GRKERNSEC_TIME
++	select GRKERNSEC_SIGNAL
++	select GRKERNSEC_CHROOT
++	select GRKERNSEC_CHROOT_SHMAT
++	select GRKERNSEC_CHROOT_UNIX
++	select GRKERNSEC_CHROOT_MOUNT
++	select GRKERNSEC_CHROOT_FCHDIR
++	select GRKERNSEC_CHROOT_PIVOT
++	select GRKERNSEC_CHROOT_DOUBLE
++	select GRKERNSEC_CHROOT_CHDIR
++	select GRKERNSEC_CHROOT_MKNOD
++	select GRKERNSEC_CHROOT_CAPS
++	select GRKERNSEC_CHROOT_SYSCTL
++	select GRKERNSEC_CHROOT_FINDTASK
++	select GRKERNSEC_PROC
++	select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
++	select GRKERNSEC_HIDESYM
++	select GRKERNSEC_BRUTE
++	select GRKERNSEC_PROC_USERGROUP
++	select GRKERNSEC_KMEM
++	select GRKERNSEC_RESLOG
++	select GRKERNSEC_RANDNET
++	select GRKERNSEC_PROC_ADD
++	select GRKERNSEC_CHROOT_CHMOD
++	select GRKERNSEC_CHROOT_NICE
++	select GRKERNSEC_AUDIT_MOUNT
++	select GRKERNSEC_MODHARDEN if (MODULES)
++	select GRKERNSEC_HARDEN_PTRACE
++	select GRKERNSEC_VM86 if (X86_32)
++	select PAX
++	select PAX_RANDUSTACK
++	select PAX_ASLR
++	select PAX_RANDMMAP
++	select PAX_NOEXEC
++	select PAX_MPROTECT
++	select PAX_EI_PAX
++	select PAX_PT_PAX_FLAGS
++	select PAX_HAVE_ACL_FLAGS
++	select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
++	select PAX_MEMORY_UDEREF if (X86 && !XEN)
++	select PAX_RANDKSTACK if (X86_TSC && !X86_64)
++	select PAX_SEGMEXEC if (X86_32)
++	select PAX_PAGEEXEC
++	select PAX_EMUPLT if (ALPHA || PARISC || SPARC32 || SPARC64)
++	select PAX_EMUTRAMP if (PARISC)
++	select PAX_EMUSIGRT if (PARISC)
++	select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
++	select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
++	select PAX_REFCOUNT if (X86 || SPARC64)
++	select PAX_USERCOPY if ((X86 || PPC || SPARC32 || SPARC64) && (SLAB || SLUB || SLOB))
++	help
++	  If you say Y here, many of the features of grsecurity will be
++	  enabled, which will protect you against many kinds of attacks
++	  against your system.  The heightened security comes at a cost
++	  of an increased chance of incompatibilities with rare software
++	  on your machine.  Since this security level enables PaX, you should
++	  view <http://pax.grsecurity.net> and read about the PaX
++	  project.  While you are there, download chpax and run it on
++	  binaries that cause problems with PaX.  Also remember that
++	  since the /proc restrictions are enabled, you must run your
++	  identd as gid 1001.  This security level enables the following 
++	  features in addition to those listed in the low and medium 
++	  security levels:
 +
-+	if (!len || len > PAGE_SIZE)
-+		goto out;
++	  - Additional /proc restrictions
++	  - Chmod restrictions in chroot
++	  - No signals, ptrace, or viewing of processes outside of chroot
++	  - Capability restrictions in chroot
++	  - Deny fchdir out of chroot
++	  - Priority restrictions in chroot
++	  - Segmentation-based implementation of PaX
++	  - Mprotect restrictions
++	  - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
++	  - Kernel stack randomization
++	  - Mount/unmount/remount logging
++	  - Kernel symbol hiding
++	  - Prevention of memory exhaustion-based exploits
++	  - Hardening of module auto-loading
++	  - Ptrace restrictions
++	  - Restricted vm86 mode
 +
-+	ret = kmalloc(len, GFP_KERNEL);
++config GRKERNSEC_CUSTOM
++	bool "Custom"
++	help
++	  If you say Y here, you will be able to configure every grsecurity
++	  option, which allows you to enable many more features that aren't
++	  covered in the basic security levels.  These additional features
++	  include TPE, socket restrictions, and the sysctl system for
++	  grsecurity.  It is advised that you read through the help for
++	  each option to determine its usefulness in your situation.
 +
-+	if (ret) {
-+		if (alloc_push(ret)) {
-+			kfree(ret);
-+			ret = NULL;
-+		}
-+	}
++endchoice
 +
-+out:
-+	return ret;
-+}
++menu "Address Space Protection"
++depends on GRKERNSEC
 +
-+void *
-+acl_alloc_num(unsigned long num, unsigned long len)
-+{
-+	if (!len || (num > (PAGE_SIZE / len)))
-+		return NULL;
++config GRKERNSEC_KMEM
++	bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
++	help
++	  If you say Y here, /dev/kmem and /dev/mem won't be allowed to
++	  be written to via mmap or otherwise to modify the running kernel.
++	  /dev/port will also not be allowed to be opened. If you have module
++	  support disabled, enabling this will close up four ways that are
++	  currently used  to insert malicious code into the running kernel.
++	  Even with all these features enabled, we still highly recommend that
++	  you use the RBAC system, as it is still possible for an attacker to
++	  modify the running kernel through privileged I/O granted by ioperm/iopl.
++	  If you are not using XFree86, you may be able to stop this additional
++	  case by enabling the 'Disable privileged I/O' option. Though nothing
++	  legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
++	  but only to video memory, which is the only writing we allow in this
++	  case.  If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
++	  not be allowed to mprotect it with PROT_WRITE later.
++	  It is highly recommended that you say Y here if you meet all the
++	  conditions above.
 +
-+	return acl_alloc(num * len);
-+}
++config GRKERNSEC_VM86
++	bool "Restrict VM86 mode"
++	depends on X86_32
 +
-+void
-+acl_free_all(void)
-+{
-+	if (gr_acl_is_enabled() || !alloc_stack)
-+		return;
++	help
++	  If you say Y here, only processes with CAP_SYS_RAWIO will be able to
++	  make use of a special execution mode on 32bit x86 processors called
++	  Virtual 8086 (VM86) mode.  XFree86 may need vm86 mode for certain
++	  video cards and will still work with this option enabled.  The purpose
++	  of the option is to prevent exploitation of emulation errors in
++	  virtualization of vm86 mode like the one discovered in VMWare in 2009.
++	  Nearly all users should be able to enable this option.
 +
-+	while (alloc_pop()) ;
++config GRKERNSEC_IO
++	bool "Disable privileged I/O"
++	depends on X86
++	select RTC_CLASS
++	select RTC_INTF_DEV
++	select RTC_DRV_CMOS
 +
-+	if (alloc_stack) {
-+		if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
-+			kfree(alloc_stack);
-+		else
-+			vfree(alloc_stack);
-+	}
++	help
++	  If you say Y here, all ioperm and iopl calls will return an error.
++	  Ioperm and iopl can be used to modify the running kernel.
++	  Unfortunately, some programs need this access to operate properly,
++	  the most notable of which are XFree86 and hwclock.  hwclock can be
++	  remedied by having RTC support in the kernel, so real-time 
++	  clock support is enabled if this option is enabled, to ensure 
++	  that hwclock operates correctly.  XFree86 still will not 
++	  operate correctly with this option enabled, so DO NOT CHOOSE Y 
++	  IF YOU USE XFree86.  If you use XFree86 and you still want to 
++	  protect your kernel against modification, use the RBAC system.
 +
-+	alloc_stack = NULL;
-+	alloc_stack_size = 1;
-+	alloc_stack_next = 1;
++config GRKERNSEC_PROC_MEMMAP
++	bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
++	default y if (PAX_NOEXEC || PAX_ASLR)
++	depends on PAX_NOEXEC || PAX_ASLR
++	help
++	  If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
++	  give no information about the addresses of its mappings if
++	  PaX features that rely on random addresses are enabled on the task.
++	  If you use PaX it is greatly recommended that you say Y here as it
++	  closes up a hole that makes the full ASLR useless for suid
++	  binaries.
 +
-+	return;
-+}
++config GRKERNSEC_BRUTE
++	bool "Deter exploit bruteforcing"
++	help
++	  If you say Y here, attempts to bruteforce exploits against forking
++	  daemons such as apache or sshd will be deterred.  When a child of a
++	  forking daemon is killed by PaX or crashes due to an illegal
++	  instruction, the parent process will be delayed 30 seconds upon every
++	  subsequent fork until the administrator is able to assess the
++	  situation and restart the daemon.  It is recommended that you also
++	  enable signal logging in the auditing section so that logs are
++	  generated when a process performs an illegal instruction.
 +
-+int
-+acl_alloc_stack_init(unsigned long size)
-+{
-+	if ((size * sizeof (void *)) <= PAGE_SIZE)
-+		alloc_stack =
-+		    (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
-+	else
-+		alloc_stack = (void **) vmalloc(size * sizeof (void *));
++config GRKERNSEC_MODHARDEN
++	bool "Harden module auto-loading"
++	depends on MODULES
++	help
++	  If you say Y here, module auto-loading in response to use of some
++	  feature implemented by an unloaded module will be restricted to
++	  root users.  Enabling this option helps defend against attacks 
++	  by unprivileged users who abuse the auto-loading behavior to 
++	  cause a vulnerable module to load that is then exploited.
 +
-+	alloc_stack_size = size;
++	  If this option prevents a legitimate use of auto-loading for a 
++	  non-root user, the administrator can execute modprobe manually 
++	  with the exact name of the module mentioned in the alert log.
++	  Alternatively, the administrator can add the module to the list
++	  of modules loaded at boot by modifying init scripts.
 +
-+	if (!alloc_stack)
-+		return 0;
-+	else
-+		return 1;
-+}
-diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
---- linux-2.6.32.13/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/gracl.c	2010-05-15 13:21:17.906582737 -0400
-@@ -0,0 +1,3897 @@
++	  Modification of init scripts will most likely be needed on 
++	  Ubuntu servers with encrypted home directory support enabled,
++	  as the first non-root user logging in will cause the ecb(aes),
++	  ecb(aes)-all, cbc(aes), and cbc(aes)-all  modules to be loaded.
++
++config GRKERNSEC_HIDESYM
++	bool "Hide kernel symbols"
++	help
++	  If you say Y here, getting information on loaded modules, and
++	  displaying all kernel symbols through a syscall will be restricted
++	  to users with CAP_SYS_MODULE.  For software compatibility reasons,
++	  /proc/kallsyms will be restricted to the root user.  The RBAC
++	  system can hide that entry even from root.
++
++	  This option also prevents leaking of kernel addresses through
++	  several /proc entries.
++
++	  Note that this option is only effective provided the following
++	  conditions are met:
++	  1) The kernel using grsecurity is not precompiled by some distribution
++	  2) You are using the RBAC system and hiding other files such as your
++	     kernel image and System.map.  Alternatively, enabling this option
++	     causes the permissions on /boot, /lib/modules, and the kernel
++	     source directory to change at compile time to prevent 
++	     reading by non-root users.
++	  If the above conditions are met, this option will aid in providing a
++	  useful protection against local kernel exploitation of overflows
++	  and arbitrary read/write vulnerabilities.
++
++endmenu
++menu "Role Based Access Control Options"
++depends on GRKERNSEC
++
++config GRKERNSEC_NO_RBAC
++	bool "Disable RBAC system"
++	help
++	  If you say Y here, the /dev/grsec device will be removed from the kernel,
++	  preventing the RBAC system from being enabled.  You should only say Y
++	  here if you have no intention of using the RBAC system, so as to prevent
++	  an attacker with root access from misusing the RBAC system to hide files
++	  and processes when loadable module support and /dev/[k]mem have been
++	  locked down.
++
++config GRKERNSEC_ACL_HIDEKERN
++	bool "Hide kernel processes"
++	help
++	  If you say Y here, all kernel threads will be hidden to all
++	  processes but those whose subject has the "view hidden processes"
++	  flag.
++
++config GRKERNSEC_ACL_MAXTRIES
++	int "Maximum tries before password lockout"
++	default 3
++	help
++	  This option enforces the maximum number of times a user can attempt
++	  to authorize themselves with the grsecurity RBAC system before being
++	  denied the ability to attempt authorization again for a specified time.
++	  The lower the number, the harder it will be to brute-force a password.
++
++config GRKERNSEC_ACL_TIMEOUT
++	int "Time to wait after max password tries, in seconds"
++	default 30
++	help
++	  This option specifies the time the user must wait after attempting to
++	  authorize to the RBAC system with the maximum number of invalid
++	  passwords.  The higher the number, the harder it will be to brute-force
++	  a password.
++
++endmenu
++menu "Filesystem Protections"
++depends on GRKERNSEC
++
++config GRKERNSEC_PROC
++	bool "Proc restrictions"
++	help
++	  If you say Y here, the permissions of the /proc filesystem
++	  will be altered to enhance system security and privacy.  You MUST
++  	  choose either a user only restriction or a user and group restriction.
++	  Depending upon the option you choose, you can either restrict users to
++	  see only the processes they themselves run, or choose a group that can
++	  view all processes and files normally restricted to root if you choose
++	  the "restrict to user only" option.  NOTE: If you're running identd as
++	  a non-root user, you will have to run it as the group you specify here.
++
++config GRKERNSEC_PROC_USER
++	bool "Restrict /proc to user only"
++	depends on GRKERNSEC_PROC
++	help
++	  If you say Y here, non-root users will only be able to view their own
++	  processes, and restricts them from viewing network-related information,
++	  and viewing kernel symbol and module information.
++
++config GRKERNSEC_PROC_USERGROUP
++	bool "Allow special group"
++	depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
++	help
++	  If you say Y here, you will be able to select a group that will be
++	  able to view all processes, network-related information, and
++	  kernel and symbol information.  This option is useful if you want
++	  to run identd as a non-root user.
++
++config GRKERNSEC_PROC_GID
++	int "GID for special group"
++	depends on GRKERNSEC_PROC_USERGROUP
++	default 1001
++
++config GRKERNSEC_PROC_ADD
++	bool "Additional restrictions"
++	depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
++	help
++	  If you say Y here, additional restrictions will be placed on
++	  /proc that keep normal users from viewing device information and 
++	  slabinfo information that could be useful for exploits.
++
++config GRKERNSEC_LINK
++	bool "Linking restrictions"
++	help
++	  If you say Y here, /tmp race exploits will be prevented, since users
++	  will no longer be able to follow symlinks owned by other users in
++	  world-writable +t directories (i.e. /tmp), unless the owner of the
++	  symlink is the owner of the directory. users will also not be
++	  able to hardlink to files they do not own.  If the sysctl option is
++	  enabled, a sysctl option with name "linking_restrictions" is created.
++
++config GRKERNSEC_FIFO
++	bool "FIFO restrictions"
++	help
++	  If you say Y here, users will not be able to write to FIFOs they don't
++	  own in world-writable +t directories (i.e. /tmp), unless the owner of
++	  the FIFO is the same owner of the directory it's held in.  If the sysctl
++	  option is enabled, a sysctl option with name "fifo_restrictions" is
++	  created.
++
++config GRKERNSEC_ROFS
++	bool "Runtime read-only mount protection"
++	help
++	  If you say Y here, a sysctl option with name "romount_protect" will
++	  be created.  By setting this option to 1 at runtime, filesystems
++	  will be protected in the following ways:
++	  * No new writable mounts will be allowed
++	  * Existing read-only mounts won't be able to be remounted read/write
++	  * Write operations will be denied on all block devices
++	  This option acts independently of grsec_lock: once it is set to 1,
++	  it cannot be turned off.  Therefore, please be mindful of the resulting
++	  behavior if this option is enabled in an init script on a read-only
++	  filesystem.  This feature is mainly intended for secure embedded systems.
++
++config GRKERNSEC_CHROOT
++	bool "Chroot jail restrictions"
++	help
++	  If you say Y here, you will be able to choose several options that will
++	  make breaking out of a chrooted jail much more difficult.  If you
++	  encounter no software incompatibilities with the following options, it
++	  is recommended that you enable each one.
++
++config GRKERNSEC_CHROOT_MOUNT
++	bool "Deny mounts"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to
++	  mount or remount filesystems.  If the sysctl option is enabled, a
++	  sysctl option with name "chroot_deny_mount" is created.
++
++config GRKERNSEC_CHROOT_DOUBLE
++	bool "Deny double-chroots"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to chroot
++	  again outside the chroot.  This is a widely used method of breaking
++	  out of a chroot jail and should not be allowed.  If the sysctl 
++	  option is enabled, a sysctl option with name 
++	  "chroot_deny_chroot" is created.
++
++config GRKERNSEC_CHROOT_PIVOT
++	bool "Deny pivot_root in chroot"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to use
++	  a function called pivot_root() that was introduced in Linux 2.3.41.  It
++	  works similar to chroot in that it changes the root filesystem.  This
++	  function could be misused in a chrooted process to attempt to break out
++	  of the chroot, and therefore should not be allowed.  If the sysctl
++	  option is enabled, a sysctl option with name "chroot_deny_pivot" is
++	  created.
++
++config GRKERNSEC_CHROOT_CHDIR
++	bool "Enforce chdir(\"/\") on all chroots"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, the current working directory of all newly-chrooted
++	  applications will be set to the the root directory of the chroot.
++	  The man page on chroot(2) states:
++	  Note that this call does not change  the  current  working
++	  directory,  so  that `.' can be outside the tree rooted at
++	  `/'.  In particular, the  super-user  can  escape  from  a
++	  `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
++
++	  It is recommended that you say Y here, since it's not known to break
++	  any software.  If the sysctl option is enabled, a sysctl option with
++	  name "chroot_enforce_chdir" is created.
++
++config GRKERNSEC_CHROOT_CHMOD
++	bool "Deny (f)chmod +s"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to chmod
++	  or fchmod files to make them have suid or sgid bits.  This protects
++	  against another published method of breaking a chroot.  If the sysctl
++	  option is enabled, a sysctl option with name "chroot_deny_chmod" is
++	  created.
++
++config GRKERNSEC_CHROOT_FCHDIR
++	bool "Deny fchdir out of chroot"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, a well-known method of breaking chroots by fchdir'ing
++	  to a file descriptor of the chrooting process that points to a directory
++	  outside the filesystem will be stopped.  If the sysctl option
++	  is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
++
++config GRKERNSEC_CHROOT_MKNOD
++	bool "Deny mknod"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be allowed to
++	  mknod.  The problem with using mknod inside a chroot is that it
++	  would allow an attacker to create a device entry that is the same
++	  as one on the physical root of your system, which could range from
++	  anything from the console device to a device for your harddrive (which
++	  they could then use to wipe the drive or steal data).  It is recommended
++	  that you say Y here, unless you run into software incompatibilities.
++	  If the sysctl option is enabled, a sysctl option with name
++	  "chroot_deny_mknod" is created.
++
++config GRKERNSEC_CHROOT_SHMAT
++	bool "Deny shmat() out of chroot"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to attach
++	  to shared memory segments that were created outside of the chroot jail.
++	  It is recommended that you say Y here.  If the sysctl option is enabled,
++	  a sysctl option with name "chroot_deny_shmat" is created.
++
++config GRKERNSEC_CHROOT_UNIX
++	bool "Deny access to abstract AF_UNIX sockets out of chroot"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to
++	  connect to abstract (meaning not belonging to a filesystem) Unix
++	  domain sockets that were bound outside of a chroot.  It is recommended
++	  that you say Y here.  If the sysctl option is enabled, a sysctl option
++	  with name "chroot_deny_unix" is created.
++
++config GRKERNSEC_CHROOT_FINDTASK
++	bool "Protect outside processes"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to
++	  kill, send signals with fcntl, ptrace, capget, getpgid, setpgid, 
++	  getsid, or view any process outside of the chroot.  If the sysctl
++	  option is enabled, a sysctl option with name "chroot_findtask" is
++	  created.
++
++config GRKERNSEC_CHROOT_NICE
++	bool "Restrict priority changes"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to raise
++	  the priority of processes in the chroot, or alter the priority of
++	  processes outside the chroot.  This provides more security than simply
++	  removing CAP_SYS_NICE from the process' capability set.  If the
++	  sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
++	  is created.
++
++config GRKERNSEC_CHROOT_SYSCTL
++	bool "Deny sysctl writes"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, an attacker in a chroot will not be able to
++	  write to sysctl entries, either by sysctl(2) or through a /proc
++	  interface.  It is strongly recommended that you say Y here. If the
++	  sysctl option is enabled, a sysctl option with name
++	  "chroot_deny_sysctl" is created.
++
++config GRKERNSEC_CHROOT_CAPS
++	bool "Capability restrictions"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, the capabilities on all root processes within a
++	  chroot jail will be lowered to stop module insertion, raw i/o,
++	  system and net admin tasks, rebooting the system, modifying immutable
++	  files, modifying IPC owned by another, and changing the system time.
++	  This is left an option because it can break some apps.  Disable this
++	  if your chrooted apps are having problems performing those kinds of
++	  tasks.  If the sysctl option is enabled, a sysctl option with
++	  name "chroot_caps" is created.
++
++endmenu
++menu "Kernel Auditing"
++depends on GRKERNSEC
++
++config GRKERNSEC_AUDIT_GROUP
++	bool "Single group for auditing"
++	help
++	  If you say Y here, the exec, chdir, and (un)mount logging features
++	  will only operate on a group you specify.  This option is recommended
++	  if you only want to watch certain users instead of having a large
++	  amount of logs from the entire system.  If the sysctl option is enabled,
++	  a sysctl option with name "audit_group" is created.
++
++config GRKERNSEC_AUDIT_GID
++	int "GID for auditing"
++	depends on GRKERNSEC_AUDIT_GROUP
++	default 1007
++
++config GRKERNSEC_EXECLOG
++	bool "Exec logging"
++	help
++	  If you say Y here, all execve() calls will be logged (since the
++	  other exec*() calls are frontends to execve(), all execution
++	  will be logged).  Useful for shell-servers that like to keep track
++	  of their users.  If the sysctl option is enabled, a sysctl option with
++	  name "exec_logging" is created.
++	  WARNING: This option when enabled will produce a LOT of logs, especially
++	  on an active system.
++
++config GRKERNSEC_RESLOG
++	bool "Resource logging"
++	help
++	  If you say Y here, all attempts to overstep resource limits will
++	  be logged with the resource name, the requested size, and the current
++	  limit.  It is highly recommended that you say Y here.  If the sysctl
++	  option is enabled, a sysctl option with name "resource_logging" is
++	  created.  If the RBAC system is enabled, the sysctl value is ignored.
++
++config GRKERNSEC_CHROOT_EXECLOG
++	bool "Log execs within chroot"
++	help
++	  If you say Y here, all executions inside a chroot jail will be logged
++	  to syslog.  This can cause a large amount of logs if certain
++	  applications (eg. djb's daemontools) are installed on the system, and
++	  is therefore left as an option.  If the sysctl option is enabled, a
++	  sysctl option with name "chroot_execlog" is created.
++
++config GRKERNSEC_AUDIT_PTRACE
++	bool "Ptrace logging"
++	help
++	  If you say Y here, all attempts to attach to a process via ptrace
++	  will be logged.  If the sysctl option is enabled, a sysctl option
++	  with name "audit_ptrace" is created.
++
++config GRKERNSEC_AUDIT_CHDIR
++	bool "Chdir logging"
++	help
++	  If you say Y here, all chdir() calls will be logged.  If the sysctl
++ 	  option is enabled, a sysctl option with name "audit_chdir" is created.
++
++config GRKERNSEC_AUDIT_MOUNT
++	bool "(Un)Mount logging"
++	help
++	  If you say Y here, all mounts and unmounts will be logged.  If the
++	  sysctl option is enabled, a sysctl option with name "audit_mount" is
++	  created.
++
++config GRKERNSEC_SIGNAL
++	bool "Signal logging"
++	help
++	  If you say Y here, certain important signals will be logged, such as
++	  SIGSEGV, which will as a result inform you of when a error in a program
++	  occurred, which in some cases could mean a possible exploit attempt.
++	  If the sysctl option is enabled, a sysctl option with name
++	  "signal_logging" is created.
++
++config GRKERNSEC_FORKFAIL
++	bool "Fork failure logging"
++	help
++	  If you say Y here, all failed fork() attempts will be logged.
++	  This could suggest a fork bomb, or someone attempting to overstep
++	  their process limit.  If the sysctl option is enabled, a sysctl option
++	  with name "forkfail_logging" is created.
++
++config GRKERNSEC_TIME
++	bool "Time change logging"
++	help
++	  If you say Y here, any changes of the system clock will be logged.
++	  If the sysctl option is enabled, a sysctl option with name
++	  "timechange_logging" is created.
++
++config GRKERNSEC_PROC_IPADDR
++	bool "/proc/<pid>/ipaddr support"
++	help
++	  If you say Y here, a new entry will be added to each /proc/<pid>
++	  directory that contains the IP address of the person using the task.
++	  The IP is carried across local TCP and AF_UNIX stream sockets.
++	  This information can be useful for IDS/IPSes to perform remote response
++	  to a local attack.  The entry is readable by only the owner of the
++	  process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
++	  the RBAC system), and thus does not create privacy concerns.
++
++config GRKERNSEC_RWXMAP_LOG
++	bool 'Denied RWX mmap/mprotect logging'
++	depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
++	help
++	  If you say Y here, calls to mmap() and mprotect() with explicit
++	  usage of PROT_WRITE and PROT_EXEC together will be logged when
++	  denied by the PAX_MPROTECT feature.  If the sysctl option is
++	  enabled, a sysctl option with name "rwxmap_logging" is created.
++
++config GRKERNSEC_AUDIT_TEXTREL
++	bool 'ELF text relocations logging (READ HELP)'
++	depends on PAX_MPROTECT
++	help
++	  If you say Y here, text relocations will be logged with the filename
++	  of the offending library or binary.  The purpose of the feature is
++	  to help Linux distribution developers get rid of libraries and
++	  binaries that need text relocations which hinder the future progress
++	  of PaX.  Only Linux distribution developers should say Y here, and
++	  never on a production machine, as this option creates an information
++	  leak that could aid an attacker in defeating the randomization of
++	  a single memory region.  If the sysctl option is enabled, a sysctl
++	  option with name "audit_textrel" is created.
++
++endmenu
++
++menu "Executable Protections"
++depends on GRKERNSEC
++
++config GRKERNSEC_EXECVE
++	bool "Enforce RLIMIT_NPROC on execs"
++	help
++	  If you say Y here, users with a resource limit on processes will
++	  have the value checked during execve() calls.  The current system
++	  only checks the system limit during fork() calls.  If the sysctl option
++	  is enabled, a sysctl option with name "execve_limiting" is created.
++
++config GRKERNSEC_DMESG
++	bool "Dmesg(8) restriction"
++	help
++	  If you say Y here, non-root users will not be able to use dmesg(8)
++	  to view up to the last 4kb of messages in the kernel's log buffer.
++	  If the sysctl option is enabled, a sysctl option with name "dmesg" is
++	  created.
++
++config GRKERNSEC_HARDEN_PTRACE
++	bool "Deter ptrace-based process snooping"
++	help
++	  If you say Y here, TTY sniffers and other malicious monitoring
++	  programs implemented through ptrace will be defeated.  If you
++	  have been using the RBAC system, this option has already been
++	  enabled for several years for all users, with the ability to make
++	  fine-grained exceptions.
++
++	  This option only affects the ability of non-root users to ptrace
++	  processes that are not a descendent of the ptracing process.
++	  This means that strace ./binary and gdb ./binary will still work,
++	  but attaching to arbitrary processes will not.  If the sysctl
++	  option is enabled, a sysctl option with name "harden_ptrace" is
++	  created.
++
++config GRKERNSEC_TPE
++	bool "Trusted Path Execution (TPE)"
++	help
++	  If you say Y here, you will be able to choose a gid to add to the
++	  supplementary groups of users you want to mark as "untrusted."
++	  These users will not be able to execute any files that are not in
++	  root-owned directories writable only by root.  If the sysctl option
++	  is enabled, a sysctl option with name "tpe" is created.
++
++config GRKERNSEC_TPE_ALL
++	bool "Partially restrict all non-root users"
++	depends on GRKERNSEC_TPE
++	help
++	  If you say Y here, all non-root users will be covered under
++	  a weaker TPE restriction.  This is separate from, and in addition to,
++	  the main TPE options that you have selected elsewhere.  Thus, if a
++	  "trusted" GID is chosen, this restriction applies to even that GID.
++	  Under this restriction, all non-root users will only be allowed to
++	  execute files in directories they own that are not group or
++	  world-writable, or in directories owned by root and writable only by
++	  root.  If the sysctl option is enabled, a sysctl option with name
++	  "tpe_restrict_all" is created.
++
++config GRKERNSEC_TPE_INVERT
++	bool "Invert GID option"
++	depends on GRKERNSEC_TPE
++	help
++	  If you say Y here, the group you specify in the TPE configuration will
++	  decide what group TPE restrictions will be *disabled* for.  This
++	  option is useful if you want TPE restrictions to be applied to most
++	  users on the system.  If the sysctl option is enabled, a sysctl option
++	  with name "tpe_invert" is created.  Unlike other sysctl options, this
++	  entry will default to on for backward-compatibility.
++
++config GRKERNSEC_TPE_GID
++	int "GID for untrusted users"
++	depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
++	default 1005
++	help
++	  Setting this GID determines what group TPE restrictions will be
++	  *enabled* for.  If the sysctl option is enabled, a sysctl option
++	  with name "tpe_gid" is created.
++
++config GRKERNSEC_TPE_GID
++	int "GID for trusted users"
++	depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
++	default 1005
++	help
++	  Setting this GID determines what group TPE restrictions will be
++	  *disabled* for.  If the sysctl option is enabled, a sysctl option
++	  with name "tpe_gid" is created.
++
++endmenu
++menu "Network Protections"
++depends on GRKERNSEC
++
++config GRKERNSEC_RANDNET
++	bool "Larger entropy pools"
++	help
++	  If you say Y here, the entropy pools used for many features of Linux
++	  and grsecurity will be doubled in size.  Since several grsecurity
++	  features use additional randomness, it is recommended that you say Y
++	  here.  Saying Y here has a similar effect as modifying
++	  /proc/sys/kernel/random/poolsize.
++
++config GRKERNSEC_BLACKHOLE
++	bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
++	help
++	  If you say Y here, neither TCP resets nor ICMP
++	  destination-unreachable packets will be sent in response to packets
++	  sent to ports for which no associated listening process exists.
++	  This feature supports both IPV4 and IPV6 and exempts the 
++	  loopback interface from blackholing.  Enabling this feature 
++	  makes a host more resilient to DoS attacks and reduces network
++	  visibility against scanners.
++
++	  The blackhole feature as-implemented is equivalent to the FreeBSD
++	  blackhole feature, as it prevents RST responses to all packets, not
++	  just SYNs.  Under most application behavior this causes no
++	  problems, but applications (like haproxy) may not close certain
++	  connections in a way that cleanly terminates them on the remote
++	  end, leaving the remote host in LAST_ACK state.  Because of this
++	  side-effect and to prevent intentional LAST_ACK DoSes, this
++	  feature also adds automatic mitigation against such attacks.
++	  The mitigation drastically reduces the amount of time a socket
++	  can spend in LAST_ACK state.  If you're using haproxy and not
++	  all servers it connects to have this option enabled, consider
++	  disabling this feature on the haproxy host.
++
++	  If the sysctl option is enabled, two sysctl options with names
++	  "ip_blackhole" and "lastack_retries" will be created.
++	  While "ip_blackhole" takes the standard zero/non-zero on/off
++	  toggle, "lastack_retries" uses the same kinds of values as
++	  "tcp_retries1" and "tcp_retries2".  The default value of 4
++	  prevents a socket from lasting more than 45 seconds in LAST_ACK
++	  state.
++
++config GRKERNSEC_SOCKET
++	bool "Socket restrictions"
++	help
++	  If you say Y here, you will be able to choose from several options.
++	  If you assign a GID on your system and add it to the supplementary
++	  groups of users you want to restrict socket access to, this patch
++	  will perform up to three things, based on the option(s) you choose.
++
++config GRKERNSEC_SOCKET_ALL
++	bool "Deny any sockets to group"
++	depends on GRKERNSEC_SOCKET
++	help
++	  If you say Y here, you will be able to choose a GID of whose users will
++	  be unable to connect to other hosts from your machine or run server
++	  applications from your machine.  If the sysctl option is enabled, a
++	  sysctl option with name "socket_all" is created.
++
++config GRKERNSEC_SOCKET_ALL_GID
++	int "GID to deny all sockets for"
++	depends on GRKERNSEC_SOCKET_ALL
++	default 1004
++	help
++	  Here you can choose the GID to disable socket access for. Remember to
++	  add the users you want socket access disabled for to the GID
++	  specified here.  If the sysctl option is enabled, a sysctl option
++	  with name "socket_all_gid" is created.
++
++config GRKERNSEC_SOCKET_CLIENT
++	bool "Deny client sockets to group"
++	depends on GRKERNSEC_SOCKET
++	help
++	  If you say Y here, you will be able to choose a GID of whose users will
++	  be unable to connect to other hosts from your machine, but will be
++	  able to run servers.  If this option is enabled, all users in the group
++	  you specify will have to use passive mode when initiating ftp transfers
++	  from the shell on your machine.  If the sysctl option is enabled, a
++	  sysctl option with name "socket_client" is created.
++
++config GRKERNSEC_SOCKET_CLIENT_GID
++	int "GID to deny client sockets for"
++	depends on GRKERNSEC_SOCKET_CLIENT
++	default 1003
++	help
++	  Here you can choose the GID to disable client socket access for.
++	  Remember to add the users you want client socket access disabled for to
++	  the GID specified here.  If the sysctl option is enabled, a sysctl
++	  option with name "socket_client_gid" is created.
++
++config GRKERNSEC_SOCKET_SERVER
++	bool "Deny server sockets to group"
++	depends on GRKERNSEC_SOCKET
++	help
++	  If you say Y here, you will be able to choose a GID of whose users will
++	  be unable to run server applications from your machine.  If the sysctl
++	  option is enabled, a sysctl option with name "socket_server" is created.
++
++config GRKERNSEC_SOCKET_SERVER_GID
++	int "GID to deny server sockets for"
++	depends on GRKERNSEC_SOCKET_SERVER
++	default 1002
++	help
++	  Here you can choose the GID to disable server socket access for.
++	  Remember to add the users you want server socket access disabled for to
++	  the GID specified here.  If the sysctl option is enabled, a sysctl
++	  option with name "socket_server_gid" is created.
++
++endmenu
++menu "Sysctl support"
++depends on GRKERNSEC && SYSCTL
++
++config GRKERNSEC_SYSCTL
++	bool "Sysctl support"
++	help
++	  If you say Y here, you will be able to change the options that
++	  grsecurity runs with at bootup, without having to recompile your
++	  kernel.  You can echo values to files in /proc/sys/kernel/grsecurity
++	  to enable (1) or disable (0) various features.  All the sysctl entries
++	  are mutable until the "grsec_lock" entry is set to a non-zero value.
++	  All features enabled in the kernel configuration are disabled at boot
++	  if you do not say Y to the "Turn on features by default" option.
++	  All options should be set at startup, and the grsec_lock entry should
++	  be set to a non-zero value after all the options are set.
++	  *THIS IS EXTREMELY IMPORTANT*
++
++config GRKERNSEC_SYSCTL_DISTRO
++	bool "Extra sysctl support for distro makers (READ HELP)"
++	depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
++	help
++	  If you say Y here, additional sysctl options will be created
++	  for features that affect processes running as root.  Therefore,
++	  it is critical when using this option that the grsec_lock entry be
++	  enabled after boot.  Only distros with prebuilt kernel packages
++	  with this option enabled that can ensure grsec_lock is enabled
++	  after boot should use this option.
++	  *Failure to set grsec_lock after boot makes all grsec features
++	  this option covers useless*
++
++	  Currently this option creates the following sysctl entries:
++	  "Disable Privileged I/O": "disable_priv_io"	
++
++config GRKERNSEC_SYSCTL_ON
++	bool "Turn on features by default"
++	depends on GRKERNSEC_SYSCTL
++	help
++	  If you say Y here, instead of having all features enabled in the
++	  kernel configuration disabled at boot time, the features will be
++	  enabled at boot time.  It is recommended you say Y here unless
++	  there is some reason you would want all sysctl-tunable features to
++	  be disabled by default.  As mentioned elsewhere, it is important
++	  to enable the grsec_lock entry once you have finished modifying
++	  the sysctl entries.
++
++endmenu
++menu "Logging Options"
++depends on GRKERNSEC
++
++config GRKERNSEC_FLOODTIME
++	int "Seconds in between log messages (minimum)"
++	default 10
++	help
++	  This option allows you to enforce the number of seconds between
++	  grsecurity log messages.  The default should be suitable for most
++	  people, however, if you choose to change it, choose a value small enough
++	  to allow informative logs to be produced, but large enough to
++	  prevent flooding.
++
++config GRKERNSEC_FLOODBURST
++	int "Number of messages in a burst (maximum)"
++	default 4
++	help
++	  This option allows you to choose the maximum number of messages allowed
++	  within the flood time interval you chose in a separate option.  The
++	  default should be suitable for most people, however if you find that
++	  many of your logs are being interpreted as flooding, you may want to
++	  raise this value.
++
++endmenu
++
++endmenu
+diff --git a/grsecurity/Makefile b/grsecurity/Makefile
+new file mode 100644
+index 0000000..de14237
+--- /dev/null
++++ b/grsecurity/Makefile
+@@ -0,0 +1,29 @@
++# grsecurity's ACL system was originally written in 2001 by Michael Dalton
++# during 2001-2009 it has been completely redesigned by Brad Spengler
++# into an RBAC system
++#
++# All code in this directory and various hooks inserted throughout the kernel
++# are copyright Brad Spengler - Open Source Security, Inc., and released 
++# under the GPL v2 or higher
++
++obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
++	grsec_mount.o grsec_sig.o grsec_sock.o grsec_sysctl.o \
++	grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
++
++obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_ip.o gracl_segv.o \
++	gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
++	gracl_learn.o grsec_log.o
++obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
++
++ifndef CONFIG_GRKERNSEC
++obj-y += grsec_disabled.o
++endif
++
++ifdef CONFIG_GRKERNSEC_HIDESYM
++extra-y := grsec_hidesym.o
++$(obj)/grsec_hidesym.o:
++	@-chmod -f 500 /boot
++	@-chmod -f 500 /lib/modules
++	@-chmod -f 700 .
++	@echo '  grsec: protected kernel image paths'
++endif
+diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
+new file mode 100644
+index 0000000..5b66fee
+--- /dev/null
++++ b/grsecurity/gracl.c
+@@ -0,0 +1,3943 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -34489,15 +36297,17 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +extern void gr_remove_uid(uid_t uid);
 +extern int gr_find_uid(uid_t uid);
 +
++extern spinlock_t vfsmount_lock;
++
 +__inline__ int
 +gr_acl_is_enabled(void)
 +{
 +	return (gr_status & GR_READY);
 +}
 +
-+char gr_roletype_to_char(void)
++static char gr_task_roletype_to_char(struct task_struct *task)
 +{
-+	switch (current->role->roletype &
++	switch (task->role->roletype &
 +		(GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
 +		 GR_ROLE_SPECIAL)) {
 +	case GR_ROLE_DEFAULT:
@@ -34513,6 +36323,11 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +	return 'X';
 +}
 +
++char gr_roletype_to_char(void)
++{
++	return gr_task_roletype_to_char(current);
++}
++
 +__inline__ int
 +gr_acl_tpe_check(void)
 +{
@@ -34553,6 +36368,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +	char * retval;
 +	int namelen;
 +
++	spin_lock(&vfsmount_lock);
 +	*--end = '\0';
 +	buflen--;
 +
@@ -34569,14 +36385,11 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +			break;
 +		if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
 +			/* Global root? */
-+			spin_lock(&vfsmount_lock);
 +			if (vfsmnt->mnt_parent == vfsmnt) {
-+				spin_unlock(&vfsmount_lock);
 +				goto global_root;
 +			}
 +			dentry = vfsmnt->mnt_mountpoint;
 +			vfsmnt = vfsmnt->mnt_parent;
-+			spin_unlock(&vfsmount_lock);
 +			continue;
 +		}
 +		parent = dentry->d_parent;
@@ -34592,6 +36405,8 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +		dentry = parent;
 +	}
 +
++out:
++	spin_unlock(&vfsmount_lock);
 +	return retval;
 +
 +global_root:
@@ -34601,9 +36416,10 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +		goto Elong;
 +	retval -= namelen-1;	/* hit the slash */
 +	memcpy(retval, dentry->d_name.name, namelen);
-+	return retval;
++	goto out;
 +Elong:
-+	return ERR_PTR(-ENAMETOOLONG);
++	retval = ERR_PTR(-ENAMETOOLONG);
++	goto out;
 +}
 +
 +static char *
@@ -36516,6 +38332,29 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +	return 0;
 +}
 +
++int
++gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
++{
++	struct task_struct *p;
++	int ret = 0;
++
++	if (unlikely(!(gr_status & GR_READY) || !pid))
++		return ret;
++
++	read_lock(&tasklist_lock);
++	do_each_pid_task(pid, type, p) {
++		if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
++		    p->acl != current->acl) {
++			ret = 1;
++			goto out;
++		}
++	} while_each_pid_task(pid, type, p);
++out:
++	read_unlock(&tasklist_lock);
++
++	return ret;
++}
++
 +void
 +gr_copy_label(struct task_struct *tsk)
 +{
@@ -37155,7 +38994,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +	read_lock(&tasklist_lock);
 +	read_lock(&grsec_exec_file_lock);
 +
-+	tsk = current->parent;
++	tsk = current->real_parent;
 +	if (tsk == NULL)
 +		goto out_unlock;
 +
@@ -37237,7 +39076,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +				while (p3->pid > 0) {
 +					if (p3 == p)
 +						break;
-+					p3 = p3->parent;
++					p3 = p3->real_parent;
 +				}
 +				if (p3 == p)
 +					break;
@@ -37449,8 +39288,8 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +			char *p = "";
 +			assign_special_role(gr_usermode->sp_role);
 +			read_lock(&tasklist_lock);
-+			if (current->parent)
-+				p = current->parent->role->rolename;
++			if (current->real_parent)
++				p = current->real_parent->role->rolename;
 +			read_unlock(&tasklist_lock);
 +			gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
 +					p, acl_sp_role_value);
@@ -37475,9 +39314,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +			int i = 0;
 +
 +			read_lock(&tasklist_lock);
-+			if (current->parent) {
-+				p = current->parent->role->rolename;
-+				i = current->parent->acl_role_id;
++			if (current->real_parent) {
++				p = current->real_parent->role->rolename;
++				i = current->real_parent->acl_role_id;
 +			}
 +			read_unlock(&tasklist_lock);
 +
@@ -37815,7 +39654,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +__u32
 +gr_handle_sysctl(const struct ctl_table *table, const int op)
 +{
-+	ctl_table *tmp;
++	struct ctl_table *tmp;
 +	const char *proc_sys = "/proc/sys";
 +	char *path;
 +	struct acl_object_label *obj;
@@ -37848,7 +39687,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +
 +	/* convert the requested sysctl entry into a pathname */
 +
-+	for (tmp = (ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
++	for (tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
 +		len += strlen(tmp->procname);
 +		len++;
 +		depth++;
@@ -37868,7 +39707,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +	for (; depth > 0; depth--) {
 +		path[pos] = '/';
 +		pos++;
-+		for (i = 1, tmp = (ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
++		for (i = 1, tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
 +			if (depth == i) {
 +				memcpy(path + pos, tmp->procname,
 +				       strlen(tmp->procname));
@@ -37936,7 +39775,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +	while (tmp->pid > 0) {
 +		if (tmp == curtemp)
 +			break;
-+		tmp = tmp->parent;
++		tmp = tmp->real_parent;
 +	}
 +
 +	if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
@@ -37969,6 +39808,19 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +	return 0;
 +}
 +
++void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
++{
++	if (unlikely(!(gr_status & GR_READY)))
++		return;
++
++	if (!(current->role->roletype & GR_ROLE_GOD))
++		return;
++
++	seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
++			p->role->rolename, gr_task_roletype_to_char(p),
++			p->acl->filename);
++}
++
 +int
 +gr_handle_ptrace(struct task_struct *task, const long request)
 +{
@@ -37985,7 +39837,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +	while (tmp->pid > 0) {
 +		if (tmp == curtemp)
 +			break;
-+		tmp = tmp->parent;
++		tmp = tmp->real_parent;
 +	}
 +
 +	if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
@@ -38050,7 +39902,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +	struct acl_object_label *obj, *obj2;
 +
 +	if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
-+	    !task->is_writable && S_ISREG(filp->f_path.dentry->d_inode->i_mode)) {
++	    !task->is_writable && S_ISREG(filp->f_path.dentry->d_inode->i_mode) && filp->f_path.mnt != shm_mnt) {
 +		obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
 +		obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
 +				     task->role->root_label);
@@ -38187,10 +40039,10 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +	   who have the 'view' subject flag if the RBAC system is enabled
 +	*/
 +
++	rcu_read_lock();
 +	read_lock(&tasklist_lock);
 +	task = find_task_by_vpid(pid);
 +	if (task) {
-+		gr_fs_read_lock(task);
 +#ifdef CONFIG_GRKERNSEC_CHROOT
 +		if (proc_is_chrooted(task))
 +			ret = -EACCES;
@@ -38209,12 +40061,11 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +			if (!(task->acl->mode & GR_VIEW))
 +				ret = -EACCES;
 +		}
-+		
-+		gr_fs_read_unlock(task);
 +	} else
 +		ret = -ENOENT;
 +
 +	read_unlock(&tasklist_lock);
++	rcu_read_unlock();
 +
 +	return ret;
 +}
@@ -38290,6 +40141,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +	return (obj->mode & GR_FIND) ? 1 : 0;
 +}
 +
++#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
++EXPORT_SYMBOL(gr_acl_is_enabled);
++#endif
 +EXPORT_SYMBOL(gr_learn_resource);
 +EXPORT_SYMBOL(gr_set_kernel_label);
 +#ifdef CONFIG_SECURITY
@@ -38297,10 +40151,123 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff -urNp linux-2.6.32.13/grsecurity/gracl_cap.c linux-2.6.32.13/grsecurity/gracl_cap.c
---- linux-2.6.32.13/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/gracl_cap.c	2010-05-15 13:21:17.906582737 -0400
-@@ -0,0 +1,131 @@
+diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
+new file mode 100644
+index 0000000..34fefda
+--- /dev/null
++++ b/grsecurity/gracl_alloc.c
+@@ -0,0 +1,105 @@
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <linux/gracl.h>
++#include <linux/grsecurity.h>
++
++static unsigned long alloc_stack_next = 1;
++static unsigned long alloc_stack_size = 1;
++static void **alloc_stack;
++
++static __inline__ int
++alloc_pop(void)
++{
++	if (alloc_stack_next == 1)
++		return 0;
++
++	kfree(alloc_stack[alloc_stack_next - 2]);
++
++	alloc_stack_next--;
++
++	return 1;
++}
++
++static __inline__ int
++alloc_push(void *buf)
++{
++	if (alloc_stack_next >= alloc_stack_size)
++		return 1;
++
++	alloc_stack[alloc_stack_next - 1] = buf;
++
++	alloc_stack_next++;
++
++	return 0;
++}
++
++void *
++acl_alloc(unsigned long len)
++{
++	void *ret = NULL;
++
++	if (!len || len > PAGE_SIZE)
++		goto out;
++
++	ret = kmalloc(len, GFP_KERNEL);
++
++	if (ret) {
++		if (alloc_push(ret)) {
++			kfree(ret);
++			ret = NULL;
++		}
++	}
++
++out:
++	return ret;
++}
++
++void *
++acl_alloc_num(unsigned long num, unsigned long len)
++{
++	if (!len || (num > (PAGE_SIZE / len)))
++		return NULL;
++
++	return acl_alloc(num * len);
++}
++
++void
++acl_free_all(void)
++{
++	if (gr_acl_is_enabled() || !alloc_stack)
++		return;
++
++	while (alloc_pop()) ;
++
++	if (alloc_stack) {
++		if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
++			kfree(alloc_stack);
++		else
++			vfree(alloc_stack);
++	}
++
++	alloc_stack = NULL;
++	alloc_stack_size = 1;
++	alloc_stack_next = 1;
++
++	return;
++}
++
++int
++acl_alloc_stack_init(unsigned long size)
++{
++	if ((size * sizeof (void *)) <= PAGE_SIZE)
++		alloc_stack =
++		    (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
++	else
++		alloc_stack = (void **) vmalloc(size * sizeof (void *));
++
++	alloc_stack_size = size;
++
++	if (!alloc_stack)
++		return 0;
++	else
++		return 1;
++}
+diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
+new file mode 100644
+index 0000000..8a4af14
+--- /dev/null
++++ b/grsecurity/gracl_cap.c
+@@ -0,0 +1,138 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -38355,6 +40322,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_cap.c linux-2.6.32.13/grsecurity/gra
 +	const struct cred *cred = current_cred();
 +	struct acl_subject_label *curracl;
 +	kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
++	kernel_cap_t cap_audit = __cap_empty_set;
 +
 +	if (!gr_acl_is_enabled())
 +		return 1;
@@ -38363,6 +40331,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_cap.c linux-2.6.32.13/grsecurity/gra
 +
 +	cap_drop = curracl->cap_lower;
 +	cap_mask = curracl->cap_mask;
++	cap_audit = curracl->cap_invert_audit;
 +
 +	while ((curracl = curracl->parent_subject)) {
 +		/* if the cap isn't specified in the current computed mask but is specified in the
@@ -38374,11 +40343,16 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_cap.c linux-2.6.32.13/grsecurity/gra
 +			cap_raise(cap_mask, cap);
 +			if (cap_raised(curracl->cap_lower, cap))
 +				cap_raise(cap_drop, cap);
++			if (cap_raised(curracl->cap_invert_audit, cap))
++				cap_raise(cap_audit, cap);
 +		}
 +	}
 +
-+	if (!cap_raised(cap_drop, cap))
++	if (!cap_raised(cap_drop, cap)) {
++		if (cap_raised(cap_audit, cap))
++			gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
 +		return 1;
++	}
 +
 +	curracl = task->acl;
 +
@@ -38394,7 +40368,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_cap.c linux-2.6.32.13/grsecurity/gra
 +		return 1;
 +	}
 +
-+	if ((cap >= 0) && (cap < (sizeof(captab_log)/sizeof(captab_log[0]))) && cap_raised(cred->cap_effective, cap))
++	if ((cap >= 0) && (cap < (sizeof(captab_log)/sizeof(captab_log[0]))) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
 +		gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
 +	return 0;
 +}
@@ -38432,9 +40406,11 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_cap.c linux-2.6.32.13/grsecurity/gra
 +	return 0;
 +}
 +
-diff -urNp linux-2.6.32.13/grsecurity/gracl_fs.c linux-2.6.32.13/grsecurity/gracl_fs.c
---- linux-2.6.32.13/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/gracl_fs.c	2010-05-15 13:21:17.906582737 -0400
+diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
+new file mode 100644
+index 0000000..38edce4
+--- /dev/null
++++ b/grsecurity/gracl_fs.c
 @@ -0,0 +1,424 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -38860,9 +40836,11 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_fs.c linux-2.6.32.13/grsecurity/grac
 +
 +	return 0;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/gracl_ip.c linux-2.6.32.13/grsecurity/gracl_ip.c
---- linux-2.6.32.13/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/gracl_ip.c	2010-05-15 13:21:17.906582737 -0400
+diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
+new file mode 100644
+index 0000000..a49d169
+--- /dev/null
++++ b/grsecurity/gracl_ip.c
 @@ -0,0 +1,339 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
@@ -39048,13 +41026,13 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_ip.c linux-2.6.32.13/grsecurity/grac
 +	/* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
 +	if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
 +		addr->sin_addr.s_addr = curr->inaddr_any_override;
-+	if ((full_mode & GR_CONNECT) && isk->saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
++	if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
 +		struct sockaddr_in saddr;
 +		int err;
 +
 +		saddr.sin_family = AF_INET;
 +		saddr.sin_addr.s_addr = curr->inaddr_any_override;
-+		saddr.sin_port = isk->sport;
++		saddr.sin_port = isk->inet_sport;
 +
 +		err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
 +		if (err)
@@ -39157,8 +41135,8 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_ip.c linux-2.6.32.13/grsecurity/grac
 +	struct sock *sk = sock->sk;
 +	struct sockaddr_in addr;
 +
-+	addr.sin_addr.s_addr = inet_sk(sk)->saddr;
-+	addr.sin_port = inet_sk(sk)->sport;
++	addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
++	addr.sin_port = inet_sk(sk)->inet_sport;
 +
 +	return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
 +}
@@ -39168,8 +41146,8 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_ip.c linux-2.6.32.13/grsecurity/grac
 +	struct sock *sk = sock->sk;
 +	struct sockaddr_in addr;
 +
-+	addr.sin_addr.s_addr = inet_sk(sk)->saddr;
-+	addr.sin_port = inet_sk(sk)->sport;
++	addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
++	addr.sin_port = inet_sk(sk)->inet_sport;
 +
 +	return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
 +}
@@ -39183,8 +41161,8 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_ip.c linux-2.6.32.13/grsecurity/grac
 +		struct sockaddr_in sin;
 +		const struct inet_sock *inet = inet_sk(sk);
 +
-+		sin.sin_addr.s_addr = inet->daddr;
-+		sin.sin_port = inet->dport;
++		sin.sin_addr.s_addr = inet->inet_daddr;
++		sin.sin_port = inet->inet_dport;
 +
 +		return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +	}
@@ -39203,9 +41181,11 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_ip.c linux-2.6.32.13/grsecurity/grac
 +
 +	return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff -urNp linux-2.6.32.13/grsecurity/gracl_learn.c linux-2.6.32.13/grsecurity/gracl_learn.c
---- linux-2.6.32.13/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/gracl_learn.c	2010-05-15 13:21:17.906582737 -0400
+diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
+new file mode 100644
+index 0000000..67dd9ba
+--- /dev/null
++++ b/grsecurity/gracl_learn.c
 @@ -0,0 +1,211 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -39418,10 +41398,12 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_learn.c linux-2.6.32.13/grsecurity/g
 +	.release	= close_learn,
 +	.poll		= poll_learn,
 +};
-diff -urNp linux-2.6.32.13/grsecurity/gracl_res.c linux-2.6.32.13/grsecurity/gracl_res.c
---- linux-2.6.32.13/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/gracl_res.c	2010-05-15 13:21:17.906582737 -0400
-@@ -0,0 +1,65 @@
+diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
+new file mode 100644
+index 0000000..39645c9
+--- /dev/null
++++ b/grsecurity/gracl_res.c
+@@ -0,0 +1,68 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/gracl.h>
@@ -39452,12 +41434,21 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_res.c linux-2.6.32.13/grsecurity/gra
 +		const int res, const unsigned long wanted, const int gt)
 +{
 +	const struct cred *cred;
++	unsigned long rlim;
 +
 +	if (!gr_acl_is_enabled() && !grsec_resource_logging)
 +		return;
 +
 +	// not yet supported resource
-+	if (!restab_log[res])
++	if (unlikely(!restab_log[res]))
++		return;
++
++	if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
++		rlim = task_rlimit_max(task, res);
++	else
++		rlim = task_rlimit(task, res);
++
++	if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
 +		return;
 +
 +	rcu_read_lock();
@@ -39474,22 +41465,18 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_res.c linux-2.6.32.13/grsecurity/gra
 +		goto out_rcu_unlock;
 +	rcu_read_unlock();
 +
-+	preempt_disable();
-+
-+	if (unlikely(((gt && wanted > task->signal->rlim[res].rlim_cur) ||
-+		      (!gt && wanted >= task->signal->rlim[res].rlim_cur)) &&
-+		     task->signal->rlim[res].rlim_cur != RLIM_INFINITY))
-+		gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], task->signal->rlim[res].rlim_cur);
-+	preempt_enable_no_resched();
++	gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
 +
 +	return;
 +out_rcu_unlock:
 +	rcu_read_unlock();
 +	return;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/gracl_segv.c linux-2.6.32.13/grsecurity/gracl_segv.c
---- linux-2.6.32.13/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/gracl_segv.c	2010-05-15 13:21:17.906582737 -0400
+diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
+new file mode 100644
+index 0000000..61ed7ed
+--- /dev/null
++++ b/grsecurity/gracl_segv.c
 @@ -0,0 +1,310 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -39801,10 +41788,12 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_segv.c linux-2.6.32.13/grsecurity/gr
 +
 +	return;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/gracl_shm.c linux-2.6.32.13/grsecurity/gracl_shm.c
---- linux-2.6.32.13/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/gracl_shm.c	2010-05-15 13:21:17.906582737 -0400
-@@ -0,0 +1,37 @@
+diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
+new file mode 100644
+index 0000000..9d83a69
+--- /dev/null
++++ b/grsecurity/gracl_shm.c
+@@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
 +#include <linux/sched.h>
@@ -39823,6 +41812,7 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_shm.c linux-2.6.32.13/grsecurity/gra
 +	if (!gr_acl_is_enabled())
 +		return 1;
 +
++	rcu_read_lock();
 +	read_lock(&tasklist_lock);
 +
 +	task = find_task_by_vpid(shm_cprid);
@@ -39835,16 +41825,20 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_shm.c linux-2.6.32.13/grsecurity/gra
 +		     (task->acl->mode & GR_PROTSHM) &&
 +		     (task->acl != current->acl))) {
 +		read_unlock(&tasklist_lock);
++		rcu_read_unlock();
 +		gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
 +		return 0;
 +	}
 +	read_unlock(&tasklist_lock);
++	rcu_read_unlock();
 +
 +	return 1;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_chdir.c linux-2.6.32.13/grsecurity/grsec_chdir.c
---- linux-2.6.32.13/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_chdir.c	2010-05-15 13:21:17.906582737 -0400
+diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
+new file mode 100644
+index 0000000..bc0be01
+--- /dev/null
++++ b/grsecurity/grsec_chdir.c
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -39865,10 +41859,12 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_chdir.c linux-2.6.32.13/grsecurity/g
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_chroot.c linux-2.6.32.13/grsecurity/grsec_chroot.c
---- linux-2.6.32.13/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_chroot.c	2010-05-15 13:21:17.906582737 -0400
-@@ -0,0 +1,348 @@
+diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
+new file mode 100644
+index 0000000..4533135
+--- /dev/null
++++ b/grsecurity/grsec_chroot.c
+@@ -0,0 +1,389 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -39880,6 +41876,29 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_chroot.c linux-2.6.32.13/grsecurity/
 +#include <linux/grsecurity.h>
 +#include <linux/grinternal.h>
 +
++void gr_set_chroot_entries(struct task_struct *task, struct path *path)
++{
++#ifdef CONFIG_GRKERNSEC
++	if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
++	    		     path->dentry != task->nsproxy->mnt_ns->root->mnt_root)
++		task->gr_is_chrooted = 1;
++	else
++		task->gr_is_chrooted = 0;
++
++	task->gr_chroot_dentry = path->dentry;
++#endif
++	return;
++}
++
++void gr_clear_chroot_entries(struct task_struct *task)
++{
++#ifdef CONFIG_GRKERNSEC
++	task->gr_is_chrooted = 0;
++	task->gr_chroot_dentry = NULL;
++#endif
++	return;
++}	
++
 +int
 +gr_handle_chroot_unix(const pid_t pid)
 +{
@@ -39892,22 +41911,22 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_chroot.c linux-2.6.32.13/grsecurity/
 +	if (likely(!proc_is_chrooted(current)))
 +		return 1;
 +
++	rcu_read_lock();
 +	read_lock(&tasklist_lock);
 +
 +	spid = find_vpid(pid);
 +	if (spid) {
 +		struct task_struct *p;
 +		p = pid_task(spid, PIDTYPE_PID);
-+		gr_fs_read_lock(p);
 +		if (unlikely(!have_same_root(current, p))) {
-+			gr_fs_read_unlock(p);
 +			read_unlock(&tasklist_lock);
++			rcu_read_unlock();
 +			gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
 +			return 0;
 +		}
-+		gr_fs_read_unlock(p);
 +	}
 +	read_unlock(&tasklist_lock);
++	rcu_read_unlock();
 +#endif
 +	return 1;
 +}
@@ -39949,19 +41968,39 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_chroot.c linux-2.6.32.13/grsecurity/
 +}
 +
 +int
++gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
++{
++#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
++	struct task_struct *p;
++	int ret = 0;
++	if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
++		return ret;
++
++	read_lock(&tasklist_lock);
++	do_each_pid_task(pid, type, p) {
++		if (!have_same_root(current, p)) {
++			ret = 1;
++			goto out;
++		}
++	} while_each_pid_task(pid, type, p);
++out:
++	read_unlock(&tasklist_lock);
++	return ret;
++#endif
++	return 0;
++}
++
++int
 +gr_pid_is_chrooted(struct task_struct *p)
 +{
 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
 +	if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
 +		return 0;
 +
-+	gr_fs_read_lock(p);
 +	if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
 +	    !have_same_root(current, p)) {
-+		gr_fs_read_unlock(p);
 +		return 1;
 +	}
-+	gr_fs_read_unlock(p);
 +#endif
 +	return 0;
 +}
@@ -40050,39 +42089,37 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_chroot.c linux-2.6.32.13/grsecurity/
 +	if (likely(!proc_is_chrooted(current)))
 +		return 1;
 +
++	rcu_read_lock();
 +	read_lock(&tasklist_lock);
 +
 +	pid = find_vpid(shm_cprid);
 +	if (pid) {
 +		struct task_struct *p;
 +		p = pid_task(pid, PIDTYPE_PID);
-+		gr_fs_read_lock(p);
 +		starttime = p->start_time.tv_sec;
 +		if (unlikely(!have_same_root(current, p) &&
 +			     time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime))) {
-+			gr_fs_read_unlock(p);
 +			read_unlock(&tasklist_lock);
++			rcu_read_unlock();
 +			gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
 +			return 0;
 +		}
-+		gr_fs_read_unlock(p);
 +	} else {
 +		pid = find_vpid(shm_lapid);
 +		if (pid) {
 +			struct task_struct *p;
 +			p = pid_task(pid, PIDTYPE_PID);
-+			gr_fs_read_lock(p);
 +			if (unlikely(!have_same_root(current, p))) {
-+				gr_fs_read_unlock(p);
 +				read_unlock(&tasklist_lock);
++				rcu_read_unlock();
 +				gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
 +				return 0;
 +			}
-+			gr_fs_read_unlock(p);
 +		}
 +	}
 +
 +	read_unlock(&tasklist_lock);
++	rcu_read_unlock();
 +#endif
 +	return 1;
 +}
@@ -40182,8 +42219,8 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_chroot.c linux-2.6.32.13/grsecurity/
 +gr_handle_chroot_sysctl(const int op)
 +{
 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
-+	if (grsec_enable_chroot_sysctl && proc_is_chrooted(current)
-+	    && (op & MAY_WRITE))
++	if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
++	    proc_is_chrooted(current))
 +		return -EACCES;
 +#endif
 +	return 0;
@@ -40217,10 +42254,12 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_chroot.c linux-2.6.32.13/grsecurity/
 +#ifdef CONFIG_SECURITY
 +EXPORT_SYMBOL(gr_handle_chroot_caps);
 +#endif
-diff -urNp linux-2.6.32.13/grsecurity/grsec_disabled.c linux-2.6.32.13/grsecurity/grsec_disabled.c
---- linux-2.6.32.13/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_disabled.c	2010-05-15 13:21:17.906582737 -0400
-@@ -0,0 +1,426 @@
+diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
+new file mode 100644
+index 0000000..d16c4bb
+--- /dev/null
++++ b/grsecurity/grsec_disabled.c
+@@ -0,0 +1,431 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -40311,6 +42350,12 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_disabled.c linux-2.6.32.13/grsecurit
 +	return 0;
 +}
 +
++int
++gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
++{
++	return 0;
++}
++
 +void
 +gr_copy_label(struct task_struct *tsk)
 +{
@@ -40638,7 +42683,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_disabled.c linux-2.6.32.13/grsecurit
 +	return 0;
 +}
 +
-+
 +EXPORT_SYMBOL(gr_is_capable);
 +EXPORT_SYMBOL(gr_is_capable_nolog);
 +EXPORT_SYMBOL(gr_learn_resource);
@@ -40647,10 +42691,12 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_disabled.c linux-2.6.32.13/grsecurit
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff -urNp linux-2.6.32.13/grsecurity/grsec_exec.c linux-2.6.32.13/grsecurity/grsec_exec.c
---- linux-2.6.32.13/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_exec.c	2010-05-15 13:21:17.906582737 -0400
-@@ -0,0 +1,89 @@
+diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
+new file mode 100644
+index 0000000..d244a44
+--- /dev/null
++++ b/grsecurity/grsec_exec.c
+@@ -0,0 +1,88 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/file.h>
@@ -40675,8 +42721,7 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_exec.c linux-2.6.32.13/grsecurity/gr
 +#ifdef CONFIG_GRKERNSEC_EXECVE
 +	const struct cred *cred = current_cred();
 +	if (grsec_enable_execve && cred->user &&
-+	    (atomic_read(&cred->user->processes) >
-+	     current->signal->rlim[RLIMIT_NPROC].rlim_cur) &&
++	    (atomic_read(&cred->user->processes) > rlimit(RLIMIT_NPROC)) &&
 +	    !capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE)) {
 +		gr_log_noargs(GR_DONT_AUDIT, GR_NPROC_MSG);
 +		return -EAGAIN;
@@ -40740,9 +42785,11 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_exec.c linux-2.6.32.13/grsecurity/gr
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_fifo.c linux-2.6.32.13/grsecurity/grsec_fifo.c
---- linux-2.6.32.13/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_fifo.c	2010-05-15 13:21:17.906582737 -0400
+diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
+new file mode 100644
+index 0000000..5997a30
+--- /dev/null
++++ b/grsecurity/grsec_fifo.c
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -40768,10 +42815,12 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_fifo.c linux-2.6.32.13/grsecurity/gr
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_fork.c linux-2.6.32.13/grsecurity/grsec_fork.c
---- linux-2.6.32.13/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_fork.c	2010-05-15 13:21:17.906582737 -0400
-@@ -0,0 +1,15 @@
+diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
+new file mode 100644
+index 0000000..8ca18bf
+--- /dev/null
++++ b/grsecurity/grsec_fork.c
+@@ -0,0 +1,23 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/grsecurity.h>
@@ -40782,15 +42831,25 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_fork.c linux-2.6.32.13/grsecurity/gr
 +gr_log_forkfail(const int retval)
 +{
 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
-+	if (grsec_enable_forkfail && retval != -ERESTARTNOINTR)
-+		gr_log_int(GR_DONT_AUDIT, GR_FAILFORK_MSG, retval);
++	if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
++		switch (retval) {
++			case -EAGAIN:
++				gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
++				break;
++			case -ENOMEM:
++				gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
++				break;
++		}
++	}
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_init.c linux-2.6.32.13/grsecurity/grsec_init.c
---- linux-2.6.32.13/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_init.c	2010-05-15 13:21:17.906582737 -0400
-@@ -0,0 +1,241 @@
+diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
+new file mode 100644
+index 0000000..15f4f4e
+--- /dev/null
++++ b/grsecurity/grsec_init.c
+@@ -0,0 +1,270 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/mm.h>
@@ -40799,6 +42858,7 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_init.c linux-2.6.32.13/grsecurity/gr
 +#include <linux/slab.h>
 +#include <linux/vmalloc.h>
 +#include <linux/percpu.h>
++#include <linux/module.h>
 +
 +int grsec_enable_link;
 +int grsec_enable_dmesg;
@@ -40833,8 +42893,12 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_init.c linux-2.6.32.13/grsecurity/gr
 +int grsec_enable_tpe;
 +int grsec_tpe_gid;
 +int grsec_enable_blackhole;
++#ifdef CONFIG_IPV6_MODULE
++EXPORT_SYMBOL(grsec_enable_blackhole);
++#endif
 +int grsec_lastack_retries;
 +int grsec_enable_tpe_all;
++int grsec_enable_tpe_invert;
 +int grsec_enable_socket_all;
 +int grsec_socket_all_gid;
 +int grsec_enable_socket_client;
@@ -40842,6 +42906,8 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_init.c linux-2.6.32.13/grsecurity/gr
 +int grsec_enable_socket_server;
 +int grsec_socket_server_gid;
 +int grsec_resource_logging;
++int grsec_disable_privio;
++int grsec_enable_log_rwxmaps;
 +int grsec_lock;
 +
 +DEFINE_SPINLOCK(grsec_alert_lock);
@@ -40913,13 +42979,35 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_init.c linux-2.6.32.13/grsecurity/gr
 +		return;
 +	}
 +
++
++#ifdef CONFIG_GRKERNSEC_IO
++#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
++	grsec_disable_privio = 1;
++#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
++	grsec_disable_privio = 1;
++#else
++	grsec_disable_privio = 0;
++#endif
++#endif
++
++#ifdef CONFIG_GRKERNSEC_TPE_INVERT
++	/* for backward compatibility, tpe_invert always defaults to on if
++	   enabled in the kernel
++	*/
++	grsec_enable_tpe_invert = 1;
++#endif
++
 +#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
 +#ifndef CONFIG_GRKERNSEC_SYSCTL
 +	grsec_lock = 1;
 +#endif
++
 +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
 +	grsec_enable_audit_textrel = 1;
 +#endif
++#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
++	grsec_enable_log_rwxmaps = 1;
++#endif
 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
 +	grsec_enable_group = 1;
 +	grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
@@ -41032,9 +43120,11 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_init.c linux-2.6.32.13/grsecurity/gr
 +
 +	return;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_link.c linux-2.6.32.13/grsecurity/grsec_link.c
---- linux-2.6.32.13/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_link.c	2010-05-15 13:21:17.906582737 -0400
+diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
+new file mode 100644
+index 0000000..80c3339
+--- /dev/null
++++ b/grsecurity/grsec_link.c
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41079,10 +43169,12 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_link.c linux-2.6.32.13/grsecurity/gr
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grsec_log.c
---- linux-2.6.32.13/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_log.c	2010-05-15 13:21:17.906582737 -0400
-@@ -0,0 +1,296 @@
+diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
+new file mode 100644
+index 0000000..962dc93
+--- /dev/null
++++ b/grsecurity/grsec_log.c
+@@ -0,0 +1,310 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/file.h>
@@ -41090,7 +43182,16 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grs
 +#include <linux/fs.h>
 +#include <linux/grinternal.h>
 +
++#ifdef CONFIG_TREE_PREEMPT_RCU
++#define DISABLE_PREEMPT() preempt_disable()
++#define ENABLE_PREEMPT() preempt_enable()
++#else
++#define DISABLE_PREEMPT()
++#define ENABLE_PREEMPT()
++#endif
++
 +#define BEGIN_LOCKS(x) \
++	DISABLE_PREEMPT(); \
 +	rcu_read_lock(); \
 +	read_lock(&tasklist_lock); \
 +	read_lock(&grsec_exec_file_lock); \
@@ -41107,6 +43208,7 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grs
 +	read_unlock(&grsec_exec_file_lock); \
 +	read_unlock(&tasklist_lock); \
 +	rcu_read_unlock(); \
++	ENABLE_PREEMPT(); \
 +	if (x == GR_DONT_AUDIT) \
 +		gr_handle_alertkill(current)
 +
@@ -41194,7 +43296,7 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grs
 +	char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
 +	unsigned int len = strlen(buf);
 +
-+	snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->parent)));
++	snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
 +	printk("%s\n", buf);
 +
 +	return;
@@ -41225,7 +43327,7 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grs
 +	switch (argtypes) {
 +	case GR_TTYSNIFF:
 +		task = va_arg(ap, struct task_struct *);
-+		gr_log_middle_varargs(audit, msg, &task->signal->curr_ip, gr_task_fullpath0(task), task->comm, task->pid, gr_parent_task_fullpath0(task), task->parent->comm, task->parent->pid);
++		gr_log_middle_varargs(audit, msg, &task->signal->curr_ip, gr_task_fullpath0(task), task->comm, task->pid, gr_parent_task_fullpath0(task), task->real_parent->comm, task->real_parent->pid);
 +		break;
 +	case GR_SYSCTL_HIDDEN:
 +		str1 = va_arg(ap, char *);
@@ -41308,18 +43410,18 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grs
 +	case GR_RESOURCE:
 +		task = va_arg(ap, struct task_struct *);
 +		cred = __task_cred(task);
-+		pcred = __task_cred(task->parent);
++		pcred = __task_cred(task->real_parent);
 +		ulong1 = va_arg(ap, unsigned long);
 +		str1 = va_arg(ap, char *);
 +		ulong2 = va_arg(ap, unsigned long);
-+		gr_log_middle_varargs(audit, msg, ulong1, str1, ulong2, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
++		gr_log_middle_varargs(audit, msg, ulong1, str1, ulong2, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
 +		break;
 +	case GR_CAP:
 +		task = va_arg(ap, struct task_struct *);
 +		cred = __task_cred(task);
-+		pcred = __task_cred(task->parent);
++		pcred = __task_cred(task->real_parent);
 +		str1 = va_arg(ap, char *);
-+		gr_log_middle_varargs(audit, msg, str1, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
++		gr_log_middle_varargs(audit, msg, str1, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
 +		break;
 +	case GR_SIG:
 +		str1 = va_arg(ap, char *);
@@ -41329,23 +43431,27 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grs
 +	case GR_SIG2:
 +		task = va_arg(ap, struct task_struct *);
 +		cred = __task_cred(task);
-+		pcred = __task_cred(task->parent);
++		pcred = __task_cred(task->real_parent);
 +		num1 = va_arg(ap, int);
-+		gr_log_middle_varargs(audit, msg, num1, gr_task_fullpath0(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath0(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
++		gr_log_middle_varargs(audit, msg, num1, gr_task_fullpath0(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath0(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
 +		break;
 +	case GR_CRASH1:
 +		task = va_arg(ap, struct task_struct *);
 +		cred = __task_cred(task);
-+		pcred = __task_cred(task->parent);
++		pcred = __task_cred(task->real_parent);
 +		ulong1 = va_arg(ap, unsigned long);
-+		gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, cred->uid, ulong1);
++		gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, cred->uid, ulong1);
 +		break;
 +	case GR_CRASH2:
 +		task = va_arg(ap, struct task_struct *);
 +		cred = __task_cred(task);
-+		pcred = __task_cred(task->parent);
++		pcred = __task_cred(task->real_parent);
 +		ulong1 = va_arg(ap, unsigned long);
-+		gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, ulong1);
++		gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, ulong1);
++		break;
++	case GR_RWXMAP:
++		file = va_arg(ap, struct file *);
++		gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
 +		break;
 +	case GR_PSACCT:
 +		{
@@ -41367,9 +43473,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grs
 +			csec = va_arg(ap, int);
 +			ulong1 = va_arg(ap, unsigned long);
 +			cred = __task_cred(task);
-+			pcred = __task_cred(task->parent);
++			pcred = __task_cred(task->real_parent);
 +
-+			gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, &task->signal->curr_ip, tty_name(task->signal->tty, cur_tty), cred->uid, cred->euid, cred->gid, cred->egid, wday, whr, wmin, wsec, cday, chr, cmin, csec, (task->flags & PF_SIGNALED) ? "killed by signal" : "exited", ulong1, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, &task->parent->signal->curr_ip, tty_name(task->parent->signal->tty, parent_tty), pcred->uid, pcred->euid, pcred->gid, pcred->egid);
++			gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, &task->signal->curr_ip, tty_name(task->signal->tty, cur_tty), cred->uid, cred->euid, cred->gid, cred->egid, wday, whr, wmin, wsec, cday, chr, cmin, csec, (task->flags & PF_SIGNALED) ? "killed by signal" : "exited", ulong1, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, &task->real_parent->signal->curr_ip, tty_name(task->real_parent->signal->tty, parent_tty), pcred->uid, pcred->euid, pcred->gid, pcred->egid);
 +		}
 +		break;
 +	default:
@@ -41379,9 +43485,11 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grs
 +	gr_log_end(audit);
 +	END_LOCKS(audit);
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_mem.c linux-2.6.32.13/grsecurity/grsec_mem.c
---- linux-2.6.32.13/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_mem.c	2010-05-15 13:21:17.910594530 -0400
+diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
+new file mode 100644
+index 0000000..ad2aa92
+--- /dev/null
++++ b/grsecurity/grsec_mem.c
 @@ -0,0 +1,85 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41468,9 +43576,11 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_mem.c linux-2.6.32.13/grsecurity/grs
 +	gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +	return;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_mount.c linux-2.6.32.13/grsecurity/grsec_mount.c
---- linux-2.6.32.13/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_mount.c	2010-05-15 13:21:17.910594530 -0400
+diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
+new file mode 100644
+index 0000000..cbbe03e
+--- /dev/null
++++ b/grsecurity/grsec_mount.c
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41534,9 +43644,53 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_mount.c linux-2.6.32.13/grsecurity/g
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_ptrace.c linux-2.6.32.13/grsecurity/grsec_ptrace.c
---- linux-2.6.32.13/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_ptrace.c	2010-05-15 13:21:17.910594530 -0400
+diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
+new file mode 100644
+index 0000000..a3b12a0
+--- /dev/null
++++ b/grsecurity/grsec_pax.c
+@@ -0,0 +1,36 @@
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/mm.h>
++#include <linux/file.h>
++#include <linux/grinternal.h>
++#include <linux/grsecurity.h>
++
++void
++gr_log_textrel(struct vm_area_struct * vma)
++{
++#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
++	if (grsec_enable_audit_textrel)
++		gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
++#endif
++	return;
++}
++
++void
++gr_log_rwxmmap(struct file *file)
++{
++#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
++	if (grsec_enable_log_rwxmaps)
++		gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
++#endif
++	return;
++}
++
++void
++gr_log_rwxmprotect(struct file *file)
++{
++#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
++	if (grsec_enable_log_rwxmaps)
++		gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
++#endif
++	return;
++}
+diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
+new file mode 100644
+index 0000000..472c1d6
+--- /dev/null
++++ b/grsecurity/grsec_ptrace.c
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41552,9 +43706,11 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_ptrace.c linux-2.6.32.13/grsecurity/
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_sig.c linux-2.6.32.13/grsecurity/grsec_sig.c
---- linux-2.6.32.13/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_sig.c	2010-05-15 13:21:17.910594530 -0400
+diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
+new file mode 100644
+index 0000000..2053e68
+--- /dev/null
++++ b/grsecurity/grsec_sig.c
 @@ -0,0 +1,65 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41604,8 +43760,8 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sig.c linux-2.6.32.13/grsecurity/grs
 +#ifdef CONFIG_GRKERNSEC_BRUTE
 +	read_lock(&tasklist_lock);
 +	read_lock(&grsec_exec_file_lock);
-+	if (p->parent && p->parent->exec_file == p->exec_file)
-+		p->parent->brute = 1;
++	if (p->real_parent && p->real_parent->exec_file == p->exec_file)
++		p->real_parent->brute = 1;
 +	read_unlock(&grsec_exec_file_lock);
 +	read_unlock(&tasklist_lock);
 +#endif
@@ -41621,9 +43777,11 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sig.c linux-2.6.32.13/grsecurity/grs
 +	return;
 +}
 +
-diff -urNp linux-2.6.32.13/grsecurity/grsec_sock.c linux-2.6.32.13/grsecurity/grsec_sock.c
---- linux-2.6.32.13/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_sock.c	2010-05-15 13:21:17.910594530 -0400
+diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
+new file mode 100644
+index 0000000..3d5e2b5
+--- /dev/null
++++ b/grsecurity/grsec_sock.c
 @@ -0,0 +1,271 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -41762,10 +43920,10 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sock.c linux-2.6.32.13/grsecurity/gr
 +	/* no bh lock needed since we are called with bh disabled */
 +	spin_lock(&gr_conn_table_lock);
 +	gr_del_task_from_ip_table_nolock(sig);
-+	sig->gr_saddr = inet->rcv_saddr;
-+	sig->gr_daddr = inet->daddr;
-+	sig->gr_sport = inet->sport;
-+	sig->gr_dport = inet->dport;
++	sig->gr_saddr = inet->inet_rcv_saddr;
++	sig->gr_daddr = inet->inet_daddr;
++	sig->gr_sport = inet->inet_sport;
++	sig->gr_dport = inet->inet_dport;
 +	gr_add_to_task_ip_table_nolock(sig, newent);
 +	spin_unlock(&gr_conn_table_lock);
 +#endif
@@ -41795,8 +43953,8 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sock.c linux-2.6.32.13/grsecurity/gr
 +	set = current->signal;
 +
 +	spin_lock_bh(&gr_conn_table_lock);
-+	p = gr_lookup_task_ip_table(inet->daddr, inet->rcv_saddr,
-+				    inet->dport, inet->sport);
++	p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
++				    inet->inet_dport, inet->inet_sport);
 +	if (unlikely(p != NULL)) {
 +		set->curr_ip = p->curr_ip;
 +		set->used_accept = 1;
@@ -41806,7 +43964,7 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sock.c linux-2.6.32.13/grsecurity/gr
 +	}
 +	spin_unlock_bh(&gr_conn_table_lock);
 +
-+	set->curr_ip = inet->daddr;
++	set->curr_ip = inet->inet_daddr;
 +	set->used_accept = 1;
 +#endif
 +	return;
@@ -41896,10 +44054,12 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sock.c linux-2.6.32.13/grsecurity/gr
 +	return current_cap();
 +#endif
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/grsec_sysctl.c
---- linux-2.6.32.13/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_sysctl.c	2010-05-15 13:21:17.910594530 -0400
-@@ -0,0 +1,447 @@
+diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
+new file mode 100644
+index 0000000..0c12525
+--- /dev/null
++++ b/grsecurity/grsec_sysctl.c
+@@ -0,0 +1,433 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/sysctl.h>
@@ -41923,11 +44083,21 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +
 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
-+ctl_table grsecurity_table[] = {
++struct ctl_table grsecurity_table[] = {
 +#ifdef CONFIG_GRKERNSEC_SYSCTL
++#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
++#ifdef CONFIG_GRKERNSEC_IO
++	{
++		.procname	= "disable_priv_io",
++		.data		= &grsec_disable_privio,
++		.maxlen		= sizeof(int),
++		.mode		= 0600,
++		.proc_handler	= &proc_dointvec,
++	},
++#endif
++#endif
 +#ifdef CONFIG_GRKERNSEC_LINK
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "linking_restrictions",
 +		.data		= &grsec_enable_link,
 +		.maxlen		= sizeof(int),
@@ -41937,7 +44107,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_FIFO
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "fifo_restrictions",
 +		.data		= &grsec_enable_fifo,
 +		.maxlen		= sizeof(int),
@@ -41947,7 +44116,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_EXECVE
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "execve_limiting",
 +		.data		= &grsec_enable_execve,
 +		.maxlen		= sizeof(int),
@@ -41957,7 +44125,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "ip_blackhole",
 +		.data		= &grsec_enable_blackhole,
 +		.maxlen		= sizeof(int),
@@ -41965,7 +44132,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +		.proc_handler	= &proc_dointvec,
 +	},
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "lastack_retries",
 +		.data		= &grsec_lastack_retries,
 +		.maxlen		= sizeof(int),
@@ -41975,7 +44141,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_EXECLOG
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "exec_logging",
 +		.data		= &grsec_enable_execlog,
 +		.maxlen		= sizeof(int),
@@ -41983,9 +44148,17 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +		.proc_handler	= &proc_dointvec,
 +	},
 +#endif
++#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
++	{
++		.procname	= "rwxmap_logging",
++		.data		= &grsec_enable_log_rwxmaps,
++		.maxlen		= sizeof(int),
++		.mode		= 0600,
++		.proc_handler	= &proc_dointvec,
++	},
++#endif
 +#ifdef CONFIG_GRKERNSEC_SIGNAL
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "signal_logging",
 +		.data		= &grsec_enable_signal,
 +		.maxlen		= sizeof(int),
@@ -41995,7 +44168,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "forkfail_logging",
 +		.data		= &grsec_enable_forkfail,
 +		.maxlen		= sizeof(int),
@@ -42005,7 +44177,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_TIME
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "timechange_logging",
 +		.data		= &grsec_enable_time,
 +		.maxlen		= sizeof(int),
@@ -42015,7 +44186,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_deny_shmat",
 +		.data		= &grsec_enable_chroot_shmat,
 +		.maxlen		= sizeof(int),
@@ -42025,7 +44195,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_deny_unix",
 +		.data		= &grsec_enable_chroot_unix,
 +		.maxlen		= sizeof(int),
@@ -42035,7 +44204,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_deny_mount",
 +		.data		= &grsec_enable_chroot_mount,
 +		.maxlen		= sizeof(int),
@@ -42045,7 +44213,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_deny_fchdir",
 +		.data		= &grsec_enable_chroot_fchdir,
 +		.maxlen		= sizeof(int),
@@ -42055,7 +44222,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_deny_chroot",
 +		.data		= &grsec_enable_chroot_double,
 +		.maxlen		= sizeof(int),
@@ -42065,7 +44231,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_deny_pivot",
 +		.data		= &grsec_enable_chroot_pivot,
 +		.maxlen		= sizeof(int),
@@ -42075,7 +44240,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_enforce_chdir",
 +		.data		= &grsec_enable_chroot_chdir,
 +		.maxlen		= sizeof(int),
@@ -42085,7 +44249,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_deny_chmod",
 +		.data		= &grsec_enable_chroot_chmod,
 +		.maxlen		= sizeof(int),
@@ -42095,7 +44258,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_deny_mknod",
 +		.data		= &grsec_enable_chroot_mknod,
 +		.maxlen		= sizeof(int),
@@ -42105,7 +44267,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_restrict_nice",
 +		.data		= &grsec_enable_chroot_nice,
 +		.maxlen		= sizeof(int),
@@ -42115,7 +44276,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_execlog",
 +		.data		= &grsec_enable_chroot_execlog,
 +		.maxlen		= sizeof(int),
@@ -42125,7 +44285,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_caps",
 +		.data		= &grsec_enable_chroot_caps,
 +		.maxlen		= sizeof(int),
@@ -42135,7 +44294,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_deny_sysctl",
 +		.data		= &grsec_enable_chroot_sysctl,
 +		.maxlen		= sizeof(int),
@@ -42145,7 +44303,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_TPE
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "tpe",
 +		.data		= &grsec_enable_tpe,
 +		.maxlen		= sizeof(int),
@@ -42153,7 +44310,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +		.proc_handler	= &proc_dointvec,
 +	},
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "tpe_gid",
 +		.data		= &grsec_tpe_gid,
 +		.maxlen		= sizeof(int),
@@ -42161,9 +44317,17 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +		.proc_handler	= &proc_dointvec,
 +	},
 +#endif
++#ifdef CONFIG_GRKERNSEC_TPE_INVERT
++	{
++		.procname	= "tpe_invert",
++		.data		= &grsec_enable_tpe_invert,
++		.maxlen		= sizeof(int),
++		.mode		= 0600,
++		.proc_handler	= &proc_dointvec,
++	},
++#endif
 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "tpe_restrict_all",
 +		.data		= &grsec_enable_tpe_all,
 +		.maxlen		= sizeof(int),
@@ -42173,7 +44337,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "socket_all",
 +		.data		= &grsec_enable_socket_all,
 +		.maxlen		= sizeof(int),
@@ -42181,7 +44344,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +		.proc_handler	= &proc_dointvec,
 +	},
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "socket_all_gid",
 +		.data		= &grsec_socket_all_gid,
 +		.maxlen		= sizeof(int),
@@ -42191,7 +44353,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "socket_client",
 +		.data		= &grsec_enable_socket_client,
 +		.maxlen		= sizeof(int),
@@ -42199,7 +44360,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +		.proc_handler	= &proc_dointvec,
 +	},
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "socket_client_gid",
 +		.data		= &grsec_socket_client_gid,
 +		.maxlen		= sizeof(int),
@@ -42209,7 +44369,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "socket_server",
 +		.data		= &grsec_enable_socket_server,
 +		.maxlen		= sizeof(int),
@@ -42217,7 +44376,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +		.proc_handler	= &proc_dointvec,
 +	},
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "socket_server_gid",
 +		.data		= &grsec_socket_server_gid,
 +		.maxlen		= sizeof(int),
@@ -42227,7 +44385,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "audit_group",
 +		.data		= &grsec_enable_group,
 +		.maxlen		= sizeof(int),
@@ -42235,7 +44392,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +		.proc_handler	= &proc_dointvec,
 +	},
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "audit_gid",
 +		.data		= &grsec_audit_gid,
 +		.maxlen		= sizeof(int),
@@ -42245,7 +44401,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "audit_chdir",
 +		.data		= &grsec_enable_chdir,
 +		.maxlen		= sizeof(int),
@@ -42255,7 +44410,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "audit_mount",
 +		.data		= &grsec_enable_mount,
 +		.maxlen		= sizeof(int),
@@ -42265,7 +44419,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "audit_textrel",
 +		.data		= &grsec_enable_audit_textrel,
 +		.maxlen		= sizeof(int),
@@ -42275,7 +44428,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_DMESG
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "dmesg",
 +		.data		= &grsec_enable_dmesg,
 +		.maxlen		= sizeof(int),
@@ -42285,7 +44437,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "chroot_findtask",
 +		.data		= &grsec_enable_chroot_findtask,
 +		.maxlen		= sizeof(int),
@@ -42295,7 +44446,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_RESLOG
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "resource_logging",
 +		.data		= &grsec_resource_logging,
 +		.maxlen		= sizeof(int),
@@ -42305,7 +44455,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "audit_ptrace",
 +		.data		= &grsec_enable_audit_ptrace,
 +		.maxlen		= sizeof(int),
@@ -42315,7 +44464,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "harden_ptrace",
 +		.data		= &grsec_enable_harden_ptrace,
 +		.maxlen		= sizeof(int),
@@ -42324,7 +44472,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +	},
 +#endif
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "grsec_lock",
 +		.data		= &grsec_lock,
 +		.maxlen		= sizeof(int),
@@ -42334,7 +44481,6 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +#endif
 +#ifdef CONFIG_GRKERNSEC_ROFS
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "romount_protect",
 +		.data		= &grsec_enable_rofs,
 +		.maxlen		= sizeof(int),
@@ -42344,32 +44490,14 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/
 +		.extra2		= &one,
 +	},
 +#endif
-+	{ .ctl_name = 0 }
++	{ }
 +};
 +#endif
-diff -urNp linux-2.6.32.13/grsecurity/grsec_textrel.c linux-2.6.32.13/grsecurity/grsec_textrel.c
---- linux-2.6.32.13/grsecurity/grsec_textrel.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_textrel.c	2010-05-15 13:21:17.910594530 -0400
-@@ -0,0 +1,16 @@
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/mm.h>
-+#include <linux/file.h>
-+#include <linux/grinternal.h>
-+#include <linux/grsecurity.h>
-+
-+void
-+gr_log_textrel(struct vm_area_struct * vma)
-+{
-+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
-+	if (grsec_enable_audit_textrel)
-+		gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
-+#endif
-+	return;
-+}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_time.c linux-2.6.32.13/grsecurity/grsec_time.c
---- linux-2.6.32.13/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_time.c	2010-05-15 13:21:17.910594530 -0400
+diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
+new file mode 100644
+index 0000000..9501ab4
+--- /dev/null
++++ b/grsecurity/grsec_time.c
 @@ -0,0 +1,13 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -42384,10 +44512,12 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_time.c linux-2.6.32.13/grsecurity/gr
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsec_tpe.c linux-2.6.32.13/grsecurity/grsec_tpe.c
---- linux-2.6.32.13/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsec_tpe.c	2010-05-15 13:21:17.910594530 -0400
-@@ -0,0 +1,38 @@
+diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
+new file mode 100644
+index 0000000..4a78774
+--- /dev/null
++++ b/grsecurity/grsec_tpe.c
+@@ -0,0 +1,39 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/file.h>
@@ -42405,7 +44535,8 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_tpe.c linux-2.6.32.13/grsecurity/grs
 +
 +	if (cred->uid && ((grsec_enable_tpe &&
 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
-+	    !in_group_p(grsec_tpe_gid)
++	    ((grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid)) ||
++	     (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid)))
 +#else
 +	    in_group_p(grsec_tpe_gid)
 +#endif
@@ -42426,10 +44557,12 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_tpe.c linux-2.6.32.13/grsecurity/grs
 +#endif
 +	return 1;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/grsum.c linux-2.6.32.13/grsecurity/grsum.c
---- linux-2.6.32.13/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/grsum.c	2010-05-15 13:21:17.910594530 -0400
-@@ -0,0 +1,59 @@
+diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
+new file mode 100644
+index 0000000..9f7b1ac
+--- /dev/null
++++ b/grsecurity/grsum.c
+@@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -42455,6 +44588,8 @@ diff -urNp linux-2.6.32.13/grsecurity/grsum.c linux-2.6.32.13/grsecurity/grsum.c
 +	volatile int dummy = 0;
 +	unsigned int i;
 +
++	sg_init_table(&sg, 1);
++
 +	tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
 +	if (IS_ERR(tfm)) {
 +		/* should never happen, since sha256 should be built in */
@@ -42489,1012 +44624,11 @@ diff -urNp linux-2.6.32.13/grsecurity/grsum.c linux-2.6.32.13/grsecurity/grsum.c
 +
 +	return retval;
 +}
-diff -urNp linux-2.6.32.13/grsecurity/Kconfig linux-2.6.32.13/grsecurity/Kconfig
---- linux-2.6.32.13/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/Kconfig	2010-05-15 13:21:17.910594530 -0400
-@@ -0,0 +1,965 @@
-+#
-+# grecurity configuration
-+#
-+
-+menu "Grsecurity"
-+
-+config GRKERNSEC
-+	bool "Grsecurity"
-+	select CRYPTO
-+	select CRYPTO_SHA256
-+	help
-+	  If you say Y here, you will be able to configure many features
-+	  that will enhance the security of your system.  It is highly
-+	  recommended that you say Y here and read through the help
-+	  for each option so that you fully understand the features and
-+	  can evaluate their usefulness for your machine.
-+
-+choice
-+	prompt "Security Level"
-+	depends on GRKERNSEC
-+	default GRKERNSEC_CUSTOM
-+
-+config GRKERNSEC_LOW
-+	bool "Low"
-+	select GRKERNSEC_LINK
-+	select GRKERNSEC_FIFO
-+	select GRKERNSEC_EXECVE
-+	select GRKERNSEC_RANDNET
-+	select GRKERNSEC_DMESG
-+	select GRKERNSEC_CHROOT
-+	select GRKERNSEC_CHROOT_CHDIR
-+
-+	help
-+	  If you choose this option, several of the grsecurity options will
-+	  be enabled that will give you greater protection against a number
-+	  of attacks, while assuring that none of your software will have any
-+	  conflicts with the additional security measures.  If you run a lot
-+	  of unusual software, or you are having problems with the higher
-+	  security levels, you should say Y here.  With this option, the
-+	  following features are enabled:
-+
-+	  - Linking restrictions
-+	  - FIFO restrictions
-+	  - Enforcing RLIMIT_NPROC on execve
-+	  - Restricted dmesg
-+	  - Enforced chdir("/") on chroot
-+	  - Runtime module disabling
-+
-+config GRKERNSEC_MEDIUM
-+	bool "Medium"
-+	select PAX
-+	select PAX_EI_PAX
-+	select PAX_PT_PAX_FLAGS
-+	select PAX_HAVE_ACL_FLAGS
-+	select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
-+	select GRKERNSEC_CHROOT
-+	select GRKERNSEC_CHROOT_SYSCTL
-+	select GRKERNSEC_LINK
-+	select GRKERNSEC_FIFO
-+	select GRKERNSEC_EXECVE
-+	select GRKERNSEC_DMESG
-+	select GRKERNSEC_RANDNET
-+	select GRKERNSEC_FORKFAIL
-+	select GRKERNSEC_TIME
-+	select GRKERNSEC_SIGNAL
-+	select GRKERNSEC_CHROOT
-+	select GRKERNSEC_CHROOT_UNIX
-+	select GRKERNSEC_CHROOT_MOUNT
-+	select GRKERNSEC_CHROOT_PIVOT
-+	select GRKERNSEC_CHROOT_DOUBLE
-+	select GRKERNSEC_CHROOT_CHDIR
-+	select GRKERNSEC_CHROOT_MKNOD
-+	select GRKERNSEC_PROC
-+	select GRKERNSEC_PROC_USERGROUP
-+	select PAX_RANDUSTACK
-+	select PAX_ASLR
-+	select PAX_RANDMMAP
-+	select PAX_REFCOUNT if (X86 || SPARC64)
-+	select PAX_USERCOPY if ((X86 || SPARC32 || SPARC64 || PPC32 || PPC64) && (SLAB || SLUB || SLOB))
-+
-+	help
-+	  If you say Y here, several features in addition to those included
-+	  in the low additional security level will be enabled.  These
-+	  features provide even more security to your system, though in rare
-+	  cases they may be incompatible with very old or poorly written
-+	  software.  If you enable this option, make sure that your auth
-+	  service (identd) is running as gid 1001.  With this option, 
-+	  the following features (in addition to those provided in the 
-+	  low additional security level) will be enabled:
-+
-+	  - Failed fork logging
-+	  - Time change logging
-+	  - Signal logging
-+	  - Deny mounts in chroot
-+	  - Deny double chrooting
-+	  - Deny sysctl writes in chroot
-+	  - Deny mknod in chroot
-+	  - Deny access to abstract AF_UNIX sockets out of chroot
-+	  - Deny pivot_root in chroot
-+	  - Denied writes of /dev/kmem, /dev/mem, and /dev/port
-+	  - /proc restrictions with special GID set to 10 (usually wheel)
-+	  - Address Space Layout Randomization (ASLR)
-+	  - Prevent exploitation of most refcount overflows
-+	  - Bounds checking of copying between the kernel and userland
-+
-+config GRKERNSEC_HIGH
-+	bool "High"
-+	select GRKERNSEC_LINK
-+	select GRKERNSEC_FIFO
-+	select GRKERNSEC_EXECVE
-+	select GRKERNSEC_DMESG
-+	select GRKERNSEC_FORKFAIL
-+	select GRKERNSEC_TIME
-+	select GRKERNSEC_SIGNAL
-+	select GRKERNSEC_CHROOT
-+	select GRKERNSEC_CHROOT_SHMAT
-+	select GRKERNSEC_CHROOT_UNIX
-+	select GRKERNSEC_CHROOT_MOUNT
-+	select GRKERNSEC_CHROOT_FCHDIR
-+	select GRKERNSEC_CHROOT_PIVOT
-+	select GRKERNSEC_CHROOT_DOUBLE
-+	select GRKERNSEC_CHROOT_CHDIR
-+	select GRKERNSEC_CHROOT_MKNOD
-+	select GRKERNSEC_CHROOT_CAPS
-+	select GRKERNSEC_CHROOT_SYSCTL
-+	select GRKERNSEC_CHROOT_FINDTASK
-+	select GRKERNSEC_PROC
-+	select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
-+	select GRKERNSEC_HIDESYM
-+	select GRKERNSEC_BRUTE
-+	select GRKERNSEC_PROC_USERGROUP
-+	select GRKERNSEC_KMEM
-+	select GRKERNSEC_RESLOG
-+	select GRKERNSEC_RANDNET
-+	select GRKERNSEC_PROC_ADD
-+	select GRKERNSEC_CHROOT_CHMOD
-+	select GRKERNSEC_CHROOT_NICE
-+	select GRKERNSEC_AUDIT_MOUNT
-+	select GRKERNSEC_MODHARDEN if (MODULES)
-+	select GRKERNSEC_HARDEN_PTRACE
-+	select GRKERNSEC_VM86 if (X86_32)
-+	select PAX
-+	select PAX_RANDUSTACK
-+	select PAX_ASLR
-+	select PAX_RANDMMAP
-+	select PAX_NOEXEC
-+	select PAX_MPROTECT
-+	select PAX_EI_PAX
-+	select PAX_PT_PAX_FLAGS
-+	select PAX_HAVE_ACL_FLAGS
-+	select PAX_KERNEXEC if ((PPC32 || PPC64 || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
-+	select PAX_MEMORY_UDEREF if (X86_32 && !XEN)
-+	select PAX_RANDKSTACK if (X86_TSC && !X86_64)
-+	select PAX_SEGMEXEC if (X86_32)
-+	select PAX_PAGEEXEC
-+	select PAX_EMUPLT if (ALPHA || PARISC || SPARC32 || SPARC64)
-+	select PAX_EMUTRAMP if (PARISC)
-+	select PAX_EMUSIGRT if (PARISC)
-+	select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
-+	select PAX_REFCOUNT if (X86 || SPARC64)
-+	select PAX_USERCOPY if ((X86 || PPC32 || PPC64 || SPARC32 || SPARC64) && (SLAB || SLUB || SLOB))
-+	help
-+	  If you say Y here, many of the features of grsecurity will be
-+	  enabled, which will protect you against many kinds of attacks
-+	  against your system.  The heightened security comes at a cost
-+	  of an increased chance of incompatibilities with rare software
-+	  on your machine.  Since this security level enables PaX, you should
-+	  view <http://pax.grsecurity.net> and read about the PaX
-+	  project.  While you are there, download chpax and run it on
-+	  binaries that cause problems with PaX.  Also remember that
-+	  since the /proc restrictions are enabled, you must run your
-+	  identd as gid 1001.  This security level enables the following 
-+	  features in addition to those listed in the low and medium 
-+	  security levels:
-+
-+	  - Additional /proc restrictions
-+	  - Chmod restrictions in chroot
-+	  - No signals, ptrace, or viewing of processes outside of chroot
-+	  - Capability restrictions in chroot
-+	  - Deny fchdir out of chroot
-+	  - Priority restrictions in chroot
-+	  - Segmentation-based implementation of PaX
-+	  - Mprotect restrictions
-+	  - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
-+	  - Kernel stack randomization
-+	  - Mount/unmount/remount logging
-+	  - Kernel symbol hiding
-+	  - Prevention of memory exhaustion-based exploits
-+	  - Hardening of module auto-loading
-+	  - Ptrace restrictions
-+	  - Restricted vm86 mode
-+
-+config GRKERNSEC_CUSTOM
-+	bool "Custom"
-+	help
-+	  If you say Y here, you will be able to configure every grsecurity
-+	  option, which allows you to enable many more features that aren't
-+	  covered in the basic security levels.  These additional features
-+	  include TPE, socket restrictions, and the sysctl system for
-+	  grsecurity.  It is advised that you read through the help for
-+	  each option to determine its usefulness in your situation.
-+
-+endchoice
-+
-+menu "Address Space Protection"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_KMEM
-+	bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
-+	help
-+	  If you say Y here, /dev/kmem and /dev/mem won't be allowed to
-+	  be written to via mmap or otherwise to modify the running kernel.
-+	  /dev/port will also not be allowed to be opened. If you have module
-+	  support disabled, enabling this will close up four ways that are
-+	  currently used  to insert malicious code into the running kernel.
-+	  Even with all these features enabled, we still highly recommend that
-+	  you use the RBAC system, as it is still possible for an attacker to
-+	  modify the running kernel through privileged I/O granted by ioperm/iopl.
-+	  If you are not using XFree86, you may be able to stop this additional
-+	  case by enabling the 'Disable privileged I/O' option. Though nothing
-+	  legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
-+	  but only to video memory, which is the only writing we allow in this
-+	  case.  If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
-+	  not be allowed to mprotect it with PROT_WRITE later.
-+	  It is highly recommended that you say Y here if you meet all the
-+	  conditions above.
-+
-+config GRKERNSEC_VM86
-+	bool "Restrict VM86 mode"
-+	depends on X86_32
-+
-+	help
-+	  If you say Y here, only processes with CAP_SYS_RAWIO will be able to
-+	  make use of a special execution mode on 32bit x86 processors called
-+	  Virtual 8086 (VM86) mode.  XFree86 may need vm86 mode for certain
-+	  video cards and will still work with this option enabled.  The purpose
-+	  of the option is to prevent exploitation of emulation errors in
-+	  virtualization of vm86 mode like the one discovered in VMWare in 2009.
-+	  Nearly all users should be able to enable this option.
-+
-+config GRKERNSEC_IO
-+	bool "Disable privileged I/O"
-+	depends on X86
-+	select RTC_CLASS
-+	select RTC_INTF_DEV
-+	select RTC_DRV_CMOS
-+
-+	help
-+	  If you say Y here, all ioperm and iopl calls will return an error.
-+	  Ioperm and iopl can be used to modify the running kernel.
-+	  Unfortunately, some programs need this access to operate properly,
-+	  the most notable of which are XFree86 and hwclock.  hwclock can be
-+	  remedied by having RTC support in the kernel, so real-time 
-+	  clock support is enabled if this option is enabled, to ensure 
-+	  that hwclock operates correctly.  XFree86 still will not 
-+	  operate correctly with this option enabled, so DO NOT CHOOSE Y 
-+	  IF YOU USE XFree86.  If you use XFree86 and you still want to 
-+	  protect your kernel against modification, use the RBAC system.
-+
-+config GRKERNSEC_PROC_MEMMAP
-+	bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
-+	default y if (PAX_NOEXEC || PAX_ASLR)
-+	depends on PAX_NOEXEC || PAX_ASLR
-+	help
-+	  If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
-+	  give no information about the addresses of its mappings if
-+	  PaX features that rely on random addresses are enabled on the task.
-+	  If you use PaX it is greatly recommended that you say Y here as it
-+	  closes up a hole that makes the full ASLR useless for suid
-+	  binaries.
-+
-+config GRKERNSEC_BRUTE
-+	bool "Deter exploit bruteforcing"
-+	help
-+	  If you say Y here, attempts to bruteforce exploits against forking
-+	  daemons such as apache or sshd will be deterred.  When a child of a
-+	  forking daemon is killed by PaX or crashes due to an illegal
-+	  instruction, the parent process will be delayed 30 seconds upon every
-+	  subsequent fork until the administrator is able to assess the
-+	  situation and restart the daemon.  It is recommended that you also
-+	  enable signal logging in the auditing section so that logs are
-+	  generated when a process performs an illegal instruction.
-+
-+config GRKERNSEC_MODHARDEN
-+	bool "Harden module auto-loading"
-+	depends on MODULES
-+	help
-+	  If you say Y here, module auto-loading in response to use of some
-+	  feature implemented by an unloaded module will be restricted to
-+	  root users.  Enabling this option helps defend against attacks 
-+	  by unprivileged users who abuse the auto-loading behavior to 
-+	  cause a vulnerable module to load that is then exploited.
-+
-+	  If this option prevents a legitimate use of auto-loading for a 
-+	  non-root user, the administrator can execute modprobe manually 
-+	  with the exact name of the module mentioned in the alert log.
-+	  Alternatively, the administrator can add the module to the list
-+	  of modules loaded at boot by modifying init scripts.
-+
-+	  Modification of init scripts will most likely be needed on 
-+	  Ubuntu servers with encrypted home directory support enabled,
-+	  as the first non-root user logging in will cause the ecb(aes),
-+	  ecb(aes)-all, cbc(aes), and cbc(aes)-all  modules to be loaded.
-+
-+config GRKERNSEC_HIDESYM
-+	bool "Hide kernel symbols"
-+	help
-+	  If you say Y here, getting information on loaded modules, and
-+	  displaying all kernel symbols through a syscall will be restricted
-+	  to users with CAP_SYS_MODULE.  For software compatibility reasons,
-+	  /proc/kallsyms will be restricted to the root user.  The RBAC
-+	  system can hide that entry even from root.  Note that this option
-+	  is only effective provided the following conditions are met:
-+	  1) The kernel using grsecurity is not precompiled by some distribution
-+	  2) You are using the RBAC system and hiding other files such as your
-+	     kernel image and System.map.  Alternatively, enabling this option
-+	     causes the permissions on /boot, /lib/modules, and the kernel
-+	     source directory to change at compile time to prevent 
-+	     reading by non-root users.
-+	  If the above conditions are met, this option will aid in providing a
-+	  useful protection against local kernel exploitation of overflows
-+	  and arbitrary read/write vulnerabilities.
-+
-+endmenu
-+menu "Role Based Access Control Options"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_NO_RBAC
-+	bool "Disable RBAC system"
-+	help
-+	  If you say Y here, the /dev/grsec device will be removed from the kernel,
-+	  preventing the RBAC system from being enabled.  You should only say Y
-+	  here if you have no intention of using the RBAC system, so as to prevent
-+	  an attacker with root access from misusing the RBAC system to hide files
-+	  and processes when loadable module support and /dev/[k]mem have been
-+	  locked down.
-+
-+config GRKERNSEC_ACL_HIDEKERN
-+	bool "Hide kernel processes"
-+	help
-+	  If you say Y here, all kernel threads will be hidden to all
-+	  processes but those whose subject has the "view hidden processes"
-+	  flag.
-+
-+config GRKERNSEC_ACL_MAXTRIES
-+	int "Maximum tries before password lockout"
-+	default 3
-+	help
-+	  This option enforces the maximum number of times a user can attempt
-+	  to authorize themselves with the grsecurity RBAC system before being
-+	  denied the ability to attempt authorization again for a specified time.
-+	  The lower the number, the harder it will be to brute-force a password.
-+
-+config GRKERNSEC_ACL_TIMEOUT
-+	int "Time to wait after max password tries, in seconds"
-+	default 30
-+	help
-+	  This option specifies the time the user must wait after attempting to
-+	  authorize to the RBAC system with the maximum number of invalid
-+	  passwords.  The higher the number, the harder it will be to brute-force
-+	  a password.
-+
-+endmenu
-+menu "Filesystem Protections"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_PROC
-+	bool "Proc restrictions"
-+	help
-+	  If you say Y here, the permissions of the /proc filesystem
-+	  will be altered to enhance system security and privacy.  You MUST
-+  	  choose either a user only restriction or a user and group restriction.
-+	  Depending upon the option you choose, you can either restrict users to
-+	  see only the processes they themselves run, or choose a group that can
-+	  view all processes and files normally restricted to root if you choose
-+	  the "restrict to user only" option.  NOTE: If you're running identd as
-+	  a non-root user, you will have to run it as the group you specify here.
-+
-+config GRKERNSEC_PROC_USER
-+	bool "Restrict /proc to user only"
-+	depends on GRKERNSEC_PROC
-+	help
-+	  If you say Y here, non-root users will only be able to view their own
-+	  processes, and restricts them from viewing network-related information,
-+	  and viewing kernel symbol and module information.
-+
-+config GRKERNSEC_PROC_USERGROUP
-+	bool "Allow special group"
-+	depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
-+	help
-+	  If you say Y here, you will be able to select a group that will be
-+	  able to view all processes, network-related information, and
-+	  kernel and symbol information.  This option is useful if you want
-+	  to run identd as a non-root user.
-+
-+config GRKERNSEC_PROC_GID
-+	int "GID for special group"
-+	depends on GRKERNSEC_PROC_USERGROUP
-+	default 1001
-+
-+config GRKERNSEC_PROC_ADD
-+	bool "Additional restrictions"
-+	depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
-+	help
-+	  If you say Y here, additional restrictions will be placed on
-+	  /proc that keep normal users from viewing device information and 
-+	  slabinfo information that could be useful for exploits.
-+
-+config GRKERNSEC_LINK
-+	bool "Linking restrictions"
-+	help
-+	  If you say Y here, /tmp race exploits will be prevented, since users
-+	  will no longer be able to follow symlinks owned by other users in
-+	  world-writable +t directories (i.e. /tmp), unless the owner of the
-+	  symlink is the owner of the directory. users will also not be
-+	  able to hardlink to files they do not own.  If the sysctl option is
-+	  enabled, a sysctl option with name "linking_restrictions" is created.
-+
-+config GRKERNSEC_FIFO
-+	bool "FIFO restrictions"
-+	help
-+	  If you say Y here, users will not be able to write to FIFOs they don't
-+	  own in world-writable +t directories (i.e. /tmp), unless the owner of
-+	  the FIFO is the same owner of the directory it's held in.  If the sysctl
-+	  option is enabled, a sysctl option with name "fifo_restrictions" is
-+	  created.
-+
-+config GRKERNSEC_ROFS
-+	bool "Runtime read-only mount protection"
-+	help
-+	  If you say Y here, a sysctl option with name "romount_protect" will
-+	  be created.  By setting this option to 1 at runtime, filesystems
-+	  will be protected in the following ways:
-+	  * No new writable mounts will be allowed
-+	  * Existing read-only mounts won't be able to be remounted read/write
-+	  * Write operations will be denied on all block devices
-+	  This option acts independently of grsec_lock: once it is set to 1,
-+	  it cannot be turned off.  Therefore, please be mindful of the resulting
-+	  behavior if this option is enabled in an init script on a read-only
-+	  filesystem.  This feature is mainly intended for secure embedded systems.
-+
-+config GRKERNSEC_CHROOT
-+	bool "Chroot jail restrictions"
-+	help
-+	  If you say Y here, you will be able to choose several options that will
-+	  make breaking out of a chrooted jail much more difficult.  If you
-+	  encounter no software incompatibilities with the following options, it
-+	  is recommended that you enable each one.
-+
-+config GRKERNSEC_CHROOT_MOUNT
-+	bool "Deny mounts"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to
-+	  mount or remount filesystems.  If the sysctl option is enabled, a
-+	  sysctl option with name "chroot_deny_mount" is created.
-+
-+config GRKERNSEC_CHROOT_DOUBLE
-+	bool "Deny double-chroots"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to chroot
-+	  again outside the chroot.  This is a widely used method of breaking
-+	  out of a chroot jail and should not be allowed.  If the sysctl 
-+	  option is enabled, a sysctl option with name 
-+	  "chroot_deny_chroot" is created.
-+
-+config GRKERNSEC_CHROOT_PIVOT
-+	bool "Deny pivot_root in chroot"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to use
-+	  a function called pivot_root() that was introduced in Linux 2.3.41.  It
-+	  works similar to chroot in that it changes the root filesystem.  This
-+	  function could be misused in a chrooted process to attempt to break out
-+	  of the chroot, and therefore should not be allowed.  If the sysctl
-+	  option is enabled, a sysctl option with name "chroot_deny_pivot" is
-+	  created.
-+
-+config GRKERNSEC_CHROOT_CHDIR
-+	bool "Enforce chdir(\"/\") on all chroots"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, the current working directory of all newly-chrooted
-+	  applications will be set to the the root directory of the chroot.
-+	  The man page on chroot(2) states:
-+	  Note that this call does not change  the  current  working
-+	  directory,  so  that `.' can be outside the tree rooted at
-+	  `/'.  In particular, the  super-user  can  escape  from  a
-+	  `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
-+
-+	  It is recommended that you say Y here, since it's not known to break
-+	  any software.  If the sysctl option is enabled, a sysctl option with
-+	  name "chroot_enforce_chdir" is created.
-+
-+config GRKERNSEC_CHROOT_CHMOD
-+	bool "Deny (f)chmod +s"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to chmod
-+	  or fchmod files to make them have suid or sgid bits.  This protects
-+	  against another published method of breaking a chroot.  If the sysctl
-+	  option is enabled, a sysctl option with name "chroot_deny_chmod" is
-+	  created.
-+
-+config GRKERNSEC_CHROOT_FCHDIR
-+	bool "Deny fchdir out of chroot"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, a well-known method of breaking chroots by fchdir'ing
-+	  to a file descriptor of the chrooting process that points to a directory
-+	  outside the filesystem will be stopped.  If the sysctl option
-+	  is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
-+
-+config GRKERNSEC_CHROOT_MKNOD
-+	bool "Deny mknod"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be allowed to
-+	  mknod.  The problem with using mknod inside a chroot is that it
-+	  would allow an attacker to create a device entry that is the same
-+	  as one on the physical root of your system, which could range from
-+	  anything from the console device to a device for your harddrive (which
-+	  they could then use to wipe the drive or steal data).  It is recommended
-+	  that you say Y here, unless you run into software incompatibilities.
-+	  If the sysctl option is enabled, a sysctl option with name
-+	  "chroot_deny_mknod" is created.
-+
-+config GRKERNSEC_CHROOT_SHMAT
-+	bool "Deny shmat() out of chroot"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to attach
-+	  to shared memory segments that were created outside of the chroot jail.
-+	  It is recommended that you say Y here.  If the sysctl option is enabled,
-+	  a sysctl option with name "chroot_deny_shmat" is created.
-+
-+config GRKERNSEC_CHROOT_UNIX
-+	bool "Deny access to abstract AF_UNIX sockets out of chroot"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to
-+	  connect to abstract (meaning not belonging to a filesystem) Unix
-+	  domain sockets that were bound outside of a chroot.  It is recommended
-+	  that you say Y here.  If the sysctl option is enabled, a sysctl option
-+	  with name "chroot_deny_unix" is created.
-+
-+config GRKERNSEC_CHROOT_FINDTASK
-+	bool "Protect outside processes"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to
-+	  kill, send signals with fcntl, ptrace, capget, getpgid, setpgid, 
-+	  getsid, or view any process outside of the chroot.  If the sysctl
-+	  option is enabled, a sysctl option with name "chroot_findtask" is
-+	  created.
-+
-+config GRKERNSEC_CHROOT_NICE
-+	bool "Restrict priority changes"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to raise
-+	  the priority of processes in the chroot, or alter the priority of
-+	  processes outside the chroot.  This provides more security than simply
-+	  removing CAP_SYS_NICE from the process' capability set.  If the
-+	  sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
-+	  is created.
-+
-+config GRKERNSEC_CHROOT_SYSCTL
-+	bool "Deny sysctl writes"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, an attacker in a chroot will not be able to
-+	  write to sysctl entries, either by sysctl(2) or through a /proc
-+	  interface.  It is strongly recommended that you say Y here. If the
-+	  sysctl option is enabled, a sysctl option with name
-+	  "chroot_deny_sysctl" is created.
-+
-+config GRKERNSEC_CHROOT_CAPS
-+	bool "Capability restrictions"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, the capabilities on all root processes within a
-+	  chroot jail will be lowered to stop module insertion, raw i/o,
-+	  system and net admin tasks, rebooting the system, modifying immutable
-+	  files, modifying IPC owned by another, and changing the system time.
-+	  This is left an option because it can break some apps.  Disable this
-+	  if your chrooted apps are having problems performing those kinds of
-+	  tasks.  If the sysctl option is enabled, a sysctl option with
-+	  name "chroot_caps" is created.
-+
-+endmenu
-+menu "Kernel Auditing"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_AUDIT_GROUP
-+	bool "Single group for auditing"
-+	help
-+	  If you say Y here, the exec, chdir, and (un)mount logging features
-+	  will only operate on a group you specify.  This option is recommended
-+	  if you only want to watch certain users instead of having a large
-+	  amount of logs from the entire system.  If the sysctl option is enabled,
-+	  a sysctl option with name "audit_group" is created.
-+
-+config GRKERNSEC_AUDIT_GID
-+	int "GID for auditing"
-+	depends on GRKERNSEC_AUDIT_GROUP
-+	default 1007
-+
-+config GRKERNSEC_EXECLOG
-+	bool "Exec logging"
-+	help
-+	  If you say Y here, all execve() calls will be logged (since the
-+	  other exec*() calls are frontends to execve(), all execution
-+	  will be logged).  Useful for shell-servers that like to keep track
-+	  of their users.  If the sysctl option is enabled, a sysctl option with
-+	  name "exec_logging" is created.
-+	  WARNING: This option when enabled will produce a LOT of logs, especially
-+	  on an active system.
-+
-+config GRKERNSEC_RESLOG
-+	bool "Resource logging"
-+	help
-+	  If you say Y here, all attempts to overstep resource limits will
-+	  be logged with the resource name, the requested size, and the current
-+	  limit.  It is highly recommended that you say Y here.  If the sysctl
-+	  option is enabled, a sysctl option with name "resource_logging" is
-+	  created.  If the RBAC system is enabled, the sysctl value is ignored.
-+
-+config GRKERNSEC_CHROOT_EXECLOG
-+	bool "Log execs within chroot"
-+	help
-+	  If you say Y here, all executions inside a chroot jail will be logged
-+	  to syslog.  This can cause a large amount of logs if certain
-+	  applications (eg. djb's daemontools) are installed on the system, and
-+	  is therefore left as an option.  If the sysctl option is enabled, a
-+	  sysctl option with name "chroot_execlog" is created.
-+
-+config GRKERNSEC_AUDIT_PTRACE
-+	bool "Ptrace logging"
-+	help
-+	  If you say Y here, all attempts to attach to a process via ptrace
-+	  will be logged.  If the sysctl option is enabled, a sysctl option
-+	  with name "audit_ptrace" is created.
-+
-+config GRKERNSEC_AUDIT_CHDIR
-+	bool "Chdir logging"
-+	help
-+	  If you say Y here, all chdir() calls will be logged.  If the sysctl
-+ 	  option is enabled, a sysctl option with name "audit_chdir" is created.
-+
-+config GRKERNSEC_AUDIT_MOUNT
-+	bool "(Un)Mount logging"
-+	help
-+	  If you say Y here, all mounts and unmounts will be logged.  If the
-+	  sysctl option is enabled, a sysctl option with name "audit_mount" is
-+	  created.
-+
-+config GRKERNSEC_SIGNAL
-+	bool "Signal logging"
-+	help
-+	  If you say Y here, certain important signals will be logged, such as
-+	  SIGSEGV, which will as a result inform you of when a error in a program
-+	  occurred, which in some cases could mean a possible exploit attempt.
-+	  If the sysctl option is enabled, a sysctl option with name
-+	  "signal_logging" is created.
-+
-+config GRKERNSEC_FORKFAIL
-+	bool "Fork failure logging"
-+	help
-+	  If you say Y here, all failed fork() attempts will be logged.
-+	  This could suggest a fork bomb, or someone attempting to overstep
-+	  their process limit.  If the sysctl option is enabled, a sysctl option
-+	  with name "forkfail_logging" is created.
-+
-+config GRKERNSEC_TIME
-+	bool "Time change logging"
-+	help
-+	  If you say Y here, any changes of the system clock will be logged.
-+	  If the sysctl option is enabled, a sysctl option with name
-+	  "timechange_logging" is created.
-+
-+config GRKERNSEC_PROC_IPADDR
-+	bool "/proc/<pid>/ipaddr support"
-+	help
-+	  If you say Y here, a new entry will be added to each /proc/<pid>
-+	  directory that contains the IP address of the person using the task.
-+	  The IP is carried across local TCP and AF_UNIX stream sockets.
-+	  This information can be useful for IDS/IPSes to perform remote response
-+	  to a local attack.  The entry is readable by only the owner of the
-+	  process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
-+	  the RBAC system), and thus does not create privacy concerns.
-+
-+config GRKERNSEC_AUDIT_TEXTREL
-+	bool 'ELF text relocations logging (READ HELP)'
-+	depends on PAX_MPROTECT
-+	help
-+	  If you say Y here, text relocations will be logged with the filename
-+	  of the offending library or binary.  The purpose of the feature is
-+	  to help Linux distribution developers get rid of libraries and
-+	  binaries that need text relocations which hinder the future progress
-+	  of PaX.  Only Linux distribution developers should say Y here, and
-+	  never on a production machine, as this option creates an information
-+	  leak that could aid an attacker in defeating the randomization of
-+	  a single memory region.  If the sysctl option is enabled, a sysctl
-+	  option with name "audit_textrel" is created.
-+
-+endmenu
-+
-+menu "Executable Protections"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_EXECVE
-+	bool "Enforce RLIMIT_NPROC on execs"
-+	help
-+	  If you say Y here, users with a resource limit on processes will
-+	  have the value checked during execve() calls.  The current system
-+	  only checks the system limit during fork() calls.  If the sysctl option
-+	  is enabled, a sysctl option with name "execve_limiting" is created.
-+
-+config GRKERNSEC_DMESG
-+	bool "Dmesg(8) restriction"
-+	help
-+	  If you say Y here, non-root users will not be able to use dmesg(8)
-+	  to view up to the last 4kb of messages in the kernel's log buffer.
-+	  If the sysctl option is enabled, a sysctl option with name "dmesg" is
-+	  created.
-+
-+config GRKERNSEC_HARDEN_PTRACE
-+	bool "Deter ptrace-based process snooping"
-+	help
-+	  If you say Y here, TTY sniffers and other malicious monitoring
-+	  programs implemented through ptrace will be defeated.  If you
-+	  have been using the RBAC system, this option has already been
-+	  enabled for several years for all users, with the ability to make
-+	  fine-grained exceptions.
-+
-+	  This option only affects the ability of non-root users to ptrace
-+	  processes that are not a descendent of the ptracing process.
-+	  This means that strace ./binary and gdb ./binary will still work,
-+	  but attaching to arbitrary processes will not.  If the sysctl
-+	  option is enabled, a sysctl option with name "harden_ptrace" is
-+	  created.
-+
-+config GRKERNSEC_TPE
-+	bool "Trusted Path Execution (TPE)"
-+	help
-+	  If you say Y here, you will be able to choose a gid to add to the
-+	  supplementary groups of users you want to mark as "untrusted."
-+	  These users will not be able to execute any files that are not in
-+	  root-owned directories writable only by root.  If the sysctl option
-+	  is enabled, a sysctl option with name "tpe" is created.
-+
-+config GRKERNSEC_TPE_ALL
-+	bool "Partially restrict non-root users"
-+	depends on GRKERNSEC_TPE
-+	help
-+	  If you say Y here, All non-root users other than the ones in the
-+	  group specified in the main TPE option will only be allowed to
-+	  execute files in directories they own that are not group or
-+	  world-writable, or in directories owned by root and writable only by
-+	  root.  If the sysctl option is enabled, a sysctl option with name
-+	  "tpe_restrict_all" is created.
-+
-+config GRKERNSEC_TPE_INVERT
-+	bool "Invert GID option"
-+	depends on GRKERNSEC_TPE
-+	help
-+	  If you say Y here, the group you specify in the TPE configuration will
-+	  decide what group TPE restrictions will be *disabled* for.  This
-+	  option is useful if you want TPE restrictions to be applied to most
-+	  users on the system.
-+
-+config GRKERNSEC_TPE_GID
-+	int "GID for untrusted users"
-+	depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
-+	default 1005
-+	help
-+	  If you have selected the "Invert GID option" above, setting this
-+	  GID determines what group TPE restrictions will be *disabled* for.
-+	  If you have not selected the "Invert GID option" above, setting this
-+	  GID determines what group TPE restrictions will be *enabled* for.
-+	  If the sysctl option is enabled, a sysctl option with name "tpe_gid"
-+	  is created.
-+
-+config GRKERNSEC_TPE_GID
-+	int "GID for trusted users"
-+	depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
-+	default 1005
-+	help
-+	  If you have selected the "Invert GID option" above, setting this
-+	  GID determines what group TPE restrictions will be *disabled* for.
-+	  If you have not selected the "Invert GID option" above, setting this
-+	  GID determines what group TPE restrictions will be *enabled* for.
-+	  If the sysctl option is enabled, a sysctl option with name "tpe_gid"
-+	  is created.
-+
-+endmenu
-+menu "Network Protections"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_RANDNET
-+	bool "Larger entropy pools"
-+	help
-+	  If you say Y here, the entropy pools used for many features of Linux
-+	  and grsecurity will be doubled in size.  Since several grsecurity
-+	  features use additional randomness, it is recommended that you say Y
-+	  here.  Saying Y here has a similar effect as modifying
-+	  /proc/sys/kernel/random/poolsize.
-+
-+config GRKERNSEC_BLACKHOLE
-+	bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
-+	help
-+	  If you say Y here, neither TCP resets nor ICMP
-+	  destination-unreachable packets will be sent in response to packets
-+	  send to ports for which no associated listening process exists.
-+	  This feature supports both IPV4 and IPV6 and exempts the 
-+	  loopback interface from blackholing.  Enabling this feature 
-+	  makes a host more resilient to DoS attacks and reduces network
-+	  visibility against scanners.
-+
-+	  The blackhole feature as-implemented is equivalent to the FreeBSD
-+	  blackhole feature, as prevents RST responses to all packets, not
-+	  just SYNs.  Under most application behavior this causes no
-+	  problems, but applications (like haproxy) may not close certain
-+	  connections in a way that cleanly terminates them on the remote
-+	  end, leaving the remote host in LAST_ACK state.  Because of this
-+	  side-effect and to prevent intentional LAST_ACK DoSes, this
-+	  feature also adds automatic mitigation against such attacks.
-+	  The mitigation drastically reduces the amount of time a socket
-+	  can spend in LAST_ACK state.  If you're using haproxy and not
-+	  all servers it connects to have this option enabled, consider
-+	  disabling this feature on the haproxy host.
-+
-+	  If this option is enabled, two sysctl options with names
-+	  "ip_blackhole" and "lastack_retries" will be created.
-+	  While "ip_blackhole" takes the standard zero/non-zero on/off
-+	  toggle, "lastack_retries" uses the same kinds of values as
-+	  "tcp_retries1" and "tcp_retries2".  The default value of 4
-+	  prevents a socket from lasting more than 45 seconds in LAST_ACK
-+	  state.
-+
-+config GRKERNSEC_SOCKET
-+	bool "Socket restrictions"
-+	help
-+	  If you say Y here, you will be able to choose from several options.
-+	  If you assign a GID on your system and add it to the supplementary
-+	  groups of users you want to restrict socket access to, this patch
-+	  will perform up to three things, based on the option(s) you choose.
-+
-+config GRKERNSEC_SOCKET_ALL
-+	bool "Deny any sockets to group"
-+	depends on GRKERNSEC_SOCKET
-+	help
-+	  If you say Y here, you will be able to choose a GID of whose users will
-+	  be unable to connect to other hosts from your machine or run server
-+	  applications from your machine.  If the sysctl option is enabled, a
-+	  sysctl option with name "socket_all" is created.
-+
-+config GRKERNSEC_SOCKET_ALL_GID
-+	int "GID to deny all sockets for"
-+	depends on GRKERNSEC_SOCKET_ALL
-+	default 1004
-+	help
-+	  Here you can choose the GID to disable socket access for. Remember to
-+	  add the users you want socket access disabled for to the GID
-+	  specified here.  If the sysctl option is enabled, a sysctl option
-+	  with name "socket_all_gid" is created.
-+
-+config GRKERNSEC_SOCKET_CLIENT
-+	bool "Deny client sockets to group"
-+	depends on GRKERNSEC_SOCKET
-+	help
-+	  If you say Y here, you will be able to choose a GID of whose users will
-+	  be unable to connect to other hosts from your machine, but will be
-+	  able to run servers.  If this option is enabled, all users in the group
-+	  you specify will have to use passive mode when initiating ftp transfers
-+	  from the shell on your machine.  If the sysctl option is enabled, a
-+	  sysctl option with name "socket_client" is created.
-+
-+config GRKERNSEC_SOCKET_CLIENT_GID
-+	int "GID to deny client sockets for"
-+	depends on GRKERNSEC_SOCKET_CLIENT
-+	default 1003
-+	help
-+	  Here you can choose the GID to disable client socket access for.
-+	  Remember to add the users you want client socket access disabled for to
-+	  the GID specified here.  If the sysctl option is enabled, a sysctl
-+	  option with name "socket_client_gid" is created.
-+
-+config GRKERNSEC_SOCKET_SERVER
-+	bool "Deny server sockets to group"
-+	depends on GRKERNSEC_SOCKET
-+	help
-+	  If you say Y here, you will be able to choose a GID of whose users will
-+	  be unable to run server applications from your machine.  If the sysctl
-+	  option is enabled, a sysctl option with name "socket_server" is created.
-+
-+config GRKERNSEC_SOCKET_SERVER_GID
-+	int "GID to deny server sockets for"
-+	depends on GRKERNSEC_SOCKET_SERVER
-+	default 1002
-+	help
-+	  Here you can choose the GID to disable server socket access for.
-+	  Remember to add the users you want server socket access disabled for to
-+	  the GID specified here.  If the sysctl option is enabled, a sysctl
-+	  option with name "socket_server_gid" is created.
-+
-+endmenu
-+menu "Sysctl support"
-+depends on GRKERNSEC && SYSCTL
-+
-+config GRKERNSEC_SYSCTL
-+	bool "Sysctl support"
-+	help
-+	  If you say Y here, you will be able to change the options that
-+	  grsecurity runs with at bootup, without having to recompile your
-+	  kernel.  You can echo values to files in /proc/sys/kernel/grsecurity
-+	  to enable (1) or disable (0) various features.  All the sysctl entries
-+	  are mutable until the "grsec_lock" entry is set to a non-zero value.
-+	  All features enabled in the kernel configuration are disabled at boot
-+	  if you do not say Y to the "Turn on features by default" option.
-+	  All options should be set at startup, and the grsec_lock entry should
-+	  be set to a non-zero value after all the options are set.
-+	  *THIS IS EXTREMELY IMPORTANT*
-+
-+config GRKERNSEC_SYSCTL_ON
-+	bool "Turn on features by default"
-+	depends on GRKERNSEC_SYSCTL
-+	help
-+	  If you say Y here, instead of having all features enabled in the
-+	  kernel configuration disabled at boot time, the features will be
-+	  enabled at boot time.  It is recommended you say Y here unless
-+	  there is some reason you would want all sysctl-tunable features to
-+	  be disabled by default.  As mentioned elsewhere, it is important
-+	  to enable the grsec_lock entry once you have finished modifying
-+	  the sysctl entries.
-+
-+endmenu
-+menu "Logging Options"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_FLOODTIME
-+	int "Seconds in between log messages (minimum)"
-+	default 10
-+	help
-+	  This option allows you to enforce the number of seconds between
-+	  grsecurity log messages.  The default should be suitable for most
-+	  people, however, if you choose to change it, choose a value small enough
-+	  to allow informative logs to be produced, but large enough to
-+	  prevent flooding.
-+
-+config GRKERNSEC_FLOODBURST
-+	int "Number of messages in a burst (maximum)"
-+	default 4
-+	help
-+	  This option allows you to choose the maximum number of messages allowed
-+	  within the flood time interval you chose in a separate option.  The
-+	  default should be suitable for most people, however if you find that
-+	  many of your logs are being interpreted as flooding, you may want to
-+	  raise this value.
-+
-+endmenu
-+
-+endmenu
-diff -urNp linux-2.6.32.13/grsecurity/Makefile linux-2.6.32.13/grsecurity/Makefile
---- linux-2.6.32.13/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/grsecurity/Makefile	2010-05-15 13:21:17.910594530 -0400
-@@ -0,0 +1,29 @@
-+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
-+# during 2001-2009 it has been completely redesigned by Brad Spengler
-+# into an RBAC system
-+#
-+# All code in this directory and various hooks inserted throughout the kernel
-+# are copyright Brad Spengler - Open Source Security, Inc., and released 
-+# under the GPL v2 or higher
-+
-+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
-+	grsec_mount.o grsec_sig.o grsec_sock.o grsec_sysctl.o \
-+	grsec_time.o grsec_tpe.o grsec_link.o grsec_textrel.o grsec_ptrace.o
-+
-+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_ip.o gracl_segv.o \
-+	gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
-+	gracl_learn.o grsec_log.o
-+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
-+
-+ifndef CONFIG_GRKERNSEC
-+obj-y += grsec_disabled.o
-+endif
-+
-+ifdef CONFIG_GRKERNSEC_HIDESYM
-+extra-y := grsec_hidesym.o
-+$(obj)/grsec_hidesym.o:
-+	@-chmod -f 500 /boot
-+	@-chmod -f 500 /lib/modules
-+	@-chmod -f 700 .
-+	@echo '  grsec: protected kernel image paths'
-+endif
-diff -urNp linux-2.6.32.13/include/acpi/acoutput.h linux-2.6.32.13/include/acpi/acoutput.h
---- linux-2.6.32.13/include/acpi/acoutput.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/acpi/acoutput.h	2010-05-15 13:21:17.910594530 -0400
-@@ -264,8 +264,8 @@
+diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
+index 5e95226..0eebf1a 100644
+--- a/include/acpi/acoutput.h
++++ b/include/acpi/acoutput.h
+@@ -268,8 +268,8 @@
   * leaving no executable debug code!
   */
  #define ACPI_FUNCTION_NAME(a)
@@ -43505,10 +44639,11 @@ diff -urNp linux-2.6.32.13/include/acpi/acoutput.h linux-2.6.32.13/include/acpi/
  
  #endif				/* ACPI_DEBUG_OUTPUT */
  
-diff -urNp linux-2.6.32.13/include/acpi/acpi_drivers.h linux-2.6.32.13/include/acpi/acpi_drivers.h
---- linux-2.6.32.13/include/acpi/acpi_drivers.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/acpi/acpi_drivers.h	2010-05-15 13:21:17.910594530 -0400
-@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
+diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
+index 23d78b4..b921c6c 100644
+--- a/include/acpi/acpi_drivers.h
++++ b/include/acpi/acpi_drivers.h
+@@ -121,8 +121,8 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type);
                                    Dock Station
    -------------------------------------------------------------------------- */
  struct acpi_dock_ops {
@@ -43519,7 +44654,7 @@ diff -urNp linux-2.6.32.13/include/acpi/acpi_drivers.h linux-2.6.32.13/include/a
  };
  
  #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
-@@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle ha
+@@ -130,7 +130,7 @@ extern int is_dock_device(acpi_handle handle);
  extern int register_dock_notifier(struct notifier_block *nb);
  extern void unregister_dock_notifier(struct notifier_block *nb);
  extern int register_hotplug_dock_device(acpi_handle handle,
@@ -43528,7 +44663,7 @@ diff -urNp linux-2.6.32.13/include/acpi/acpi_drivers.h linux-2.6.32.13/include/a
  					void *context);
  extern void unregister_hotplug_dock_device(acpi_handle handle);
  #else
-@@ -144,7 +144,7 @@ static inline void unregister_dock_notif
+@@ -146,7 +146,7 @@ static inline void unregister_dock_notifier(struct notifier_block *nb)
  {
  }
  static inline int register_hotplug_dock_device(acpi_handle handle,
@@ -43537,9 +44672,10 @@ diff -urNp linux-2.6.32.13/include/acpi/acpi_drivers.h linux-2.6.32.13/include/a
  					       void *context)
  {
  	return -ENODEV;
-diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/include/asm-generic/atomic-long.h
---- linux-2.6.32.13/include/asm-generic/atomic-long.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/asm-generic/atomic-long.h	2010-05-15 13:21:17.910594530 -0400
+diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
+index b7babf0..7bb92a1 100644
+--- a/include/asm-generic/atomic-long.h
++++ b/include/asm-generic/atomic-long.h
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -43553,7 +44689,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
  #define ATOMIC_LONG_INIT(i)	ATOMIC64_INIT(i)
  
  static inline long atomic_long_read(atomic_long_t *l)
-@@ -31,6 +37,15 @@ static inline long atomic_long_read(atom
+@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
  	return (long)atomic64_read(v);
  }
  
@@ -43569,7 +44705,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
  static inline void atomic_long_set(atomic_long_t *l, long i)
  {
  	atomic64_t *v = (atomic64_t *)l;
-@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomi
+@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
  	atomic64_set(v, i);
  }
  
@@ -43585,7 +44721,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
  static inline void atomic_long_inc(atomic_long_t *l)
  {
  	atomic64_t *v = (atomic64_t *)l;
-@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomi
+@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
  	atomic64_inc(v);
  }
  
@@ -43601,7 +44737,23 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
  static inline void atomic_long_dec(atomic_long_t *l)
  {
  	atomic64_t *v = (atomic64_t *)l;
-@@ -59,6 +92,15 @@ static inline void atomic_long_add(long 
+@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
+ 	atomic64_dec(v);
+ }
+ 
++#ifdef CONFIG_PAX_REFCOUNT
++static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
++{
++	atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
++
++	atomic64_dec_unchecked(v);
++}
++#endif
++
+ static inline void atomic_long_add(long i, atomic_long_t *l)
+ {
+ 	atomic64_t *v = (atomic64_t *)l;
+@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
  	atomic64_add(i, v);
  }
  
@@ -43617,7 +44769,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
  static inline void atomic_long_sub(long i, atomic_long_t *l)
  {
  	atomic64_t *v = (atomic64_t *)l;
-@@ -115,6 +157,15 @@ static inline long atomic_long_inc_retur
+@@ -115,6 +166,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
  	return (long)atomic64_inc_return(v);
  }
  
@@ -43633,7 +44785,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
  static inline long atomic_long_dec_return(atomic_long_t *l)
  {
  	atomic64_t *v = (atomic64_t *)l;
-@@ -140,6 +191,12 @@ static inline long atomic_long_add_unles
+@@ -140,6 +200,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
  
  typedef atomic_t atomic_long_t;
  
@@ -43646,7 +44798,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
  #define ATOMIC_LONG_INIT(i)	ATOMIC_INIT(i)
  static inline long atomic_long_read(atomic_long_t *l)
  {
-@@ -148,6 +205,15 @@ static inline long atomic_long_read(atom
+@@ -148,6 +214,15 @@ static inline long atomic_long_read(atomic_long_t *l)
  	return (long)atomic_read(v);
  }
  
@@ -43662,7 +44814,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
  static inline void atomic_long_set(atomic_long_t *l, long i)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -155,6 +221,15 @@ static inline void atomic_long_set(atomi
+@@ -155,6 +230,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
  	atomic_set(v, i);
  }
  
@@ -43678,7 +44830,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
  static inline void atomic_long_inc(atomic_long_t *l)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -162,6 +237,15 @@ static inline void atomic_long_inc(atomi
+@@ -162,6 +246,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
  	atomic_inc(v);
  }
  
@@ -43694,7 +44846,23 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
  static inline void atomic_long_dec(atomic_long_t *l)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -176,6 +260,15 @@ static inline void atomic_long_add(long 
+@@ -169,6 +262,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
+ 	atomic_dec(v);
+ }
+ 
++#ifdef CONFIG_PAX_REFCOUNT
++static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
++{
++	atomic_unchecked_t *v = (atomic_unchecked_t *)l;
++
++	atomic_dec_unchecked(v);
++}
++#endif
++
+ static inline void atomic_long_add(long i, atomic_long_t *l)
+ {
+ 	atomic_t *v = (atomic_t *)l;
+@@ -176,6 +278,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
  	atomic_add(i, v);
  }
  
@@ -43710,7 +44878,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
  static inline void atomic_long_sub(long i, atomic_long_t *l)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -232,6 +325,15 @@ static inline long atomic_long_inc_retur
+@@ -232,6 +343,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
  	return (long)atomic_inc_return(v);
  }
  
@@ -43726,7 +44894,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
  static inline long atomic_long_dec_return(atomic_long_t *l)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -255,4 +357,33 @@ static inline long atomic_long_add_unles
+@@ -255,4 +375,39 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
  
  #endif  /*  BITS_PER_LONG == 64  */
  
@@ -43738,12 +44906,15 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
 +	atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
 +	atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
 +	atomic_inc_unchecked((atomic_unchecked_t *)NULL);
++	atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
++	atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
 +
 +	atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
 +	atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
 +	atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
 +	atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
 +	atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
++	atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
 +}
 +#else
 +#define atomic_read_unchecked(v) atomic_read(v)
@@ -43751,19 +44922,23 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc
 +#define atomic_add_unchecked(i, v) atomic_add((i), (v))
 +#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
 +#define atomic_inc_unchecked(v) atomic_inc(v)
++#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
++#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
 +
 +#define atomic_long_read_unchecked(v) atomic_long_read(v)
 +#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
 +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
 +#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
 +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
++#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32.13/include/asm-generic/dma-mapping-common.h
---- linux-2.6.32.13/include/asm-generic/dma-mapping-common.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/asm-generic/dma-mapping-common.h	2010-05-15 13:21:17.910594530 -0400
-@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
+diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h
+index 0c80bb3..6baf94b 100644
+--- a/include/asm-generic/dma-mapping-common.h
++++ b/include/asm-generic/dma-mapping-common.h
+@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
  					      enum dma_data_direction dir,
  					      struct dma_attrs *attrs)
  {
@@ -43772,7 +44947,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32
  	dma_addr_t addr;
  
  	kmemcheck_mark_initialized(ptr, size);
-@@ -30,7 +30,7 @@ static inline void dma_unmap_single_attr
+@@ -30,7 +30,7 @@ static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
  					  enum dma_data_direction dir,
  					  struct dma_attrs *attrs)
  {
@@ -43781,7 +44956,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32
  
  	BUG_ON(!valid_dma_direction(dir));
  	if (ops->unmap_page)
-@@ -42,7 +42,7 @@ static inline int dma_map_sg_attrs(struc
+@@ -42,7 +42,7 @@ static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
  				   int nents, enum dma_data_direction dir,
  				   struct dma_attrs *attrs)
  {
@@ -43790,7 +44965,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32
  	int i, ents;
  	struct scatterlist *s;
  
-@@ -59,7 +59,7 @@ static inline void dma_unmap_sg_attrs(st
+@@ -59,7 +59,7 @@ static inline void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg
  				      int nents, enum dma_data_direction dir,
  				      struct dma_attrs *attrs)
  {
@@ -43799,7 +44974,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32
  
  	BUG_ON(!valid_dma_direction(dir));
  	debug_dma_unmap_sg(dev, sg, nents, dir);
-@@ -71,7 +71,7 @@ static inline dma_addr_t dma_map_page(st
+@@ -71,7 +71,7 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
  				      size_t offset, size_t size,
  				      enum dma_data_direction dir)
  {
@@ -43808,7 +44983,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32
  	dma_addr_t addr;
  
  	kmemcheck_mark_initialized(page_address(page) + offset, size);
-@@ -85,7 +85,7 @@ static inline dma_addr_t dma_map_page(st
+@@ -85,7 +85,7 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
  static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
  				  size_t size, enum dma_data_direction dir)
  {
@@ -43817,7 +44992,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32
  
  	BUG_ON(!valid_dma_direction(dir));
  	if (ops->unmap_page)
-@@ -97,7 +97,7 @@ static inline void dma_sync_single_for_c
+@@ -97,7 +97,7 @@ static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,
  					   size_t size,
  					   enum dma_data_direction dir)
  {
@@ -43826,7 +45001,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32
  
  	BUG_ON(!valid_dma_direction(dir));
  	if (ops->sync_single_for_cpu)
-@@ -109,7 +109,7 @@ static inline void dma_sync_single_for_d
+@@ -109,7 +109,7 @@ static inline void dma_sync_single_for_device(struct device *dev,
  					      dma_addr_t addr, size_t size,
  					      enum dma_data_direction dir)
  {
@@ -43835,25 +45010,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32
  
  	BUG_ON(!valid_dma_direction(dir));
  	if (ops->sync_single_for_device)
-@@ -123,7 +123,7 @@ static inline void dma_sync_single_range
- 						 size_t size,
- 						 enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->sync_single_range_for_cpu) {
-@@ -140,7 +140,7 @@ static inline void dma_sync_single_range
- 						    size_t size,
- 						    enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->sync_single_range_for_device) {
-@@ -155,7 +155,7 @@ static inline void
+@@ -139,7 +139,7 @@ static inline void
  dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
  		    int nelems, enum dma_data_direction dir)
  {
@@ -43862,7 +45019,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32
  
  	BUG_ON(!valid_dma_direction(dir));
  	if (ops->sync_sg_for_cpu)
-@@ -167,7 +167,7 @@ static inline void
+@@ -151,7 +151,7 @@ static inline void
  dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
  		       int nelems, enum dma_data_direction dir)
  {
@@ -43871,9 +45028,10 @@ diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32
  
  	BUG_ON(!valid_dma_direction(dir));
  	if (ops->sync_sg_for_device)
-diff -urNp linux-2.6.32.13/include/asm-generic/futex.h linux-2.6.32.13/include/asm-generic/futex.h
---- linux-2.6.32.13/include/asm-generic/futex.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/asm-generic/futex.h	2010-05-15 13:21:17.910594530 -0400
+diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
+index 3c2344f..4590a7d 100644
+--- a/include/asm-generic/futex.h
++++ b/include/asm-generic/futex.h
 @@ -6,7 +6,7 @@
  #include <asm/errno.h>
  
@@ -43883,7 +45041,7 @@ diff -urNp linux-2.6.32.13/include/asm-generic/futex.h linux-2.6.32.13/include/a
  {
  	int op = (encoded_op >> 28) & 7;
  	int cmp = (encoded_op >> 24) & 15;
-@@ -48,7 +48,7 @@ futex_atomic_op_inuser (int encoded_op, 
+@@ -48,7 +48,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
  }
  
  static inline int
@@ -43892,9 +45050,10 @@ diff -urNp linux-2.6.32.13/include/asm-generic/futex.h linux-2.6.32.13/include/a
  {
  	return -ENOSYS;
  }
-diff -urNp linux-2.6.32.13/include/asm-generic/int-l64.h linux-2.6.32.13/include/asm-generic/int-l64.h
---- linux-2.6.32.13/include/asm-generic/int-l64.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/asm-generic/int-l64.h	2010-05-15 13:21:17.910594530 -0400
+diff --git a/include/asm-generic/int-l64.h b/include/asm-generic/int-l64.h
+index 1ca3efc..e3dc852 100644
+--- a/include/asm-generic/int-l64.h
++++ b/include/asm-generic/int-l64.h
 @@ -46,6 +46,8 @@ typedef unsigned int u32;
  typedef signed long s64;
  typedef unsigned long u64;
@@ -43904,9 +45063,10 @@ diff -urNp linux-2.6.32.13/include/asm-generic/int-l64.h linux-2.6.32.13/include
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.32.13/include/asm-generic/int-ll64.h linux-2.6.32.13/include/asm-generic/int-ll64.h
---- linux-2.6.32.13/include/asm-generic/int-ll64.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/asm-generic/int-ll64.h	2010-05-15 13:21:17.910594530 -0400
+diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h
+index f394147..b6152b9 100644
+--- a/include/asm-generic/int-ll64.h
++++ b/include/asm-generic/int-ll64.h
 @@ -51,6 +51,8 @@ typedef unsigned int u32;
  typedef signed long long s64;
  typedef unsigned long long u64;
@@ -43916,23 +45076,102 @@ diff -urNp linux-2.6.32.13/include/asm-generic/int-ll64.h linux-2.6.32.13/includ
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.32.13/include/asm-generic/kmap_types.h linux-2.6.32.13/include/asm-generic/kmap_types.h
---- linux-2.6.32.13/include/asm-generic/kmap_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/asm-generic/kmap_types.h	2010-05-15 13:21:17.910594530 -0400
-@@ -28,7 +28,8 @@ KMAP_D(15)	KM_UML_USERCOPY,
- KMAP_D(16)	KM_IRQ_PTE,
+diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
+index 0232ccb..13d9165 100644
+--- a/include/asm-generic/kmap_types.h
++++ b/include/asm-generic/kmap_types.h
+@@ -29,10 +29,11 @@ KMAP_D(16)	KM_IRQ_PTE,
  KMAP_D(17)	KM_NMI,
  KMAP_D(18)	KM_NMI_PTE,
--KMAP_D(19)	KM_TYPE_NR
-+KMAP_D(19)	KM_CLEARPAGE,
-+KMAP_D(20)	KM_TYPE_NR
+ KMAP_D(19)	KM_KDB,
++KMAP_D(20)	KM_CLEARPAGE,
+ /*
+  * Remember to update debug_kmap_atomic() when adding new kmap types!
+  */
+-KMAP_D(20)	KM_TYPE_NR
++KMAP_D(21)	KM_TYPE_NR
  };
  
  #undef KMAP_D
-diff -urNp linux-2.6.32.13/include/asm-generic/pgtable.h linux-2.6.32.13/include/asm-generic/pgtable.h
---- linux-2.6.32.13/include/asm-generic/pgtable.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/asm-generic/pgtable.h	2010-05-15 13:21:17.910594530 -0400
-@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
+diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
+index 725612b..9cc513a 100644
+--- a/include/asm-generic/pgtable-nopmd.h
++++ b/include/asm-generic/pgtable-nopmd.h
+@@ -1,14 +1,19 @@
+ #ifndef _PGTABLE_NOPMD_H
+ #define _PGTABLE_NOPMD_H
+ 
+-#ifndef __ASSEMBLY__
+-
+ #include <asm-generic/pgtable-nopud.h>
+ 
+-struct mm_struct;
+-
+ #define __PAGETABLE_PMD_FOLDED
+ 
++#define PMD_SHIFT	PUD_SHIFT
++#define PTRS_PER_PMD	1
++#define PMD_SIZE  	(_AC(1,UL) << PMD_SHIFT)
++#define PMD_MASK  	(~(PMD_SIZE-1))
++
++#ifndef __ASSEMBLY__
++
++struct mm_struct;
++
+ /*
+  * Having the pmd type consist of a pud gets the size right, and allows
+  * us to conceptually access the pud entry that this pmd is folded into
+@@ -16,11 +21,6 @@ struct mm_struct;
+  */
+ typedef struct { pud_t pud; } pmd_t;
+ 
+-#define PMD_SHIFT	PUD_SHIFT
+-#define PTRS_PER_PMD	1
+-#define PMD_SIZE  	(1UL << PMD_SHIFT)
+-#define PMD_MASK  	(~(PMD_SIZE-1))
+-
+ /*
+  * The "pud_xxx()" functions here are trivial for a folded two-level
+  * setup: the pmd is never bad, and a pmd always exists (as it's folded
+diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
+index 810431d..ccc3638 100644
+--- a/include/asm-generic/pgtable-nopud.h
++++ b/include/asm-generic/pgtable-nopud.h
+@@ -1,10 +1,15 @@
+ #ifndef _PGTABLE_NOPUD_H
+ #define _PGTABLE_NOPUD_H
+ 
+-#ifndef __ASSEMBLY__
+-
+ #define __PAGETABLE_PUD_FOLDED
+ 
++#define PUD_SHIFT	PGDIR_SHIFT
++#define PTRS_PER_PUD	1
++#define PUD_SIZE  	(_AC(1,UL) << PUD_SHIFT)
++#define PUD_MASK  	(~(PUD_SIZE-1))
++
++#ifndef __ASSEMBLY__
++
+ /*
+  * Having the pud type consist of a pgd gets the size right, and allows
+  * us to conceptually access the pgd entry that this pud is folded into
+@@ -12,11 +17,6 @@
+  */
+ typedef struct { pgd_t pgd; } pud_t;
+ 
+-#define PUD_SHIFT	PGDIR_SHIFT
+-#define PTRS_PER_PUD	1
+-#define PUD_SIZE  	(1UL << PUD_SHIFT)
+-#define PUD_MASK  	(~(PUD_SIZE-1))
+-
+ /*
+  * The "pgd_xxx()" functions here are trivial for a folded two-level
+  * setup: the pud is never bad, and a pud always exists (as it's folded
+diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
+index e2bd73e..fea8ed3 100644
+--- a/include/asm-generic/pgtable.h
++++ b/include/asm-generic/pgtable.h
+@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_area_struct *vma, unsigned long pfn,
  				unsigned long size);
  #endif
  
@@ -43947,18 +45186,19 @@ diff -urNp linux-2.6.32.13/include/asm-generic/pgtable.h linux-2.6.32.13/include
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.32.13/include/asm-generic/vmlinux.lds.h linux-2.6.32.13/include/asm-generic/vmlinux.lds.h
---- linux-2.6.32.13/include/asm-generic/vmlinux.lds.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/asm-generic/vmlinux.lds.h	2010-05-15 13:21:17.910594530 -0400
-@@ -199,6 +199,7 @@
+diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
+index 030a954..515f882 100644
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -213,6 +213,7 @@
  	.rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {		\
  		VMLINUX_SYMBOL(__start_rodata) = .;			\
  		*(.rodata) *(.rodata.*)					\
-+		*(.data.read_only)					\
++		*(.data..read_only)					\
  		*(__vermagic)		/* Kernel version magic */	\
  		*(__markers_strings)	/* Markers: strings */		\
  		*(__tracepoints_strings)/* Tracepoints: strings */	\
-@@ -656,22 +657,24 @@
+@@ -670,22 +671,24 @@
   * section in the linker script will go there too.  @phdr should have
   * a leading colon.
   *
@@ -43969,29 +45209,61 @@ diff -urNp linux-2.6.32.13/include/asm-generic/vmlinux.lds.h linux-2.6.32.13/inc
   */
  #define PERCPU_VADDR(vaddr, phdr)					\
 -	VMLINUX_SYMBOL(__per_cpu_load) = .;				\
--	.data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load)		\
+-	.data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load)		\
 +	per_cpu_load = .;						\
-+	.data.percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load)		\
++	.data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load)		\
  				- LOAD_OFFSET) {			\
 +		VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load;	\
  		VMLINUX_SYMBOL(__per_cpu_start) = .;			\
- 		*(.data.percpu.first)					\
--		*(.data.percpu.page_aligned)				\
- 		*(.data.percpu)						\
+ 		*(.data..percpu..first)					\
+-		*(.data..percpu..page_aligned)				\
+ 		*(.data..percpu)					\
 +		. = ALIGN(PAGE_SIZE);					\
-+		*(.data.percpu.page_aligned)				\
- 		*(.data.percpu.shared_aligned)				\
++		*(.data..percpu..page_aligned)				\
+ 		*(.data..percpu..shared_aligned)			\
  		VMLINUX_SYMBOL(__per_cpu_end) = .;			\
  	} phdr								\
--	. = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data.percpu);
-+	. = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data.percpu);
+-	. = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
++	. = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
  
  /**
   * PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/drm_pciids.h
---- linux-2.6.32.13/include/drm/drm_pciids.h	2010-04-29 17:49:38.529851956 -0400
-+++ linux-2.6.32.13/include/drm/drm_pciids.h	2010-05-15 13:21:17.910594530 -0400
-@@ -377,7 +377,7 @@
+diff --git a/include/drm/drmP.h b/include/drm/drmP.h
+index 7c9d28d..c52d219 100644
+--- a/include/drm/drmP.h
++++ b/include/drm/drmP.h
+@@ -807,7 +807,7 @@ struct drm_driver {
+ 	void (*vgaarb_irq)(struct drm_device *dev, bool state);
+ 
+ 	/* Driver private ops for this object */
+-	struct vm_operations_struct *gem_vm_ops;
++	const struct vm_operations_struct *gem_vm_ops;
+ 
+ 	int major;
+ 	int minor;
+@@ -916,7 +916,7 @@ struct drm_device {
+ 
+ 	/** \name Usage Counters */
+ 	/*@{ */
+-	int open_count;			/**< Outstanding files open */
++	atomic_t open_count;		/**< Outstanding files open */
+ 	atomic_t ioctl_count;		/**< Outstanding IOCTLs pending */
+ 	atomic_t vma_count;		/**< Outstanding vma areas open */
+ 	int buf_use;			/**< Buffers in use -- cannot alloc */
+@@ -927,7 +927,7 @@ struct drm_device {
+ 	/*@{ */
+ 	unsigned long counters;
+ 	enum drm_stat_type types[15];
+-	atomic_t counts[15];
++	atomic_unchecked_t counts[15];
+ 	/*@} */
+ 
+ 	struct list_head filelist;
+diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
+index 883c1d4..f322a72 100644
+--- a/include/drm/drm_pciids.h
++++ b/include/drm/drm_pciids.h
+@@ -419,7 +419,7 @@
  	{0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  	{0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  	{0x1002, 0x9715, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -44000,7 +45272,7 @@ diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/
  
  #define r128_PCI_IDS \
  	{0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -417,14 +417,14 @@
+@@ -459,14 +459,14 @@
  	{0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
  	{0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
  	{0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -44017,7 +45289,7 @@ diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/
  
  #define mach64_PCI_IDS \
  	{0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -447,7 +447,7 @@
+@@ -489,7 +489,7 @@
  	{0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
  	{0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
  	{0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -44026,7 +45298,7 @@ diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/
  
  #define sisdrv_PCI_IDS \
  	{0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -458,7 +458,7 @@
+@@ -500,7 +500,7 @@
  	{0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
  	{0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
  	{0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
@@ -44035,7 +45307,7 @@ diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/
  
  #define tdfx_PCI_IDS \
  	{0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -467,7 +467,7 @@
+@@ -509,7 +509,7 @@
  	{0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
  	{0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
  	{0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -44044,7 +45316,7 @@ diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/
  
  #define viadrv_PCI_IDS \
  	{0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -479,14 +479,14 @@
+@@ -521,14 +521,14 @@
  	{0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
  	{0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
  	{0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \
@@ -44061,7 +45333,7 @@ diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/
  
  #define i830_PCI_IDS \
  	{0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -494,11 +494,11 @@
+@@ -536,11 +536,11 @@
  	{0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
  	{0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
  	{0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -44075,7 +45347,7 @@ diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/
  
  #define savage_PCI_IDS \
  	{0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \
-@@ -524,10 +524,10 @@
+@@ -566,10 +566,10 @@
  	{0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \
  	{0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
  	{0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
@@ -44088,45 +45360,16 @@ diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/
  
  #define i915_PCI_IDS \
  	{0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
-@@ -560,4 +560,4 @@
- 	{0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+@@ -603,4 +603,4 @@
  	{0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
  	{0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+ 	{0x8086, 0x0102, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
 -	{0, 0, 0}
 +	{0, 0, 0, 0, 0, 0}
-diff -urNp linux-2.6.32.13/include/drm/drmP.h linux-2.6.32.13/include/drm/drmP.h
---- linux-2.6.32.13/include/drm/drmP.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/drm/drmP.h	2010-05-15 13:21:17.910594530 -0400
-@@ -814,7 +814,7 @@ struct drm_driver {
- 	void (*vgaarb_irq)(struct drm_device *dev, bool state);
- 
- 	/* Driver private ops for this object */
--	struct vm_operations_struct *gem_vm_ops;
-+	const struct vm_operations_struct *gem_vm_ops;
- 
- 	int major;
- 	int minor;
-@@ -917,7 +917,7 @@ struct drm_device {
- 
- 	/** \name Usage Counters */
- 	/*@{ */
--	int open_count;			/**< Outstanding files open */
-+	atomic_t open_count;		/**< Outstanding files open */
- 	atomic_t ioctl_count;		/**< Outstanding IOCTLs pending */
- 	atomic_t vma_count;		/**< Outstanding vma areas open */
- 	int buf_use;			/**< Buffers in use -- cannot alloc */
-@@ -928,7 +928,7 @@ struct drm_device {
- 	/*@{ */
- 	unsigned long counters;
- 	enum drm_stat_type types[15];
--	atomic_t counts[15];
-+	atomic_unchecked_t counts[15];
- 	/*@} */
- 
- 	struct list_head filelist;
-diff -urNp linux-2.6.32.13/include/linux/a.out.h linux-2.6.32.13/include/linux/a.out.h
---- linux-2.6.32.13/include/linux/a.out.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/a.out.h	2010-05-15 13:21:17.914599996 -0400
+diff --git a/include/linux/a.out.h b/include/linux/a.out.h
+index e86dfca..40cc55f 100644
+--- a/include/linux/a.out.h
++++ b/include/linux/a.out.h
 @@ -39,6 +39,14 @@ enum machine_type {
    M_MIPS2 = 152		/* MIPS R6000/R4000 binary */
  };
@@ -44142,9 +45385,10 @@ diff -urNp linux-2.6.32.13/include/linux/a.out.h linux-2.6.32.13/include/linux/a
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urNp linux-2.6.32.13/include/linux/atmdev.h linux-2.6.32.13/include/linux/atmdev.h
---- linux-2.6.32.13/include/linux/atmdev.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/atmdev.h	2010-05-15 13:21:17.914599996 -0400
+diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
+index 817b237..62c10bc 100644
+--- a/include/linux/atmdev.h
++++ b/include/linux/atmdev.h
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -44154,65 +45398,23 @@ diff -urNp linux-2.6.32.13/include/linux/atmdev.h linux-2.6.32.13/include/linux/
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.32.13/include/linux/backlight.h linux-2.6.32.13/include/linux/backlight.h
---- linux-2.6.32.13/include/linux/backlight.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/backlight.h	2010-05-15 13:21:17.914599996 -0400
-@@ -36,18 +36,18 @@ struct backlight_device;
- struct fb_info;
- 
- struct backlight_ops {
--	unsigned int options;
-+	const unsigned int options;
- 
- #define BL_CORE_SUSPENDRESUME	(1 << 0)
- 
- 	/* Notify the backlight driver some property has changed */
--	int (*update_status)(struct backlight_device *);
-+	int (* const update_status)(struct backlight_device *);
- 	/* Return the current backlight brightness (accounting for power,
- 	   fb_blank etc.) */
--	int (*get_brightness)(struct backlight_device *);
-+	int (* const get_brightness)(struct backlight_device *);
- 	/* Check if given framebuffer device is the one bound to this backlight;
- 	   return 0 if not, !=0 if it is. If NULL, backlight always matches the fb. */
--	int (*check_fb)(struct fb_info *);
-+	int (* const check_fb)(struct fb_info *);
- };
- 
- /* This structure defines all the properties of a backlight */
-@@ -86,7 +86,7 @@ struct backlight_device {
- 	   registered this device has been unloaded, and if class_get_devdata()
- 	   points to something in the body of that driver, it is also invalid. */
- 	struct mutex ops_lock;
--	struct backlight_ops *ops;
-+	const struct backlight_ops *ops;
- 
- 	/* The framebuffer notifier block */
- 	struct notifier_block fb_notif;
-@@ -103,7 +103,7 @@ static inline void backlight_update_stat
- }
- 
- extern struct backlight_device *backlight_device_register(const char *name,
--	struct device *dev, void *devdata, struct backlight_ops *ops);
-+	struct device *dev, void *devdata, const struct backlight_ops *ops);
- extern void backlight_device_unregister(struct backlight_device *bd);
- extern void backlight_force_update(struct backlight_device *bd,
- 				   enum backlight_update_reason reason);
-diff -urNp linux-2.6.32.13/include/linux/binfmts.h linux-2.6.32.13/include/linux/binfmts.h
---- linux-2.6.32.13/include/linux/binfmts.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/binfmts.h	2010-05-15 13:21:17.934614916 -0400
-@@ -78,6 +78,7 @@ struct linux_binfmt {
+diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
+index 074b620..c8823dc 100644
+--- a/include/linux/binfmts.h
++++ b/include/linux/binfmts.h
+@@ -92,6 +92,7 @@ struct linux_binfmt {
  	int (*load_binary)(struct linux_binprm *, struct  pt_regs * regs);
  	int (*load_shlib)(struct file *);
- 	int (*core_dump)(long signr, struct pt_regs *regs, struct file *file, unsigned long limit);
+ 	int (*core_dump)(struct coredump_params *cprm);
 +	void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
  	unsigned long min_coredump;	/* minimal dump size */
  	int hasvdso;
  };
-diff -urNp linux-2.6.32.13/include/linux/blkdev.h linux-2.6.32.13/include/linux/blkdev.h
---- linux-2.6.32.13/include/linux/blkdev.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/blkdev.h	2010-05-15 13:21:17.934614916 -0400
-@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
+diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
+index 7b35803..e46aa64 100644
+--- a/include/linux/blkdev.h
++++ b/include/linux/blkdev.h
+@@ -1331,20 +1331,20 @@ static inline int blk_integrity_rq(struct request *rq)
  #endif /* CONFIG_BLK_DEV_INTEGRITY */
  
  struct block_device_operations {
@@ -44230,22 +45432,25 @@ diff -urNp linux-2.6.32.13/include/linux/blkdev.h linux-2.6.32.13/include/linux/
 +	int (* const direct_access) (struct block_device *, sector_t,
  						void **, unsigned long *);
 -	int (*media_changed) (struct gendisk *);
--	unsigned long long (*set_capacity) (struct gendisk *,
-+	int (* const media_changed) (struct gendisk *);
-+	unsigned long long (* const set_capacity) (struct gendisk *,
- 						unsigned long long);
+-	void (*unlock_native_capacity) (struct gendisk *);
 -	int (*revalidate_disk) (struct gendisk *);
 -	int (*getgeo)(struct block_device *, struct hd_geometry *);
--	struct module *owner;
++	int (* const media_changed) (struct gendisk *);
++	void (* const unlock_native_capacity) (struct gendisk *);
 +	int (* const revalidate_disk) (struct gendisk *);
 +	int (*const getgeo)(struct block_device *, struct hd_geometry *);
+ 	/* 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;
++	void (* const swap_slot_free_notify) (struct block_device *, unsigned long);
 +	struct module * const owner;
  };
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.32.13/include/linux/cache.h linux-2.6.32.13/include/linux/cache.h
---- linux-2.6.32.13/include/linux/cache.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/cache.h	2010-05-15 13:21:17.934614916 -0400
+diff --git a/include/linux/cache.h b/include/linux/cache.h
+index 4c57065..4307975 100644
+--- a/include/linux/cache.h
++++ b/include/linux/cache.h
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -44257,10 +45462,11 @@ diff -urNp linux-2.6.32.13/include/linux/cache.h linux-2.6.32.13/include/linux/c
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff -urNp linux-2.6.32.13/include/linux/capability.h linux-2.6.32.13/include/linux/capability.h
---- linux-2.6.32.13/include/linux/capability.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/capability.h	2010-05-15 13:21:17.934614916 -0400
-@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
+diff --git a/include/linux/capability.h b/include/linux/capability.h
+index 39e5ff5..9b450ab 100644
+--- a/include/linux/capability.h
++++ b/include/linux/capability.h
+@@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff_set;
  	(security_real_capable_noaudit((t), (cap)) == 0)
  
  extern int capable(int cap);
@@ -44268,22 +45474,26 @@ diff -urNp linux-2.6.32.13/include/linux/capability.h linux-2.6.32.13/include/li
  
  /* audit system wants to get cap info from files as well */
  struct dentry;
-diff -urNp linux-2.6.32.13/include/linux/compiler-gcc4.h linux-2.6.32.13/include/linux/compiler-gcc4.h
---- linux-2.6.32.13/include/linux/compiler-gcc4.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/compiler-gcc4.h	2010-05-15 13:21:17.934614916 -0400
-@@ -36,4 +36,8 @@
-    the kernel context */
- #define __cold			__attribute__((__cold__))
+diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
+index fcfa5b9..b487b3e 100644
+--- a/include/linux/compiler-gcc4.h
++++ b/include/linux/compiler-gcc4.h
+@@ -54,6 +54,10 @@
+ 
+ #endif
  
 +#define __alloc_size(...)	__attribute((alloc_size(__VA_ARGS__)))
 +#define __bos(ptr, arg)		__builtin_object_size((ptr), (arg))
 +#define __bos0(ptr)		__bos((ptr), 0)
 +#define __bos1(ptr)		__bos((ptr), 1)
  #endif
-diff -urNp linux-2.6.32.13/include/linux/compiler.h linux-2.6.32.13/include/linux/compiler.h
---- linux-2.6.32.13/include/linux/compiler.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/compiler.h	2010-05-15 13:21:17.934614916 -0400
-@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
+ 
+ #if __GNUC_MINOR__ > 0
+diff --git a/include/linux/compiler.h b/include/linux/compiler.h
+index a5a472b..fb1758f 100644
+--- a/include/linux/compiler.h
++++ b/include/linux/compiler.h
+@@ -267,6 +267,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
  #define __cold
  #endif
  
@@ -44306,9 +45516,10 @@ diff -urNp linux-2.6.32.13/include/linux/compiler.h linux-2.6.32.13/include/linu
  /* Simple shorthand for a section definition */
  #ifndef __section
  # define __section(S) __attribute__ ((__section__(#S)))
-diff -urNp linux-2.6.32.13/include/linux/decompress/mm.h linux-2.6.32.13/include/linux/decompress/mm.h
---- linux-2.6.32.13/include/linux/decompress/mm.h	2010-04-04 20:41:50.048452804 -0400
-+++ linux-2.6.32.13/include/linux/decompress/mm.h	2010-05-15 13:21:17.938584561 -0400
+diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
+index ad5ec1d..aa0847a 100644
+--- a/include/linux/decompress/mm.h
++++ b/include/linux/decompress/mm.h
 @@ -78,7 +78,7 @@ static void free(void *where)
   * warnings when not needed (indeed large_malloc / large_free are not
   * needed by inflate */
@@ -44318,10 +45529,11 @@ diff -urNp linux-2.6.32.13/include/linux/decompress/mm.h linux-2.6.32.13/include
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.32.13/include/linux/dma-mapping.h linux-2.6.32.13/include/linux/dma-mapping.h
---- linux-2.6.32.13/include/linux/dma-mapping.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/dma-mapping.h	2010-05-15 13:21:17.938584561 -0400
-@@ -16,50 +16,50 @@ enum dma_data_direction {
+diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
+index 89b7e1a..904424a 100644
+--- a/include/linux/dma-mapping.h
++++ b/include/linux/dma-mapping.h
+@@ -16,40 +16,40 @@ enum dma_data_direction {
  };
  
  struct dma_map_ops {
@@ -44357,18 +45569,6 @@ diff -urNp linux-2.6.32.13/include/linux/dma-mapping.h linux-2.6.32.13/include/l
 +	void (* const sync_single_for_device)(struct device *dev,
  				       dma_addr_t dma_handle, size_t size,
  				       enum dma_data_direction dir);
--	void (*sync_single_range_for_cpu)(struct device *dev,
-+	void (* const sync_single_range_for_cpu)(struct device *dev,
- 					  dma_addr_t dma_handle,
- 					  unsigned long offset,
- 					  size_t size,
- 					  enum dma_data_direction dir);
--	void (*sync_single_range_for_device)(struct device *dev,
-+	void (* const sync_single_range_for_device)(struct device *dev,
- 					     dma_addr_t dma_handle,
- 					     unsigned long offset,
- 					     size_t size,
- 					     enum dma_data_direction dir);
 -	void (*sync_sg_for_cpu)(struct device *dev,
 +	void (* const sync_sg_for_cpu)(struct device *dev,
  				struct scatterlist *sg, int nents,
@@ -44379,29 +45579,19 @@ diff -urNp linux-2.6.32.13/include/linux/dma-mapping.h linux-2.6.32.13/include/l
  				   enum dma_data_direction dir);
 -	int (*mapping_error)(struct device *dev, dma_addr_t dma_addr);
 -	int (*dma_supported)(struct device *dev, u64 mask);
+-	int (*set_dma_mask)(struct device *dev, u64 mask);
+-	int is_phys;
 +	int (* const mapping_error)(struct device *dev, dma_addr_t dma_addr);
 +	int (* const dma_supported)(struct device *dev, u64 mask);
- 	int (*set_dma_mask)(struct device *dev, u64 mask);
--	int is_phys;
++	int (* set_dma_mask)(struct device *dev, u64 mask);
 +	const int is_phys;
  };
  
  #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-2.6.32.13/include/linux/dst.h linux-2.6.32.13/include/linux/dst.h
---- linux-2.6.32.13/include/linux/dst.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/dst.h	2010-05-15 13:21:17.938584561 -0400
-@@ -380,7 +380,7 @@ struct dst_node
- 	struct thread_pool	*pool;
- 
- 	/* Transaction IDs live here */
--	atomic_long_t		gen;
-+	atomic_long_unchecked_t	gen;
- 
- 	/*
- 	 * How frequently and how many times transaction
-diff -urNp linux-2.6.32.13/include/linux/elf.h linux-2.6.32.13/include/linux/elf.h
---- linux-2.6.32.13/include/linux/elf.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/elf.h	2010-05-15 13:21:17.938584561 -0400
+diff --git a/include/linux/elf.h b/include/linux/elf.h
+index 4d60801..9f6b7af 100644
+--- a/include/linux/elf.h
++++ b/include/linux/elf.h
 @@ -49,6 +49,17 @@ typedef __s64	Elf64_Sxword;
  #define PT_GNU_EH_FRAME		0x6474e550
  
@@ -44418,9 +45608,9 @@ diff -urNp linux-2.6.32.13/include/linux/elf.h linux-2.6.32.13/include/linux/elf
 +/*#define EF_PAX_RANDEXEC		16*/	/* Randomize ET_EXEC base */
 +#define EF_PAX_SEGMEXEC		32	/* Segmentation based non-executable pages */
  
- /* These constants define the different elf file types */
- #define ET_NONE   0
-@@ -84,6 +95,8 @@ typedef __s64	Elf64_Sxword;
+ /*
+  * Extended Numbering
+@@ -106,6 +117,8 @@ typedef __s64	Elf64_Sxword;
  #define DT_DEBUG	21
  #define DT_TEXTREL	22
  #define DT_JMPREL	23
@@ -44429,7 +45619,7 @@ diff -urNp linux-2.6.32.13/include/linux/elf.h linux-2.6.32.13/include/linux/elf
  #define DT_ENCODING	32
  #define OLD_DT_LOOS	0x60000000
  #define DT_LOOS		0x6000000d
-@@ -230,6 +243,19 @@ typedef struct elf64_hdr {
+@@ -252,6 +265,19 @@ typedef struct elf64_hdr {
  #define PF_W		0x2
  #define PF_X		0x1
  
@@ -44449,7 +45639,7 @@ diff -urNp linux-2.6.32.13/include/linux/elf.h linux-2.6.32.13/include/linux/elf
  typedef struct elf32_phdr{
    Elf32_Word	p_type;
    Elf32_Off	p_offset;
-@@ -322,6 +348,8 @@ typedef struct elf64_shdr {
+@@ -344,6 +370,8 @@ typedef struct elf64_shdr {
  #define	EI_OSABI	7
  #define	EI_PAD		8
  
@@ -44458,38 +45648,39 @@ diff -urNp linux-2.6.32.13/include/linux/elf.h linux-2.6.32.13/include/linux/elf
  #define	ELFMAG0		0x7f		/* EI_MAG */
  #define	ELFMAG1		'E'
  #define	ELFMAG2		'L'
-@@ -386,6 +414,7 @@ extern Elf32_Dyn _DYNAMIC [];
- #define elf_phdr	elf32_phdr
+@@ -421,6 +449,7 @@ extern Elf32_Dyn _DYNAMIC [];
  #define elf_note	elf32_note
  #define elf_addr_t	Elf32_Off
+ #define Elf_Half	Elf32_Half
 +#define elf_dyn		Elf32_Dyn
  
  #else
  
-@@ -394,6 +423,7 @@ extern Elf64_Dyn _DYNAMIC [];
- #define elf_phdr	elf64_phdr
+@@ -431,6 +460,7 @@ extern Elf64_Dyn _DYNAMIC [];
  #define elf_note	elf64_note
  #define elf_addr_t	Elf64_Off
+ #define Elf_Half	Elf64_Half
 +#define elf_dyn		Elf64_Dyn
  
  #endif
  
-diff -urNp linux-2.6.32.13/include/linux/fs.h linux-2.6.32.13/include/linux/fs.h
---- linux-2.6.32.13/include/linux/fs.h	2010-04-29 17:49:38.529851956 -0400
-+++ linux-2.6.32.13/include/linux/fs.h	2010-05-15 13:21:17.938584561 -0400
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 509ca14..c8a703a 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
 @@ -90,6 +90,11 @@ struct inodes_stat_t {
  /* Expect random access pattern */
- #define FMODE_RANDOM		((__force fmode_t)4096)
+ #define FMODE_RANDOM		((__force fmode_t)0x1000)
  
 +/* Hack for grsec so as not to require read permission simply to execute
 + * a binary
 + */
-+#define FMODE_GREXEC		((__force fmode_t)8192)
++#define FMODE_GREXEC		((__force fmode_t)0x2000)
 +
  /*
   * The below are the various read and write types that we support. Some of
   * them include behavioral modifiers that send information down to the
-@@ -568,41 +573,41 @@ typedef int (*read_actor_t)(read_descrip
+@@ -572,41 +577,41 @@ typedef int (*read_actor_t)(read_descriptor_t *, struct page *,
  		unsigned long, unsigned long);
  
  struct address_space_operations {
@@ -44548,7 +45739,7 @@ diff -urNp linux-2.6.32.13/include/linux/fs.h linux-2.6.32.13/include/linux/fs.h
  };
  
  /*
-@@ -1030,19 +1035,19 @@ static inline int file_check_writeable(s
+@@ -1036,19 +1041,19 @@ static inline int file_check_writeable(struct file *filp)
  typedef struct files_struct *fl_owner_t;
  
  struct file_lock_operations {
@@ -44578,7 +45769,7 @@ diff -urNp linux-2.6.32.13/include/linux/fs.h linux-2.6.32.13/include/linux/fs.h
  };
  
  struct lock_manager {
-@@ -1439,7 +1444,7 @@ struct fiemap_extent_info {
+@@ -1441,7 +1446,7 @@ struct fiemap_extent_info {
  	unsigned int fi_flags;		/* Flags as passed from user */
  	unsigned int fi_extents_mapped;	/* Number of mapped extents */
  	unsigned int fi_extents_max;	/* Size of fiemap_extent array */
@@ -44587,17 +45778,15 @@ diff -urNp linux-2.6.32.13/include/linux/fs.h linux-2.6.32.13/include/linux/fs.h
  						 * array */
  };
  int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
-@@ -1556,30 +1561,30 @@ extern ssize_t vfs_writev(struct file *,
+@@ -1558,30 +1563,30 @@ extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
  		unsigned long, loff_t *);
  
  struct super_operations {
 -   	struct inode *(*alloc_inode)(struct super_block *sb);
 -	void (*destroy_inode)(struct inode *);
-+   	struct inode *(* const alloc_inode)(struct super_block *sb);
-+	void (* const destroy_inode)(struct inode *);
- 
+-
 -   	void (*dirty_inode) (struct inode *);
--	int (*write_inode) (struct inode *, int);
+-	int (*write_inode) (struct inode *, struct writeback_control *wbc);
 -	void (*drop_inode) (struct inode *);
 -	void (*delete_inode) (struct inode *);
 -	void (*put_super) (struct super_block *);
@@ -44609,8 +45798,14 @@ diff -urNp linux-2.6.32.13/include/linux/fs.h linux-2.6.32.13/include/linux/fs.h
 -	int (*remount_fs) (struct super_block *, int *, char *);
 -	void (*clear_inode) (struct inode *);
 -	void (*umount_begin) (struct super_block *);
+-
+-	int (*show_options)(struct seq_file *, struct vfsmount *);
+-	int (*show_stats)(struct seq_file *, struct vfsmount *);
++   	struct inode *(* const alloc_inode)(struct super_block *sb);
++	void (* const destroy_inode)(struct inode *);
++
 +   	void (* const dirty_inode) (struct inode *);
-+	int (* const write_inode) (struct inode *, int);
++	int (* const write_inode) (struct inode *, struct writeback_control *wbc);
 +	void (* const drop_inode) (struct inode *);
 +	void (* const delete_inode) (struct inode *);
 +	void (* const put_super) (struct super_block *);
@@ -44622,9 +45817,7 @@ diff -urNp linux-2.6.32.13/include/linux/fs.h linux-2.6.32.13/include/linux/fs.h
 +	int (* const remount_fs) (struct super_block *, int *, char *);
 +	void (* const clear_inode) (struct inode *);
 +	void (* const umount_begin) (struct super_block *);
- 
--	int (*show_options)(struct seq_file *, struct vfsmount *);
--	int (*show_stats)(struct seq_file *, struct vfsmount *);
++
 +	int (* const show_options)(struct seq_file *, struct vfsmount *);
 +	int (* const show_stats)(struct seq_file *, struct vfsmount *);
  #ifdef CONFIG_QUOTA
@@ -44638,9 +45831,10 @@ diff -urNp linux-2.6.32.13/include/linux/fs.h linux-2.6.32.13/include/linux/fs.h
  };
  
  /*
-diff -urNp linux-2.6.32.13/include/linux/fs_struct.h linux-2.6.32.13/include/linux/fs_struct.h
---- linux-2.6.32.13/include/linux/fs_struct.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/fs_struct.h	2010-05-15 13:21:17.938584561 -0400
+diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
+index 78a05bf..2a7d3e1 100644
+--- a/include/linux/fs_struct.h
++++ b/include/linux/fs_struct.h
 @@ -4,7 +4,7 @@
  #include <linux/path.h>
  
@@ -44650,10 +45844,11 @@ diff -urNp linux-2.6.32.13/include/linux/fs_struct.h linux-2.6.32.13/include/lin
  	rwlock_t lock;
  	int umask;
  	int in_exec;
-diff -urNp linux-2.6.32.13/include/linux/genhd.h linux-2.6.32.13/include/linux/genhd.h
---- linux-2.6.32.13/include/linux/genhd.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/genhd.h	2010-05-15 13:21:17.938584561 -0400
-@@ -161,7 +161,7 @@ struct gendisk {
+diff --git a/include/linux/genhd.h b/include/linux/genhd.h
+index 5f2f4c4..c7ac23b 100644
+--- a/include/linux/genhd.h
++++ b/include/linux/genhd.h
+@@ -162,7 +162,7 @@ struct gendisk {
  
  	struct timer_rand_state *random;
  
@@ -44662,10 +45857,12 @@ diff -urNp linux-2.6.32.13/include/linux/genhd.h linux-2.6.32.13/include/linux/g
  	struct work_struct async_notify;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
  	struct blk_integrity *integrity;
-diff -urNp linux-2.6.32.13/include/linux/gracl.h linux-2.6.32.13/include/linux/gracl.h
---- linux-2.6.32.13/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/include/linux/gracl.h	2010-05-15 13:21:17.938584561 -0400
-@@ -0,0 +1,309 @@
+diff --git a/include/linux/gracl.h b/include/linux/gracl.h
+new file mode 100644
+index 0000000..84c3e74
+--- /dev/null
++++ b/include/linux/gracl.h
+@@ -0,0 +1,310 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
 +
@@ -44677,8 +45874,8 @@ diff -urNp linux-2.6.32.13/include/linux/gracl.h linux-2.6.32.13/include/linux/g
 +
 +/* Major status information */
 +
-+#define GR_VERSION  "grsecurity 2.1.14"
-+#define GRSECURITY_VERSION 0x2114
++#define GR_VERSION  "grsecurity 2.2.0"
++#define GRSECURITY_VERSION 0x2200
 +
 +enum {
 +	GR_SHUTDOWN = 0,
@@ -44769,6 +45966,7 @@ diff -urNp linux-2.6.32.13/include/linux/gracl.h linux-2.6.32.13/include/linux/g
 +	__u32 mode;
 +	kernel_cap_t cap_mask;
 +	kernel_cap_t cap_lower;
++	kernel_cap_t cap_invert_audit;
 +
 +	struct rlimit res[GR_NLIMITS];
 +	__u32 resmask;
@@ -44975,9 +46173,11 @@ diff -urNp linux-2.6.32.13/include/linux/gracl.h linux-2.6.32.13/include/linux/g
 +
 +#endif
 +
-diff -urNp linux-2.6.32.13/include/linux/gralloc.h linux-2.6.32.13/include/linux/gralloc.h
---- linux-2.6.32.13/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/include/linux/gralloc.h	2010-05-15 13:21:17.938584561 -0400
+diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
+new file mode 100644
+index 0000000..323ecf2
+--- /dev/null
++++ b/include/linux/gralloc.h
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -44988,9 +46188,11 @@ diff -urNp linux-2.6.32.13/include/linux/gralloc.h linux-2.6.32.13/include/linux
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff -urNp linux-2.6.32.13/include/linux/grdefs.h linux-2.6.32.13/include/linux/grdefs.h
---- linux-2.6.32.13/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/include/linux/grdefs.h	2010-05-15 13:21:17.938584561 -0400
+diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
+new file mode 100644
+index 0000000..4f6c247
+--- /dev/null
++++ b/include/linux/grdefs.h
 @@ -0,0 +1,136 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
@@ -45128,10 +46330,12 @@ diff -urNp linux-2.6.32.13/include/linux/grdefs.h linux-2.6.32.13/include/linux/
 +};
 +
 +#endif
-diff -urNp linux-2.6.32.13/include/linux/grinternal.h linux-2.6.32.13/include/linux/grinternal.h
---- linux-2.6.32.13/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/include/linux/grinternal.h	2010-05-15 13:21:17.938584561 -0400
-@@ -0,0 +1,215 @@
+diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
+new file mode 100644
+index 0000000..851588d
+--- /dev/null
++++ b/include/linux/grinternal.h
+@@ -0,0 +1,214 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
 +
@@ -45196,7 +46400,7 @@ diff -urNp linux-2.6.32.13/include/linux/grinternal.h linux-2.6.32.13/include/li
 +extern int grsec_enable_tpe;
 +extern int grsec_tpe_gid;
 +extern int grsec_enable_tpe_all;
-+extern int grsec_enable_sidcaps;
++extern int grsec_enable_tpe_invert;
 +extern int grsec_enable_socket_all;
 +extern int grsec_socket_all_gid;
 +extern int grsec_enable_socket_client;
@@ -45206,6 +46410,7 @@ diff -urNp linux-2.6.32.13/include/linux/grinternal.h linux-2.6.32.13/include/li
 +extern int grsec_audit_gid;
 +extern int grsec_enable_group;
 +extern int grsec_enable_audit_textrel;
++extern int grsec_enable_log_rwxmaps;
 +extern int grsec_enable_mount;
 +extern int grsec_enable_chdir;
 +extern int grsec_resource_logging;
@@ -45221,37 +46426,33 @@ diff -urNp linux-2.6.32.13/include/linux/grinternal.h linux-2.6.32.13/include/li
 +
 +extern rwlock_t grsec_exec_file_lock;
 +
-+#define gr_task_fullpath(tsk) (tsk->exec_file ? \
-+			gr_to_filename2(tsk->exec_file->f_path.dentry, \
-+			tsk->exec_file->f_vfsmnt) : "/")
++#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
++			gr_to_filename2((tsk)->exec_file->f_path.dentry, \
++			(tsk)->exec_file->f_vfsmnt) : "/")
 +
-+#define gr_parent_task_fullpath(tsk) (tsk->parent->exec_file ? \
-+			gr_to_filename3(tsk->parent->exec_file->f_path.dentry, \
-+			tsk->parent->exec_file->f_vfsmnt) : "/")
++#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
++			gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
++			(tsk)->real_parent->exec_file->f_vfsmnt) : "/")
 +
-+#define gr_task_fullpath0(tsk) (tsk->exec_file ? \
-+			gr_to_filename(tsk->exec_file->f_path.dentry, \
-+			tsk->exec_file->f_vfsmnt) : "/")
++#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
++			gr_to_filename((tsk)->exec_file->f_path.dentry, \
++			(tsk)->exec_file->f_vfsmnt) : "/")
 +
-+#define gr_parent_task_fullpath0(tsk) (tsk->parent->exec_file ? \
-+			gr_to_filename1(tsk->parent->exec_file->f_path.dentry, \
-+			tsk->parent->exec_file->f_vfsmnt) : "/")
++#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
++			gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
++			(tsk)->real_parent->exec_file->f_vfsmnt) : "/")
 +
-+#define proc_is_chrooted(tsk_a)  ((tsk_a->pid > 1) && (tsk_a->fs != NULL) && \
-+			  ((init_task.fs->root.dentry != tsk_a->fs->root.dentry) && \
-+			   (tsk_a->nsproxy->mnt_ns->root->mnt_root != \
-+			    tsk_a->fs->root.dentry)))
++#define proc_is_chrooted(tsk_a)  ((tsk_a)->gr_is_chrooted)
 +
-+#define have_same_root(tsk_a,tsk_b) ((tsk_a->fs != NULL) && (tsk_b->fs != NULL) && \
-+			  (tsk_a->fs->root.dentry == tsk_b->fs->root.dentry))
++#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
 +
-+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), task->comm, \
-+		       task->pid, cred->uid, \
-+		       cred->euid, cred->gid, cred->egid, \
++#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
++		       (task)->pid, (cred)->uid, \
++		       (cred)->euid, (cred)->gid, (cred)->egid, \
 +		       gr_parent_task_fullpath(task), \
-+		       task->parent->comm, task->parent->pid, \
-+		       pcred->uid, pcred->euid, \
-+		       pcred->gid, pcred->egid
++		       (task)->real_parent->comm, (task)->real_parent->pid, \
++		       (pcred)->uid, (pcred)->euid, \
++		       (pcred)->gid, (pcred)->egid
 +
 +#define GR_CHROOT_CAPS {{ \
 +	CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
@@ -45306,7 +46507,8 @@ diff -urNp linux-2.6.32.13/include/linux/grinternal.h linux-2.6.32.13/include/li
 +	GR_SIG2,
 +	GR_CRASH1,
 +	GR_CRASH2,
-+	GR_PSACCT
++	GR_PSACCT,
++	GR_RWXMAP
 +};
 +
 +#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
@@ -45341,16 +46543,19 @@ diff -urNp linux-2.6.32.13/include/linux/grinternal.h linux-2.6.32.13/include/li
 +#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
 +#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
 +#define gr_log_procacct(audit, msg, task, num1, num2, num3, num4, num5, num6, num7, num8, num9) gr_log_varargs(audit, msg, GR_PSACCT, task, num1, num2, num3, num4, num5, num6, num7, num8, num9)
++#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
 +
 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
 +
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.32.13/include/linux/grmsg.h linux-2.6.32.13/include/linux/grmsg.h
---- linux-2.6.32.13/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/include/linux/grmsg.h	2010-05-15 13:21:17.938584561 -0400
-@@ -0,0 +1,107 @@
+diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
+new file mode 100644
+index 0000000..02d2f43
+--- /dev/null
++++ b/include/linux/grmsg.h
+@@ -0,0 +1,110 @@
 +#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"
 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
@@ -45426,7 +46631,7 @@ diff -urNp linux-2.6.32.13/include/linux/grmsg.h linux-2.6.32.13/include/linux/g
 +#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
 +#define GR_INVMODE_ACL_MSG "invalid mode %d by "
 +#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
-+#define GR_FAILFORK_MSG "failed fork with errno %d by "
++#define GR_FAILFORK_MSG "failed fork with errno %s by "
 +#define GR_NICE_CHROOT_MSG "denied priority change by "
 +#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
 +#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
@@ -45446,6 +46651,7 @@ diff -urNp linux-2.6.32.13/include/linux/grmsg.h linux-2.6.32.13/include/linux/g
 +#define GR_IP_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%pI4\t%u\t%u\t%u\t%u\t%pI4"
 +#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
 +#define GR_CAP_ACL_MSG "use of %s denied for "
++#define GR_CAP_ACL_MSG2 "use of %s permitted for "
 +#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
 +#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
 +#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
@@ -45454,14 +46660,18 @@ diff -urNp linux-2.6.32.13/include/linux/grmsg.h linux-2.6.32.13/include/linux/g
 +#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
 +#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
 +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
++#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
++#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
 +#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
 +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
 +#define GR_VM86_MSG "denied use of vm86 by "
 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
-diff -urNp linux-2.6.32.13/include/linux/grsecurity.h linux-2.6.32.13/include/linux/grsecurity.h
---- linux-2.6.32.13/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/include/linux/grsecurity.h	2010-05-15 13:21:17.942979526 -0400
-@@ -0,0 +1,199 @@
+diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
+new file mode 100644
+index 0000000..00698b2
+--- /dev/null
++++ b/include/linux/grsecurity.h
+@@ -0,0 +1,206 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
 +#include <linux/fs.h>
@@ -45497,6 +46707,7 @@ diff -urNp linux-2.6.32.13/include/linux/grsecurity.h linux-2.6.32.13/include/li
 +void gr_del_task_from_ip_table(struct task_struct *p);
 +
 +int gr_pid_is_chrooted(struct task_struct *p);
++int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
 +int gr_handle_chroot_nice(void);
 +int gr_handle_chroot_sysctl(const int op);
 +int gr_handle_chroot_setpriority(struct task_struct *p,
@@ -45524,7 +46735,8 @@ diff -urNp linux-2.6.32.13/include/linux/grsecurity.h linux-2.6.32.13/include/li
 +
 +int gr_tpe_allow(const struct file *file);
 +
-+int gr_random_pid(void);
++void gr_set_chroot_entries(struct task_struct *task, struct path *path);
++void gr_clear_chroot_entries(struct task_struct *task);
 +
 +void gr_log_forkfail(const int retval);
 +void gr_log_timechange(void);
@@ -45538,6 +46750,8 @@ diff -urNp linux-2.6.32.13/include/linux/grsecurity.h linux-2.6.32.13/include/li
 +void gr_log_unmount(const char *devname, const int retval);
 +void gr_log_mount(const char *from, const char *to, const int retval);
 +void gr_log_textrel(struct vm_area_struct *vma);
++void gr_log_rwxmmap(struct file *file);
++void gr_log_rwxmprotect(struct file *file);
 +
 +int gr_handle_follow_link(const struct inode *parent,
 +				 const struct inode *inode,
@@ -45561,6 +46775,7 @@ diff -urNp linux-2.6.32.13/include/linux/grsecurity.h linux-2.6.32.13/include/li
 +int gr_handle_signal(const struct task_struct *p, const int sig);
 +int gr_check_crash_uid(const uid_t uid);
 +int gr_check_protected_task(const struct task_struct *task);
++int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
 +int gr_acl_handle_mmap(const struct file *file,
 +			      const unsigned long prot);
 +int gr_acl_handle_mprotect(const struct file *file,
@@ -45649,6 +46864,7 @@ diff -urNp linux-2.6.32.13/include/linux/grsecurity.h linux-2.6.32.13/include/li
 +void gr_audit_ptrace(struct task_struct *task);
 +
 +#ifdef CONFIG_GRKERNSEC
++void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
 +void gr_log_nonroot_mod_load(const char *modname);
 +void gr_handle_vm86(void);
 +void gr_handle_mem_write(void);
@@ -45658,25 +46874,40 @@ diff -urNp linux-2.6.32.13/include/linux/grsecurity.h linux-2.6.32.13/include/li
 +			      struct vm_area_struct *vma);
 +
 +extern int grsec_enable_dmesg;
++extern int grsec_disable_privio;
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.32.13/include/linux/hdpu_features.h linux-2.6.32.13/include/linux/hdpu_features.h
---- linux-2.6.32.13/include/linux/hdpu_features.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/hdpu_features.h	2010-05-15 13:21:17.942979526 -0400
-@@ -3,7 +3,7 @@
- struct cpustate_t {
- 	spinlock_t lock;
- 	int excl;
--        int open_count;
-+	atomic_t open_count;
- 	unsigned char cached_val;
- 	int inited;
- 	unsigned long *set_addr;
-diff -urNp linux-2.6.32.13/include/linux/highmem.h linux-2.6.32.13/include/linux/highmem.h
---- linux-2.6.32.13/include/linux/highmem.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/highmem.h	2010-05-15 13:21:17.942979526 -0400
-@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
+diff --git a/include/linux/grsock.h b/include/linux/grsock.h
+new file mode 100644
+index 0000000..e7ffaaf
+--- /dev/null
++++ b/include/linux/grsock.h
+@@ -0,0 +1,19 @@
++#ifndef __GRSOCK_H
++#define __GRSOCK_H
++
++extern void gr_attach_curr_ip(const struct sock *sk);
++extern int gr_handle_sock_all(const int family, const int type,
++			      const int protocol);
++extern int gr_handle_sock_server(const struct sockaddr *sck);
++extern int gr_handle_sock_server_other(const struct sock *sck);
++extern int gr_handle_sock_client(const struct sockaddr *sck);
++extern int gr_search_connect(struct socket * sock,
++			     struct sockaddr_in * addr);
++extern int gr_search_bind(struct socket * sock,
++			  struct sockaddr_in * addr);
++extern int gr_search_listen(struct socket * sock);
++extern int gr_search_accept(struct socket * sock);
++extern int gr_search_socket(const int domain, const int type,
++			    const int protocol);
++
++#endif
+diff --git a/include/linux/highmem.h b/include/linux/highmem.h
+index caafd05..975e676 100644
+--- a/include/linux/highmem.h
++++ b/include/linux/highmem.h
+@@ -143,6 +143,18 @@ static inline void clear_highpage(struct page *page)
  	kunmap_atomic(kaddr, KM_USER0);
  }
  
@@ -45695,35 +46926,11 @@ diff -urNp linux-2.6.32.13/include/linux/highmem.h linux-2.6.32.13/include/linux
  static inline void zero_user_segments(struct page *page,
  	unsigned start1, unsigned end1,
  	unsigned start2, unsigned end2)
-diff -urNp linux-2.6.32.13/include/linux/init_task.h linux-2.6.32.13/include/linux/init_task.h
---- linux-2.6.32.13/include/linux/init_task.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/init_task.h	2010-05-15 13:21:17.942979526 -0400
-@@ -115,6 +115,13 @@ extern struct cred init_cred;
- # define INIT_PERF_EVENTS(tsk)
- #endif
- 
-+#ifdef CONFIG_GRKERNSEC
-+# define INIT_GR_FS_LOCK					\
-+	.gr_fs_lock = __RW_LOCK_UNLOCKED(gr_fs_lock),
-+#else
-+# define INIT_GR_FS_LOCK
-+#endif
-+
- /*
-  *  INIT_TASK is used to set up the first task table, touch at
-  * your own risk!. Base=0, limit=0x1fffff (=2MB)
-@@ -184,6 +191,7 @@ extern struct cred init_cred;
- 	INIT_FTRACE_GRAPH						\
- 	INIT_TRACE_RECURSION						\
- 	INIT_TASK_RCU_PREEMPT(tsk)					\
-+	INIT_GR_FS_LOCK							\
- }
- 
- 
-diff -urNp linux-2.6.32.13/include/linux/interrupt.h linux-2.6.32.13/include/linux/interrupt.h
---- linux-2.6.32.13/include/linux/interrupt.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/interrupt.h	2010-05-15 13:21:17.942979526 -0400
-@@ -357,7 +357,7 @@ enum
+diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
+index a0384a4..80fbdab 100644
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -392,7 +392,7 @@ enum
  /* map softirq index to softirq name. update 'softirq_to_name' in
   * kernel/softirq.c when adding a new softirq.
   */
@@ -45732,7 +46939,7 @@ diff -urNp linux-2.6.32.13/include/linux/interrupt.h linux-2.6.32.13/include/lin
  
  /* softirq mask and active fields moved to irq_cpustat_t in
   * asm/hardirq.h to get better cache usage.  KAO
-@@ -365,12 +365,12 @@ extern char *softirq_to_name[NR_SOFTIRQS
+@@ -400,12 +400,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
  
  struct softirq_action
  {
@@ -45747,10 +46954,11 @@ diff -urNp linux-2.6.32.13/include/linux/interrupt.h linux-2.6.32.13/include/lin
  extern void softirq_init(void);
  #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
  extern void raise_softirq_irqoff(unsigned int nr);
-diff -urNp linux-2.6.32.13/include/linux/jbd2.h linux-2.6.32.13/include/linux/jbd2.h
---- linux-2.6.32.13/include/linux/jbd2.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/jbd2.h	2010-05-15 13:21:17.942979526 -0400
-@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
+diff --git a/include/linux/jbd.h b/include/linux/jbd.h
+index e069650..b7847b1 100644
+--- a/include/linux/jbd.h
++++ b/include/linux/jbd.h
+@@ -67,7 +67,7 @@ extern u8 journal_enable_debug;
  		}							\
  	} while (0)
  #else
@@ -45758,11 +46966,12 @@ diff -urNp linux-2.6.32.13/include/linux/jbd2.h linux-2.6.32.13/include/linux/jb
 +#define jbd_debug(f, a...)	do {} while (0)
  #endif
  
- static inline void *jbd2_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.32.13/include/linux/jbd.h linux-2.6.32.13/include/linux/jbd.h
---- linux-2.6.32.13/include/linux/jbd.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/jbd.h	2010-05-15 13:21:17.942979526 -0400
-@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
+ static inline void *jbd_alloc(size_t size, gfp_t flags)
+diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
+index adf832d..98a5a39 100644
+--- a/include/linux/jbd2.h
++++ b/include/linux/jbd2.h
+@@ -67,7 +67,7 @@ extern u8 jbd2_journal_enable_debug;
  		}							\
  	} while (0)
  #else
@@ -45770,10 +46979,11 @@ diff -urNp linux-2.6.32.13/include/linux/jbd.h linux-2.6.32.13/include/linux/jbd
 +#define jbd_debug(f, a...)	do {} while (0)
  #endif
  
- static inline void *jbd_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.32.13/include/linux/kallsyms.h linux-2.6.32.13/include/linux/kallsyms.h
---- linux-2.6.32.13/include/linux/kallsyms.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/kallsyms.h	2010-05-15 13:21:17.942979526 -0400
+ extern void *jbd2_alloc(size_t size, gfp_t flags);
+diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
+index d8e9b3d..1ef6a73 100644
+--- a/include/linux/kallsyms.h
++++ b/include/linux/kallsyms.h
 @@ -15,7 +15,8 @@
  
  struct module;
@@ -45784,7 +46994,7 @@ diff -urNp linux-2.6.32.13/include/linux/kallsyms.h linux-2.6.32.13/include/linu
  /* Lookup the address for a symbol. Returns 0 if not found. */
  unsigned long kallsyms_lookup_name(const char *name);
  
-@@ -92,6 +93,9 @@ static inline int lookup_symbol_attrs(un
+@@ -92,6 +93,9 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
  /* Stupid that this does nothing, but I didn't create this mess. */
  #define __print_symbol(fmt, addr)
  #endif /*CONFIG_KALLSYMS*/
@@ -45794,10 +47004,11 @@ diff -urNp linux-2.6.32.13/include/linux/kallsyms.h linux-2.6.32.13/include/linu
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.32.13/include/linux/kgdb.h linux-2.6.32.13/include/linux/kgdb.h
---- linux-2.6.32.13/include/linux/kgdb.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/kgdb.h	2010-05-15 13:21:17.942979526 -0400
-@@ -251,20 +251,20 @@ struct kgdb_arch {
+diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
+index 9340f34..1da6760 100644
+--- a/include/linux/kgdb.h
++++ b/include/linux/kgdb.h
+@@ -263,22 +263,22 @@ struct kgdb_arch {
   */
  struct kgdb_io {
  	const char		*name;
@@ -45813,6 +47024,7 @@ diff -urNp linux-2.6.32.13/include/linux/kgdb.h linux-2.6.32.13/include/linux/kg
 +	int			(* const init) (void);
 +	void			(* const pre_exception) (void);
 +	void			(* const post_exception) (void);
+ 	int			is_console;
  };
  
 -extern struct kgdb_arch		arch_kgdb_ops;
@@ -45822,75 +47034,27 @@ diff -urNp linux-2.6.32.13/include/linux/kgdb.h linux-2.6.32.13/include/linux/kg
  
 -extern int kgdb_register_io_module(struct kgdb_io *local_kgdb_io_ops);
 -extern void kgdb_unregister_io_module(struct kgdb_io *local_kgdb_io_ops);
+-extern struct kgdb_io *dbg_io_ops;
 +extern int kgdb_register_io_module(const struct kgdb_io *local_kgdb_io_ops);
 +extern void kgdb_unregister_io_module(const struct kgdb_io *local_kgdb_io_ops);
++extern const struct kgdb_io *dbg_io_ops;
  
  extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
  extern int kgdb_mem2hex(char *mem, char *buf, int count);
-diff -urNp linux-2.6.32.13/include/linux/kobject.h linux-2.6.32.13/include/linux/kobject.h
---- linux-2.6.32.13/include/linux/kobject.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/kobject.h	2010-05-15 13:21:17.942979526 -0400
-@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
- 
- struct kobj_type {
- 	void (*release)(struct kobject *kobj);
--	struct sysfs_ops *sysfs_ops;
-+	const struct sysfs_ops *sysfs_ops;
- 	struct attribute **default_attrs;
- };
- 
-@@ -118,9 +118,9 @@ struct kobj_uevent_env {
- };
- 
- struct kset_uevent_ops {
--	int (*filter)(struct kset *kset, struct kobject *kobj);
--	const char *(*name)(struct kset *kset, struct kobject *kobj);
--	int (*uevent)(struct kset *kset, struct kobject *kobj,
-+	int (* const filter)(struct kset *kset, struct kobject *kobj);
-+	const char *(* const name)(struct kset *kset, struct kobject *kobj);
-+	int (* const uevent)(struct kset *kset, struct kobject *kobj,
- 		      struct kobj_uevent_env *env);
- };
- 
-@@ -132,7 +132,7 @@ struct kobj_attribute {
- 			 const char *buf, size_t count);
- };
- 
--extern struct sysfs_ops kobj_sysfs_ops;
-+extern const struct sysfs_ops kobj_sysfs_ops;
- 
- /**
-  * struct kset - a set of kobjects of a specific type, belonging to a specific subsystem.
-@@ -155,14 +155,14 @@ struct kset {
- 	struct list_head list;
- 	spinlock_t list_lock;
- 	struct kobject kobj;
--	struct kset_uevent_ops *uevent_ops;
-+	const struct kset_uevent_ops *uevent_ops;
- };
- 
- extern void kset_init(struct kset *kset);
- extern int __must_check kset_register(struct kset *kset);
- extern void kset_unregister(struct kset *kset);
- extern struct kset * __must_check kset_create_and_add(const char *name,
--						struct kset_uevent_ops *u,
-+						const struct kset_uevent_ops *u,
- 						struct kobject *parent_kobj);
- 
- static inline struct kset *to_kset(struct kobject *kobj)
-diff -urNp linux-2.6.32.13/include/linux/kvm_host.h linux-2.6.32.13/include/linux/kvm_host.h
---- linux-2.6.32.13/include/linux/kvm_host.h	2010-04-29 17:49:38.529851956 -0400
-+++ linux-2.6.32.13/include/linux/kvm_host.h	2010-05-15 13:21:17.942979526 -0400
-@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
+diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
+index f24d8fc..fd92c2b 100644
+--- a/include/linux/kvm_host.h
++++ b/include/linux/kvm_host.h
+@@ -244,7 +244,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
  void vcpu_load(struct kvm_vcpu *vcpu);
  void vcpu_put(struct kvm_vcpu *vcpu);
  
--int kvm_init(void *opaque, unsigned int vcpu_size,
-+int kvm_init(const void *opaque, unsigned int vcpu_size,
+-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
++int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
  		  struct module *module);
  void kvm_exit(void);
  
-@@ -316,7 +316,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
+@@ -368,7 +368,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
  					struct kvm_guest_debug *dbg);
  int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
  
@@ -45899,9 +47063,10 @@ diff -urNp linux-2.6.32.13/include/linux/kvm_host.h linux-2.6.32.13/include/linu
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.32.13/include/linux/libata.h linux-2.6.32.13/include/linux/libata.h
---- linux-2.6.32.13/include/linux/libata.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/libata.h	2010-05-15 13:21:17.942979526 -0400
+diff --git a/include/linux/libata.h b/include/linux/libata.h
+index 8a9b4cf..d7b1907 100644
+--- a/include/linux/libata.h
++++ b/include/linux/libata.h
 @@ -64,11 +64,11 @@
  #ifdef ATA_VERBOSE_DEBUG
  #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -45931,7 +47096,7 @@ diff -urNp linux-2.6.32.13/include/linux/libata.h linux-2.6.32.13/include/linux/
  	unsigned long		flags;
  #ifdef CONFIG_ATA_ACPI
  	acpi_handle		acpi_handle;
-@@ -709,7 +709,7 @@ struct ata_link {
+@@ -710,7 +710,7 @@ struct ata_link {
  
  struct ata_port {
  	struct Scsi_Host	*scsi_host; /* our co-allocated scsi host */
@@ -45940,7 +47105,7 @@ diff -urNp linux-2.6.32.13/include/linux/libata.h linux-2.6.32.13/include/linux/
  	spinlock_t		*lock;
  	/* Flags owned by the EH context. Only EH should touch these once the
  	   port is active */
-@@ -891,7 +891,7 @@ struct ata_port_info {
+@@ -895,7 +895,7 @@ struct ata_port_info {
  	unsigned long		pio_mask;
  	unsigned long		mwdma_mask;
  	unsigned long		udma_mask;
@@ -45949,7 +47114,7 @@ diff -urNp linux-2.6.32.13/include/linux/libata.h linux-2.6.32.13/include/linux/
  	void 			*private_data;
  };
  
-@@ -915,7 +915,7 @@ extern const unsigned long sata_deb_timi
+@@ -919,7 +919,7 @@ extern const unsigned long sata_deb_timing_normal[];
  extern const unsigned long sata_deb_timing_hotplug[];
  extern const unsigned long sata_deb_timing_long[];
  
@@ -45958,7 +47123,7 @@ diff -urNp linux-2.6.32.13/include/linux/libata.h linux-2.6.32.13/include/linux/
  extern const struct ata_port_info ata_dummy_port_info;
  
  static inline const unsigned long *
-@@ -961,7 +961,7 @@ extern int ata_host_activate(struct ata_
+@@ -963,7 +963,7 @@ extern int ata_host_activate(struct ata_host *host, int irq,
  			     struct scsi_host_template *sht);
  extern void ata_host_detach(struct ata_host *host);
  extern void ata_host_init(struct ata_host *, struct device *,
@@ -45967,9 +47132,10 @@ diff -urNp linux-2.6.32.13/include/linux/libata.h linux-2.6.32.13/include/linux/
  extern int ata_scsi_detect(struct scsi_host_template *sht);
  extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
  extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
-diff -urNp linux-2.6.32.13/include/linux/lockd/bind.h linux-2.6.32.13/include/linux/lockd/bind.h
---- linux-2.6.32.13/include/linux/lockd/bind.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/lockd/bind.h	2010-05-15 13:21:17.942979526 -0400
+diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
+index fbc48f8..0886e57 100644
+--- a/include/linux/lockd/bind.h
++++ b/include/linux/lockd/bind.h
 @@ -23,13 +23,13 @@ struct svc_rqst;
   * This is the set of functions for lockd->nfsd communication
   */
@@ -45987,21 +47153,26 @@ diff -urNp linux-2.6.32.13/include/linux/lockd/bind.h linux-2.6.32.13/include/li
  
  /*
   * Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h
---- linux-2.6.32.13/include/linux/mm.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/mm.h	2010-05-15 13:21:17.946623351 -0400
-@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void 
- #define VM_PFN_AT_MMAP	0x40000000	/* PFNMAP vma that is fully mapped at mmap time */
- #define VM_MERGEABLE	0x80000000	/* KSM may merge identical pages */
+diff --git a/include/linux/mm.h b/include/linux/mm.h
+index a724d89..b557139 100644
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -107,7 +107,14 @@ extern unsigned int kobjsize(const void *objp);
  
-+#ifdef CONFIG_PAX_PAGEEXEC
-+#define VM_PAGEEXEC	0x80000000	/* vma->vm_page_prot needs special handling */
+ #define VM_CAN_NONLINEAR 0x08000000	/* Has ->fault & does nonlinear pages */
+ #define VM_MIXEDMAP	0x10000000	/* Can contain "struct page" and pure PFN pages */
++
++#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
++#define VM_SAO		0x00000000	/* Strong Access Ordering (powerpc) */
++#define VM_PAGEEXEC	0x20000000	/* vma->vm_page_prot needs special handling */
++#else
+ #define VM_SAO		0x20000000	/* Strong Access Ordering (powerpc) */
 +#endif
 +
- #ifndef VM_STACK_DEFAULT_FLAGS		/* arch can override this */
- #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS
- #endif
-@@ -880,6 +884,8 @@ struct shrinker {
+ #define VM_PFN_AT_MMAP	0x40000000	/* PFNMAP vma that is fully mapped at mmap time */
+ #define VM_MERGEABLE	0x80000000	/* KSM may merge identical pages */
+ 
+@@ -1020,6 +1027,8 @@ struct shrinker {
  extern void register_shrinker(struct shrinker *);
  extern void unregister_shrinker(struct shrinker *);
  
@@ -46010,7 +47181,7 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h
  int vma_wants_writenotify(struct vm_area_struct *vma);
  
  extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl);
-@@ -1152,6 +1158,7 @@ out:
+@@ -1296,6 +1305,7 @@ out:
  }
  
  extern int do_munmap(struct mm_struct *, unsigned long, size_t);
@@ -46018,18 +47189,18 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h
  
  extern unsigned long do_brk(unsigned long, unsigned long);
  
-@@ -1206,6 +1213,10 @@ extern struct vm_area_struct * find_vma(
+@@ -1352,6 +1362,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
  extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
  					     struct vm_area_struct **pprev);
  
 +extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
-+extern void pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
++extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
 +extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
 +
  /* 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)
-@@ -1222,7 +1233,6 @@ static inline unsigned long vma_pages(st
+@@ -1368,7 +1382,6 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
  	return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
  }
  
@@ -46037,25 +47208,29 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/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);
-@@ -1320,7 +1330,13 @@ extern void memory_failure(unsigned long
- extern int __memory_failure(unsigned long pfn, int trapno, int ref);
+@@ -1475,10 +1488,16 @@ extern int unpoison_memory(unsigned long pfn);
  extern int sysctl_memory_failure_early_kill;
  extern int sysctl_memory_failure_recovery;
+ extern void shake_page(struct page *p, int access);
 -extern atomic_long_t mce_bad_pages;
 +extern atomic_long_unchecked_t mce_bad_pages;
-+
+ extern int soft_offline_page(struct page *page, int flags);
+ 
+ extern void dump_page(struct page *page);
+ 
 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
 +extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
 +#else
 +static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
 +#endif
- 
++
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.32.13/include/linux/mm_types.h linux-2.6.32.13/include/linux/mm_types.h
---- linux-2.6.32.13/include/linux/mm_types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/mm_types.h	2010-05-15 13:21:17.946623351 -0400
-@@ -186,6 +186,8 @@ struct vm_area_struct {
+diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
+index ee7e258..b5f53b6 100644
+--- a/include/linux/mm_types.h
++++ b/include/linux/mm_types.h
+@@ -183,6 +183,8 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
  	struct mempolicy *vm_policy;	/* NUMA policy for the VMA */
  #endif
@@ -46064,7 +47239,7 @@ diff -urNp linux-2.6.32.13/include/linux/mm_types.h linux-2.6.32.13/include/linu
  };
  
  struct core_thread {
-@@ -287,6 +289,24 @@ struct mm_struct {
+@@ -310,6 +312,24 @@ struct mm_struct {
  #ifdef CONFIG_MMU_NOTIFIER
  	struct mmu_notifier_mm *mmu_notifier_mm;
  #endif
@@ -46089,10 +47264,11 @@ diff -urNp linux-2.6.32.13/include/linux/mm_types.h linux-2.6.32.13/include/linu
  };
  
  /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.32.13/include/linux/mmu_notifier.h linux-2.6.32.13/include/linux/mmu_notifier.h
---- linux-2.6.32.13/include/linux/mmu_notifier.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/mmu_notifier.h	2010-05-15 13:21:17.946623351 -0400
-@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
+diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
+index 4e02ee2..afb159e 100644
+--- a/include/linux/mmu_notifier.h
++++ b/include/linux/mmu_notifier.h
+@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
   */
  #define ptep_clear_flush_notify(__vma, __address, __ptep)		\
  ({									\
@@ -46108,9 +47284,23 @@ diff -urNp linux-2.6.32.13/include/linux/mmu_notifier.h linux-2.6.32.13/include/
  })
  
  #define ptep_clear_flush_young_notify(__vma, __address, __ptep)		\
-diff -urNp linux-2.6.32.13/include/linux/mod_devicetable.h linux-2.6.32.13/include/linux/mod_devicetable.h
---- linux-2.6.32.13/include/linux/mod_devicetable.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/mod_devicetable.h	2010-05-15 13:21:17.946623351 -0400
+diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
+index 8b2db3d..1f790c3 100644
+--- a/include/linux/mmzone.h
++++ b/include/linux/mmzone.h
+@@ -352,7 +352,7 @@ struct zone {
+ 	unsigned long		flags;		   /* zone flags, see below */
+ 
+ 	/* Zone statistics */
+-	atomic_long_t		vm_stat[NR_VM_ZONE_STAT_ITEMS];
++	atomic_long_unchecked_t		vm_stat[NR_VM_ZONE_STAT_ITEMS];
+ 
+ 	/*
+ 	 * prev_priority holds the scanning priority for this zone.  It is
+diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
+index 48c007d..01960ea 100644
+--- a/include/linux/mod_devicetable.h
++++ b/include/linux/mod_devicetable.h
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -46129,10 +47319,11 @@ diff -urNp linux-2.6.32.13/include/linux/mod_devicetable.h linux-2.6.32.13/inclu
  
  struct hid_device_id {
  	__u16 bus;
-diff -urNp linux-2.6.32.13/include/linux/module.h linux-2.6.32.13/include/linux/module.h
---- linux-2.6.32.13/include/linux/module.h	2010-04-29 17:49:38.529851956 -0400
-+++ linux-2.6.32.13/include/linux/module.h	2010-05-15 13:21:17.946623351 -0400
-@@ -287,16 +287,16 @@ struct module
+diff --git a/include/linux/module.h b/include/linux/module.h
+index 8a6b9fd..80e9b07 100644
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -297,16 +297,16 @@ struct module
  	int (*init)(void);
  
  	/* If this is non-NULL, vfree after init() returns */
@@ -46153,8 +47344,8 @@ diff -urNp linux-2.6.32.13/include/linux/module.h linux-2.6.32.13/include/linux/
  
  	/* Arch-specific module values */
  	struct mod_arch_specific arch;
-@@ -393,16 +393,46 @@ struct module *__module_address(unsigned
- bool is_module_address(unsigned long addr);
+@@ -408,16 +408,46 @@ bool is_module_address(unsigned long addr);
+ bool is_module_percpu_address(unsigned long addr);
  bool is_module_text_address(unsigned long addr);
  
 +static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
@@ -46204,10 +47395,11 @@ diff -urNp linux-2.6.32.13/include/linux/module.h linux-2.6.32.13/include/linux/
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.32.13/include/linux/moduleloader.h linux-2.6.32.13/include/linux/moduleloader.h
---- linux-2.6.32.13/include/linux/moduleloader.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/moduleloader.h	2010-05-15 13:21:17.946623351 -0400
-@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
+diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
+index c1f40c2..682ca53 100644
+--- a/include/linux/moduleloader.h
++++ b/include/linux/moduleloader.h
+@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
     sections.  Returns NULL on failure. */
  void *module_alloc(unsigned long size);
  
@@ -46229,9 +47421,32 @@ diff -urNp linux-2.6.32.13/include/linux/moduleloader.h linux-2.6.32.13/include/
  /* Apply the given relocation to the (simplified) ELF.  Return -error
     or 0. */
  int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-2.6.32.13/include/linux/namei.h linux-2.6.32.13/include/linux/namei.h
---- linux-2.6.32.13/include/linux/namei.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/namei.h	2010-05-15 13:21:17.946623351 -0400
+diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
+index 82a9124..8a5f622 100644
+--- a/include/linux/moduleparam.h
++++ b/include/linux/moduleparam.h
+@@ -132,7 +132,7 @@ struct kparam_array
+ 
+ /* Actually copy string: maxlen param is usually sizeof(string). */
+ #define module_param_string(name, string, len, perm)			\
+-	static const struct kparam_string __param_string_##name		\
++	static const struct kparam_string __param_string_##name __used	\
+ 		= { len, string };					\
+ 	__module_param_call(MODULE_PARAM_PREFIX, name,			\
+ 			    param_set_copystring, param_get_string,	\
+@@ -211,7 +211,7 @@ extern int param_get_invbool(char *buffer, struct kernel_param *kp);
+ 
+ /* Comma-separated array: *nump is set to number they actually specified. */
+ #define module_param_array_named(name, array, type, nump, perm)		\
+-	static const struct kparam_array __param_arr_##name		\
++	static const struct kparam_array __param_arr_##name __used	\
+ 	= { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\
+ 	    sizeof(array[0]), array };					\
+ 	__module_param_call(MODULE_PARAM_PREFIX, name,			\
+diff --git a/include/linux/namei.h b/include/linux/namei.h
+index 05b441d..9f2336a 100644
+--- a/include/linux/namei.h
++++ b/include/linux/namei.h
 @@ -22,7 +22,7 @@ struct nameidata {
  	unsigned int	flags;
  	int		last_type;
@@ -46241,7 +47456,7 @@ diff -urNp linux-2.6.32.13/include/linux/namei.h linux-2.6.32.13/include/linux/n
  
  	/* Intent data */
  	union {
-@@ -84,12 +84,12 @@ extern int follow_up(struct path *);
+@@ -81,12 +81,12 @@ extern int follow_up(struct path *);
  extern struct dentry *lock_rename(struct dentry *, struct dentry *);
  extern void unlock_rename(struct dentry *, struct dentry *);
  
@@ -46256,29 +47471,26 @@ diff -urNp linux-2.6.32.13/include/linux/namei.h linux-2.6.32.13/include/linux/n
  {
  	return nd->saved_names[nd->depth];
  }
-diff -urNp linux-2.6.32.13/include/linux/nodemask.h linux-2.6.32.13/include/linux/nodemask.h
---- linux-2.6.32.13/include/linux/nodemask.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/nodemask.h	2010-05-15 13:21:17.946623351 -0400
-@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
- 
- #define any_online_node(mask)			\
- ({						\
--	int node;				\
--	for_each_node_mask(node, (mask))	\
--		if (node_online(node))		\
-+	int __node;				\
-+	for_each_node_mask(__node, (mask))	\
-+		if (node_online(__node))	\
- 			break;			\
--	node;					\
-+	__node;					\
- })
- 
- #define num_online_nodes()	num_node_state(N_ONLINE)
-diff -urNp linux-2.6.32.13/include/linux/oprofile.h linux-2.6.32.13/include/linux/oprofile.h
---- linux-2.6.32.13/include/linux/oprofile.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/oprofile.h	2010-05-15 13:21:17.946623351 -0400
-@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
+diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
+new file mode 100644
+index 0000000..33f4af8
+--- /dev/null
++++ b/include/linux/netfilter/xt_gradm.h
+@@ -0,0 +1,9 @@
++#ifndef _LINUX_NETFILTER_XT_GRADM_H
++#define _LINUX_NETFILTER_XT_GRADM_H 1
++
++struct xt_gradm_mtinfo {
++	__u16 flags;
++	__u16 invflags;
++};
++
++#endif
+diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
+index 5171639..7cf4235 100644
+--- a/include/linux/oprofile.h
++++ b/include/linux/oprofile.h
+@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
  int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
  	char const * name, ulong * val);
   
@@ -46290,13 +47502,14 @@ diff -urNp linux-2.6.32.13/include/linux/oprofile.h linux-2.6.32.13/include/linu
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-2.6.32.13/include/linux/pipe_fs_i.h linux-2.6.32.13/include/linux/pipe_fs_i.h
---- linux-2.6.32.13/include/linux/pipe_fs_i.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/pipe_fs_i.h	2010-05-15 13:21:17.946623351 -0400
-@@ -46,9 +46,9 @@ struct pipe_inode_info {
+diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
+index bb27d7e..829e8c5 100644
+--- a/include/linux/pipe_fs_i.h
++++ b/include/linux/pipe_fs_i.h
+@@ -45,9 +45,9 @@ struct pipe_buffer {
+ struct pipe_inode_info {
  	wait_queue_head_t wait;
- 	unsigned int nrbufs, curbuf;
- 	struct page *tmp_page;
+ 	unsigned int nrbufs, curbuf, buffers;
 -	unsigned int readers;
 -	unsigned int writers;
 -	unsigned int waiting_writers;
@@ -46305,10 +47518,11 @@ diff -urNp linux-2.6.32.13/include/linux/pipe_fs_i.h linux-2.6.32.13/include/lin
 +	atomic_t waiting_writers;
  	unsigned int r_counter;
  	unsigned int w_counter;
- 	struct fasync_struct *fasync_readers;
-diff -urNp linux-2.6.32.13/include/linux/poison.h linux-2.6.32.13/include/linux/poison.h
---- linux-2.6.32.13/include/linux/poison.h	2010-05-15 13:20:19.331913169 -0400
-+++ linux-2.6.32.13/include/linux/poison.h	2010-05-15 13:23:00.179313143 -0400
+ 	struct page *tmp_page;
+diff --git a/include/linux/poison.h b/include/linux/poison.h
+index 34066ff..e95d744 100644
+--- a/include/linux/poison.h
++++ b/include/linux/poison.h
 @@ -19,8 +19,8 @@
   * under normal circumstances, used to verify that nobody uses
   * non-initialized list entries.
@@ -46320,10 +47534,11 @@ diff -urNp linux-2.6.32.13/include/linux/poison.h linux-2.6.32.13/include/linux/
  
  /********** include/linux/timer.h **********/
  /*
-diff -urNp linux-2.6.32.13/include/linux/proc_fs.h linux-2.6.32.13/include/linux/proc_fs.h
---- linux-2.6.32.13/include/linux/proc_fs.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/proc_fs.h	2010-05-15 13:21:17.946623351 -0400
-@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
+diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
+index 379eaed..3471a57 100644
+--- a/include/linux/proc_fs.h
++++ b/include/linux/proc_fs.h
+@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode,
  	return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
  
@@ -46343,25 +47558,34 @@ diff -urNp linux-2.6.32.13/include/linux/proc_fs.h linux-2.6.32.13/include/linux
  static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
  	mode_t mode, struct proc_dir_entry *base, 
  	read_proc_t *read_proc, void * data)
-diff -urNp linux-2.6.32.13/include/linux/random.h linux-2.6.32.13/include/linux/random.h
---- linux-2.6.32.13/include/linux/random.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/random.h	2010-05-15 13:21:17.950606770 -0400
-@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
- u32 random32(void);
- void srandom32(u32 seed);
+diff --git a/include/linux/random.h b/include/linux/random.h
+index fb7ab9d..262eb28 100644
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -80,12 +80,17 @@ void srandom32(u32 seed);
+ 
+ u32 prandom32(struct rnd_state *);
  
 +static inline unsigned long pax_get_random_long(void)
 +{
 +	return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
 +}
 +
- #endif /* __KERNEL___ */
+ /*
+  * Handle minimum values for seeds
+  */
+ static inline u32 __seed(u32 x, u32 m)
+ {
+-	return (x < m) ? x + m : x;
++	return (x <= m) ? x + m + 1 : x;
+ }
  
- #endif /* _LINUX_RANDOM_H */
-diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs.h linux-2.6.32.13/include/linux/reiserfs_fs.h
---- linux-2.6.32.13/include/linux/reiserfs_fs.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/reiserfs_fs.h	2010-05-15 13:21:17.950606770 -0400
-@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
+ /**
+diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
+index 3b603f4..a129945 100644
+--- a/include/linux/reiserfs_fs.h
++++ b/include/linux/reiserfs_fs.h
+@@ -1404,7 +1404,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
  #define REISERFS_USER_MEM		1	/* reiserfs user memory mode            */
  
  #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
@@ -46369,8 +47593,8 @@ diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs.h linux-2.6.32.13/include/l
 +#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
  #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) ({cond_resched(); __fs_changed(gen, s);})
-@@ -1534,24 +1534,24 @@ static inline struct super_block *sb_fro
+ #define fs_changed(gen,s)		\
+@@ -1616,24 +1616,24 @@ static inline struct super_block *sb_from_bi(struct buffer_info *bi)
  */
  
  struct item_operations {
@@ -46407,10 +47631,11 @@ diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs.h linux-2.6.32.13/include/l
  
  #define op_bytes_number(ih,bsize)                    item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
  #define op_is_left_mergeable(key,bsize)              item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
-diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs_sb.h linux-2.6.32.13/include/linux/reiserfs_fs_sb.h
---- linux-2.6.32.13/include/linux/reiserfs_fs_sb.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/reiserfs_fs_sb.h	2010-05-15 13:21:17.950606770 -0400
-@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
+diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
+index 52c83b6..18ed7eb 100644
+--- a/include/linux/reiserfs_fs_sb.h
++++ b/include/linux/reiserfs_fs_sb.h
+@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
  	/* Comment? -Hans */
  	wait_queue_head_t s_wait;
  	/* To be obsoleted soon by per buffer seals.. -Hans */
@@ -46419,18 +47644,47 @@ diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs_sb.h linux-2.6.32.13/includ
  	// tree gets re-balanced
  	unsigned long s_properties;	/* File system properties. Currently holds
  					   on-disk FS format */
-diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/sched.h
---- linux-2.6.32.13/include/linux/sched.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/sched.h	2010-05-15 13:21:17.950606770 -0400
-@@ -101,6 +101,7 @@ struct bio;
+diff --git a/include/linux/rmap.h b/include/linux/rmap.h
+index 7721674..ad5bcc8 100644
+--- a/include/linux/rmap.h
++++ b/include/linux/rmap.h
+@@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struct vm_area_struct *vma)
+ void anon_vma_init(void);	/* create anon_vma_cachep */
+ int  anon_vma_prepare(struct vm_area_struct *);
+ void unlink_anon_vmas(struct vm_area_struct *);
+-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
+-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
++int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
++int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
+ void __anon_vma_link(struct vm_area_struct *);
+ void anon_vma_free(struct anon_vma *);
+ 
+diff --git a/include/linux/sched.h b/include/linux/sched.h
+index 5ee397e..0424d22 100644
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -100,6 +100,7 @@ struct robust_list_head;
+ struct bio_list;
  struct fs_struct;
- struct bts_context;
  struct perf_event_context;
 +struct linux_binprm;
  
  /*
   * List of flags we want to share for kernel threads,
-@@ -664,6 +665,15 @@ struct signal_struct {
+@@ -381,10 +382,12 @@ struct user_namespace;
+ #define DEFAULT_MAX_MAP_COUNT	(USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
+ 
+ extern int sysctl_max_map_count;
++extern unsigned long sysctl_heap_stack_gap;
+ 
+ #include <linux/aio.h>
+ 
+ #ifdef CONFIG_MMU
++extern bool check_heap_stack_gap(struct vm_area_struct *vma, unsigned long addr, unsigned long len);
+ extern void arch_pick_mmap_layout(struct mm_struct *mm);
+ extern unsigned long
+ arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
+@@ -628,6 +631,15 @@ struct signal_struct {
  	struct tty_audit_buf *tty_audit_buf;
  #endif
  
@@ -46446,7 +47700,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s
  	int oom_adj;	/* OOM kill score adjustment (bit shift) */
  };
  
-@@ -1217,7 +1227,7 @@ struct rcu_node;
+@@ -1166,7 +1178,7 @@ struct rcu_node;
  
  struct task_struct {
  	volatile long state;	/* -1 unrunnable, 0 runnable, >0 stopped */
@@ -46455,7 +47709,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s
  	atomic_t usage;
  	unsigned int flags;	/* per process flags, defined below */
  	unsigned int ptrace;
-@@ -1329,8 +1339,8 @@ struct task_struct {
+@@ -1274,8 +1286,8 @@ struct task_struct {
  	struct list_head thread_group;
  
  	struct completion *vfork_done;		/* for vfork() */
@@ -46466,7 +47720,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s
  
  	cputime_t utime, stime, utimescaled, stimescaled;
  	cputime_t gtime;
-@@ -1344,16 +1354,6 @@ struct task_struct {
+@@ -1291,16 +1303,6 @@ struct task_struct {
  	struct task_cputime cputime_expires;
  	struct list_head cpu_timers[3];
  
@@ -46483,8 +47737,8 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s
  	char comm[TASK_COMM_LEN]; /* executable name excluding path
  				     - access with [gs]et_task_comm (which lock
  				       it with task_lock())
-@@ -1437,6 +1437,15 @@ struct task_struct {
- 	int hardirq_context;
+@@ -1384,6 +1386,15 @@ struct task_struct {
+ 	int softirqs_enabled;
  	int softirq_context;
  #endif
 +
@@ -46499,7 +47753,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s
  #ifdef CONFIG_LOCKDEP
  # define MAX_LOCK_DEPTH 48UL
  	u64 curr_chain_key;
-@@ -1457,6 +1466,9 @@ struct task_struct {
+@@ -1404,6 +1415,9 @@ struct task_struct {
  
  	struct backing_dev_info *backing_dev_info;
  
@@ -46509,14 +47763,14 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s
  	struct io_context *io_context;
  
  	unsigned long ptrace_message;
-@@ -1520,6 +1532,19 @@ struct task_struct {
+@@ -1469,6 +1483,20 @@ struct task_struct {
  	unsigned long default_timer_slack_ns;
  
  	struct list_head	*scm_work_list;
 +
 +#ifdef CONFIG_GRKERNSEC
 +	/* grsecurity */
-+	rwlock_t gr_fs_lock;
++	struct dentry *gr_chroot_dentry;
 +	struct acl_subject_label *acl;
 +	struct acl_role_label *role;
 +	struct file *exec_file;
@@ -46524,13 +47778,14 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s
 +	u8 acl_sp_role;
 +	u8 is_writable;
 +	u8 brute;
++	u8 gr_is_chrooted;
 +#endif
 +
  #ifdef CONFIG_FUNCTION_GRAPH_TRACER
- 	/* Index of current stored adress in ret_stack */
+ 	/* Index of current stored address in ret_stack */
  	int curr_ret_stack;
-@@ -1544,6 +1569,52 @@ struct task_struct {
- 	unsigned long stack_start;
+@@ -1500,6 +1528,52 @@ struct task_struct {
+ #endif
  };
  
 +#define MF_PAX_PAGEEXEC		0x01000000	/* Paging based non-executable pages */
@@ -46580,9 +47835,9 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s
 +void pax_report_overflow_from_user(const void *ptr, unsigned long len);
 +
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
- #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed)
+ #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
  
-@@ -2143,7 +2214,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2101,7 +2175,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -46591,41 +47846,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s
  
  extern void daemonize(const char *, ...);
  extern int allow_signal(int);
-@@ -2245,6 +2316,33 @@ static inline void task_unlock(struct ta
- 	spin_unlock(&p->alloc_lock);
- }
- 
-+/* grsec: protects only ->fs as task_lock is overkill and we can't
-+   be using a spin_lock in interrupt context
-+*/
-+#ifdef CONFIG_GRKERNSEC
-+#define gr_fs_write_lock_irqsave(x, y)				\
-+	write_lock_irqsave(&x->gr_fs_lock, y)
-+#define gr_fs_write_unlock_irqrestore(x, y) 			\
-+	write_unlock_irqrestore(&x->gr_fs_lock, y)
-+#else
-+#define gr_fs_write_lock_irqsave(x, y)
-+#define gr_fs_write_unlock_irqrestore(x, y)
-+#endif
-+
-+static inline void gr_fs_read_lock(struct task_struct *p)
-+{
-+#ifdef CONFIG_GRKERNSEC
-+	read_lock(&p->gr_fs_lock);
-+#endif
-+}
-+
-+static inline void gr_fs_read_unlock(struct task_struct *p)
-+{
-+#ifdef CONFIG_GRKERNSEC
-+	read_unlock(&p->gr_fs_lock);
-+#endif
-+}
-+
- extern struct sighand_struct *lock_task_sighand(struct task_struct *tsk,
- 							unsigned long *flags);
- 
-@@ -2256,8 +2354,8 @@ static inline void unlock_task_sighand(s
+@@ -2217,8 +2291,8 @@ static inline void unlock_task_sighand(struct task_struct *tsk,
  
  #ifndef __HAVE_THREAD_FUNCTIONS
  
@@ -46636,7 +47857,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s
  
  static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org)
  {
-@@ -2272,13 +2370,31 @@ static inline unsigned long *end_of_stac
+@@ -2233,13 +2307,17 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
  
  #endif
  
@@ -46649,31 +47870,18 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s
  	return (obj >= stack) && (obj < (stack + THREAD_SIZE));
  }
  
-+/* 0: not at all, 1: fully, -1: partially (implies an error) */
-+static inline int object_is_on_stack(const void *obj, unsigned long len)
-+{
-+	const void *stack = task_stack_page(current);
-+	const void *stackend = stack + THREAD_SIZE;
-+
-+	if (obj + len < obj)
-+		return -1;
-+
-+	if (stack <= obj && obj + len <= stackend)
-+		return 1;
-+
-+	if (obj + len <= stack || stackend <=  obj)
-+		return 0;
-+
-+	return -1;
-+}
++#ifdef CONFIG_PAX_USERCOPY
++extern int object_is_on_stack(const void *obj, unsigned long len);
++#endif
 +
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-2.6.32.13/include/linux/screen_info.h linux-2.6.32.13/include/linux/screen_info.h
---- linux-2.6.32.13/include/linux/screen_info.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/screen_info.h	2010-05-15 13:21:17.950606770 -0400
-@@ -42,7 +42,8 @@ struct screen_info {
+diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
+index 899fbb4..1cb4138 100644
+--- a/include/linux/screen_info.h
++++ b/include/linux/screen_info.h
+@@ -43,7 +43,8 @@ struct screen_info {
  	__u16 pages;		/* 0x32 */
  	__u16 vesa_attributes;	/* 0x34 */
  	__u32 capabilities;     /* 0x36 */
@@ -46683,21 +47891,23 @@ diff -urNp linux-2.6.32.13/include/linux/screen_info.h linux-2.6.32.13/include/l
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA		0x10	/* Monochrome Text Display	*/
-diff -urNp linux-2.6.32.13/include/linux/security.h linux-2.6.32.13/include/linux/security.h
---- linux-2.6.32.13/include/linux/security.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/security.h	2010-05-15 13:21:17.950606770 -0400
+diff --git a/include/linux/security.h b/include/linux/security.h
+index 0c88191..1aace7f 100644
+--- a/include/linux/security.h
++++ b/include/linux/security.h
 @@ -34,6 +34,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
- #include <linux/gfp.h>
+ #include <linux/slab.h>
 +#include <linux/grsecurity.h>
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.32.13/include/linux/shm.h linux-2.6.32.13/include/linux/shm.h
---- linux-2.6.32.13/include/linux/shm.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/shm.h	2010-05-15 13:21:17.950606770 -0400
-@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
+diff --git a/include/linux/shm.h b/include/linux/shm.h
+index eca6235..c7417ed 100644
+--- a/include/linux/shm.h
++++ b/include/linux/shm.h
+@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the kernel */
  	pid_t			shm_cprid;
  	pid_t			shm_lprid;
  	struct user_struct	*mlock_user;
@@ -46708,9 +47918,10 @@ diff -urNp linux-2.6.32.13/include/linux/shm.h linux-2.6.32.13/include/linux/shm
  };
  
  /* shm_mode upper byte flags */
-diff -urNp linux-2.6.32.13/include/linux/slab.h linux-2.6.32.13/include/linux/slab.h
---- linux-2.6.32.13/include/linux/slab.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/slab.h	2010-05-15 13:21:17.950606770 -0400
+diff --git a/include/linux/slab.h b/include/linux/slab.h
+index 49d1247..73ccbf6 100644
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
 @@ -11,6 +11,7 @@
  
  #include <linux/gfp.h>
@@ -46719,7 +47930,7 @@ diff -urNp linux-2.6.32.13/include/linux/slab.h linux-2.6.32.13/include/linux/sl
  
  /*
   * Flags to pass to kmem_cache_create().
-@@ -82,10 +83,13 @@
+@@ -87,10 +88,13 @@
   * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
   * Both make kfree a no-op.
   */
@@ -46736,7 +47947,7 @@ diff -urNp linux-2.6.32.13/include/linux/slab.h linux-2.6.32.13/include/linux/sl
  
  /*
   * struct kmem_cache related prototypes
-@@ -138,6 +142,7 @@ void * __must_check krealloc(const void 
+@@ -144,6 +148,7 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
  void kfree(const void *);
  void kzfree(const void *);
  size_t ksize(const void *);
@@ -46744,7 +47955,7 @@ diff -urNp linux-2.6.32.13/include/linux/slab.h linux-2.6.32.13/include/linux/sl
  
  /*
   * Allocator specific definitions. These are mainly used to establish optimized
-@@ -328,4 +333,37 @@ static inline void *kzalloc_node(size_t 
+@@ -334,4 +339,37 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node)
  
  void __init kmem_cache_init_late(void);
  
@@ -46782,10 +47993,11 @@ diff -urNp linux-2.6.32.13/include/linux/slab.h linux-2.6.32.13/include/linux/sl
 +})
 +
  #endif	/* _LINUX_SLAB_H */
-diff -urNp linux-2.6.32.13/include/linux/slub_def.h linux-2.6.32.13/include/linux/slub_def.h
---- linux-2.6.32.13/include/linux/slub_def.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/slub_def.h	2010-05-15 13:21:17.950606770 -0400
-@@ -86,7 +86,7 @@ struct kmem_cache {
+diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
+index 4ba59cf..c0b9df1 100644
+--- a/include/linux/slub_def.h
++++ b/include/linux/slub_def.h
+@@ -79,7 +79,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 */
@@ -46794,9 +48006,10 @@ diff -urNp linux-2.6.32.13/include/linux/slub_def.h linux-2.6.32.13/include/linu
  	void (*ctor)(void *);
  	int inuse;		/* Offset to metadata */
  	int align;		/* Alignment */
-diff -urNp linux-2.6.32.13/include/linux/sonet.h linux-2.6.32.13/include/linux/sonet.h
---- linux-2.6.32.13/include/linux/sonet.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/sonet.h	2010-05-15 13:21:17.950606770 -0400
+diff --git a/include/linux/sonet.h b/include/linux/sonet.h
+index 67ad11f..0bbd8af 100644
+--- a/include/linux/sonet.h
++++ b/include/linux/sonet.h
 @@ -61,7 +61,7 @@ struct sonet_stats {
  #include <asm/atomic.h>
  
@@ -46806,9 +48019,10 @@ diff -urNp linux-2.6.32.13/include/linux/sonet.h linux-2.6.32.13/include/linux/s
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.32.13/include/linux/suspend.h linux-2.6.32.13/include/linux/suspend.h
---- linux-2.6.32.13/include/linux/suspend.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/suspend.h	2010-05-15 13:21:17.950606770 -0400
+diff --git a/include/linux/suspend.h b/include/linux/suspend.h
+index bc7d6bb..dc52ad4 100644
+--- a/include/linux/suspend.h
++++ b/include/linux/suspend.h
 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
   *	which require special recovery actions in that situation.
   */
@@ -46843,7 +48057,7 @@ diff -urNp linux-2.6.32.13/include/linux/suspend.h linux-2.6.32.13/include/linux
  extern int suspend_valid_only_mem(suspend_state_t state);
  
  /**
-@@ -145,7 +145,7 @@ extern int pm_suspend(suspend_state_t st
+@@ -145,7 +145,7 @@ extern int pm_suspend(suspend_state_t state);
  #else /* !CONFIG_SUSPEND */
  #define suspend_valid_only_mem	NULL
  
@@ -46852,7 +48066,7 @@ diff -urNp linux-2.6.32.13/include/linux/suspend.h linux-2.6.32.13/include/linux
  static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
  #endif /* !CONFIG_SUSPEND */
  
-@@ -215,16 +215,16 @@ extern void mark_free_pages(struct zone 
+@@ -215,16 +215,16 @@ extern void mark_free_pages(struct zone *zone);
   *	platforms which require special recovery actions in that situation.
   */
  struct platform_hibernation_ops {
@@ -46879,7 +48093,7 @@ diff -urNp linux-2.6.32.13/include/linux/suspend.h linux-2.6.32.13/include/linux
  };
  
  #ifdef CONFIG_HIBERNATION
-@@ -243,7 +243,7 @@ extern void swsusp_set_page_free(struct 
+@@ -243,7 +243,7 @@ extern void swsusp_set_page_free(struct page *);
  extern void swsusp_unset_page_free(struct page *);
  extern unsigned long get_safe_page(gfp_t gfp_mask);
  
@@ -46888,7 +48102,7 @@ diff -urNp linux-2.6.32.13/include/linux/suspend.h linux-2.6.32.13/include/linux
  extern int hibernate(void);
  extern bool system_entering_hibernation(void);
  #else /* CONFIG_HIBERNATION */
-@@ -251,7 +251,7 @@ static inline int swsusp_page_is_forbidd
+@@ -251,7 +251,7 @@ static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
  static inline void swsusp_set_page_free(struct page *p) {}
  static inline void swsusp_unset_page_free(struct page *p) {}
  
@@ -46897,10 +48111,11 @@ diff -urNp linux-2.6.32.13/include/linux/suspend.h linux-2.6.32.13/include/linux
  static inline int hibernate(void) { return -ENOSYS; }
  static inline bool system_entering_hibernation(void) { return false; }
  #endif /* CONFIG_HIBERNATION */
-diff -urNp linux-2.6.32.13/include/linux/sysctl.h linux-2.6.32.13/include/linux/sysctl.h
---- linux-2.6.32.13/include/linux/sysctl.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/sysctl.h	2010-05-15 13:21:17.950606770 -0400
-@@ -164,7 +164,11 @@ enum
+diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
+index 7bb5cb6..f674b0b 100644
+--- a/include/linux/sysctl.h
++++ b/include/linux/sysctl.h
+@@ -155,7 +155,11 @@ enum
  	KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
  };
  
@@ -46913,11 +48128,12 @@ diff -urNp linux-2.6.32.13/include/linux/sysctl.h linux-2.6.32.13/include/linux/
  
  /* CTL_VM names: */
  enum
-diff -urNp linux-2.6.32.13/include/linux/sysfs.h linux-2.6.32.13/include/linux/sysfs.h
---- linux-2.6.32.13/include/linux/sysfs.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/sysfs.h	2010-05-15 13:21:17.950606770 -0400
-@@ -75,8 +75,8 @@ struct bin_attribute {
- };
+diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
+index f2694eb..396ed1d 100644
+--- a/include/linux/sysfs.h
++++ b/include/linux/sysfs.h
+@@ -115,8 +115,8 @@ struct bin_attribute {
+ #define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
  
  struct sysfs_ops {
 -	ssize_t	(*show)(struct kobject *, struct attribute *,char *);
@@ -46927,9 +48143,10 @@ diff -urNp linux-2.6.32.13/include/linux/sysfs.h linux-2.6.32.13/include/linux/s
  };
  
  struct sysfs_dirent;
-diff -urNp linux-2.6.32.13/include/linux/thread_info.h linux-2.6.32.13/include/linux/thread_info.h
---- linux-2.6.32.13/include/linux/thread_info.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/thread_info.h	2010-05-15 13:21:17.950606770 -0400
+diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
+index a8cc4e1..98d3b85 100644
+--- a/include/linux/thread_info.h
++++ b/include/linux/thread_info.h
 @@ -23,7 +23,7 @@ struct restart_block {
  		};
  		/* For futex_wait and futex_wait_requeue_pi */
@@ -46939,9 +48156,10 @@ diff -urNp linux-2.6.32.13/include/linux/thread_info.h linux-2.6.32.13/include/l
  			u32 val;
  			u32 flags;
  			u32 bitset;
-diff -urNp linux-2.6.32.13/include/linux/tty.h linux-2.6.32.13/include/linux/tty.h
---- linux-2.6.32.13/include/linux/tty.h	2010-04-04 20:41:50.060586306 -0400
-+++ linux-2.6.32.13/include/linux/tty.h	2010-05-15 13:21:17.950606770 -0400
+diff --git a/include/linux/tty.h b/include/linux/tty.h
+index 7802a24..7722cc6 100644
+--- a/include/linux/tty.h
++++ b/include/linux/tty.h
 @@ -13,6 +13,7 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_ldisc.h>
@@ -46950,7 +48168,7 @@ diff -urNp linux-2.6.32.13/include/linux/tty.h linux-2.6.32.13/include/linux/tty
  
  #include <asm/system.h>
  
-@@ -443,7 +444,6 @@ extern int tty_perform_flush(struct tty_
+@@ -453,7 +454,6 @@ extern int tty_perform_flush(struct tty_struct *tty, unsigned long arg);
  extern dev_t tty_devnum(struct tty_struct *tty);
  extern void proc_clear_tty(struct task_struct *p);
  extern struct tty_struct *get_current_tty(void);
@@ -46958,7 +48176,7 @@ diff -urNp linux-2.6.32.13/include/linux/tty.h linux-2.6.32.13/include/linux/tty
  extern struct tty_struct *alloc_tty_struct(void);
  extern void free_tty_struct(struct tty_struct *tty);
  extern void initialize_tty_struct(struct tty_struct *tty,
-@@ -493,6 +493,18 @@ extern void tty_ldisc_begin(void);
+@@ -514,6 +514,18 @@ extern void tty_ldisc_begin(void);
  /* This last one is just for the tty layer internals and shouldn't be used elsewhere */
  extern void tty_ldisc_enable(struct tty_struct *tty);
  
@@ -46977,10 +48195,11 @@ diff -urNp linux-2.6.32.13/include/linux/tty.h linux-2.6.32.13/include/linux/tty
  
  /* n_tty.c */
  extern struct tty_ldisc_ops tty_ldisc_N_TTY;
-diff -urNp linux-2.6.32.13/include/linux/tty_ldisc.h linux-2.6.32.13/include/linux/tty_ldisc.h
---- linux-2.6.32.13/include/linux/tty_ldisc.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/tty_ldisc.h	2010-05-15 13:21:17.950606770 -0400
-@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
+diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
+index 526d66f..db6ac42 100644
+--- a/include/linux/tty_ldisc.h
++++ b/include/linux/tty_ldisc.h
+@@ -147,7 +147,7 @@ struct tty_ldisc_ops {
  
  	struct  module *owner;
  	
@@ -46989,16 +48208,17 @@ diff -urNp linux-2.6.32.13/include/linux/tty_ldisc.h linux-2.6.32.13/include/lin
  };
  
  struct tty_ldisc {
-diff -urNp linux-2.6.32.13/include/linux/types.h linux-2.6.32.13/include/linux/types.h
---- linux-2.6.32.13/include/linux/types.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/types.h	2010-05-15 13:21:17.956129899 -0400
+diff --git a/include/linux/types.h b/include/linux/types.h
+index 23d237a..0800041 100644
+--- a/include/linux/types.h
++++ b/include/linux/types.h
 @@ -191,10 +191,26 @@ typedef struct {
- 	volatile int counter;
+ 	int counter;
  } atomic_t;
  
 +#ifdef CONFIG_PAX_REFCOUNT
 +typedef struct {
-+	volatile int counter;
++	int counter;
 +} atomic_unchecked_t;
 +#else
 +typedef atomic_t atomic_unchecked_t;
@@ -47006,12 +48226,12 @@ diff -urNp linux-2.6.32.13/include/linux/types.h linux-2.6.32.13/include/linux/t
 +
  #ifdef CONFIG_64BIT
  typedef struct {
- 	volatile long counter;
+ 	long counter;
  } atomic64_t;
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +typedef struct {
-+	volatile long counter;
++	long counter;
 +} atomic64_unchecked_t;
 +#else
 +typedef atomic64_t atomic64_unchecked_t;
@@ -47019,10 +48239,11 @@ diff -urNp linux-2.6.32.13/include/linux/types.h linux-2.6.32.13/include/linux/t
  #endif
  
  struct ustat {
-diff -urNp linux-2.6.32.13/include/linux/uaccess.h linux-2.6.32.13/include/linux/uaccess.h
---- linux-2.6.32.13/include/linux/uaccess.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/uaccess.h	2010-05-15 13:21:17.956129899 -0400
-@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
+diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
+index d512d98..73371e8 100644
+--- a/include/linux/uaccess.h
++++ b/include/linux/uaccess.h
+@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
  		long ret;				\
  		mm_segment_t old_fs = get_fs();		\
  							\
@@ -47036,27 +48257,54 @@ diff -urNp linux-2.6.32.13/include/linux/uaccess.h linux-2.6.32.13/include/linux
  		ret;					\
  	})
  
-@@ -93,7 +93,7 @@ static inline unsigned long __copy_from_
+@@ -93,8 +93,8 @@ static inline unsigned long __copy_from_user_nocache(void *to,
   * Safely read from address @src to the buffer at @dst.  If a kernel fault
   * happens, handle that and return -EFAULT.
   */
 -extern long probe_kernel_read(void *dst, void *src, size_t size);
+-extern long __probe_kernel_read(void *dst, void *src, size_t size);
 +extern long probe_kernel_read(void *dst, const void *src, size_t size);
++extern long __probe_kernel_read(void *dst, const void *src, size_t size);
  
  /*
   * probe_kernel_write(): safely attempt to write to a location
-@@ -104,6 +104,6 @@ extern long probe_kernel_read(void *dst,
+@@ -105,7 +105,7 @@ extern long __probe_kernel_read(void *dst, void *src, size_t size);
   * Safely write to address @dst from the buffer at @src.  If a kernel fault
   * happens, handle that and return -EFAULT.
   */
--extern long probe_kernel_write(void *dst, void *src, size_t size);
-+extern long probe_kernel_write(void *dst, const void *src, size_t size);
+-extern long notrace probe_kernel_write(void *dst, void *src, size_t size);
+-extern long notrace __probe_kernel_write(void *dst, void *src, size_t size);
++extern long notrace probe_kernel_write(void *dst, const void *src, size_t size);
++extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
  
  #endif		/* __LINUX_UACCESS_H__ */
-diff -urNp linux-2.6.32.13/include/linux/vmalloc.h linux-2.6.32.13/include/linux/vmalloc.h
---- linux-2.6.32.13/include/linux/vmalloc.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/linux/vmalloc.h	2010-05-15 13:23:38.934774262 -0400
-@@ -13,6 +13,11 @@ struct vm_area_struct;		/* vma defining 
+diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
+index 2e3a4ea..0835da1 100644
+--- a/include/linux/usb/hcd.h
++++ b/include/linux/usb/hcd.h
+@@ -559,7 +559,7 @@ struct usb_mon_operations {
+ 	/* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
+ };
+ 
+-extern struct usb_mon_operations *mon_ops;
++extern const struct usb_mon_operations *mon_ops;
+ 
+ static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
+ {
+@@ -581,7 +581,7 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,
+ 		(*mon_ops->urb_complete)(bus, urb, status);
+ }
+ 
+-int usb_mon_register(struct usb_mon_operations *ops);
++int usb_mon_register(const struct usb_mon_operations *ops);
+ void usb_mon_deregister(void);
+ 
+ #else
+diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
+index 227c2a5..99322bc 100644
+--- a/include/linux/vmalloc.h
++++ b/include/linux/vmalloc.h
+@@ -13,6 +13,11 @@ struct vm_area_struct;		/* vma defining user mapping in mm_types.h */
  #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 */
@@ -47068,7 +48316,7 @@ diff -urNp linux-2.6.32.13/include/linux/vmalloc.h linux-2.6.32.13/include/linux
  /* bits [20..32] reserved for arch specific ioremap internals */
  
  /*
-@@ -123,4 +128,81 @@ struct vm_struct **pcpu_get_vm_areas(con
+@@ -121,4 +126,81 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
  
  void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms);
  
@@ -47150,9 +48398,101 @@ diff -urNp linux-2.6.32.13/include/linux/vmalloc.h linux-2.6.32.13/include/linux
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.32.13/include/net/irda/ircomm_tty.h linux-2.6.32.13/include/net/irda/ircomm_tty.h
---- linux-2.6.32.13/include/net/irda/ircomm_tty.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/net/irda/ircomm_tty.h	2010-05-15 13:21:17.956129899 -0400
+diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
+index eaaea37..5f48b6b 100644
+--- a/include/linux/vmstat.h
++++ b/include/linux/vmstat.h
+@@ -140,18 +140,18 @@ static inline void vm_events_fold_cpu(int cpu)
+ /*
+  * Zone based page accounting with per cpu differentials.
+  */
+-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
++extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
+ 
+ static inline void zone_page_state_add(long x, struct zone *zone,
+ 				 enum zone_stat_item item)
+ {
+-	atomic_long_add(x, &zone->vm_stat[item]);
+-	atomic_long_add(x, &vm_stat[item]);
++	atomic_long_add_unchecked(x, &zone->vm_stat[item]);
++	atomic_long_add_unchecked(x, &vm_stat[item]);
+ }
+ 
+ static inline unsigned long global_page_state(enum zone_stat_item item)
+ {
+-	long x = atomic_long_read(&vm_stat[item]);
++	long x = atomic_long_read_unchecked(&vm_stat[item]);
+ #ifdef CONFIG_SMP
+ 	if (x < 0)
+ 		x = 0;
+@@ -162,7 +162,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
+ static inline unsigned long zone_page_state(struct zone *zone,
+ 					enum zone_stat_item item)
+ {
+-	long x = atomic_long_read(&zone->vm_stat[item]);
++	long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
+ #ifdef CONFIG_SMP
+ 	if (x < 0)
+ 		x = 0;
+@@ -179,7 +179,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
+ static inline unsigned long zone_page_state_snapshot(struct zone *zone,
+ 					enum zone_stat_item item)
+ {
+-	long x = atomic_long_read(&zone->vm_stat[item]);
++	long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
+ 
+ #ifdef CONFIG_SMP
+ 	int cpu;
+@@ -268,8 +268,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
+ 
+ static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
+ {
+-	atomic_long_inc(&zone->vm_stat[item]);
+-	atomic_long_inc(&vm_stat[item]);
++	atomic_long_inc_unchecked(&zone->vm_stat[item]);
++	atomic_long_inc_unchecked(&vm_stat[item]);
+ }
+ 
+ static inline void __inc_zone_page_state(struct page *page,
+@@ -280,8 +280,8 @@ static inline void __inc_zone_page_state(struct page *page,
+ 
+ static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
+ {
+-	atomic_long_dec(&zone->vm_stat[item]);
+-	atomic_long_dec(&vm_stat[item]);
++	atomic_long_dec_unchecked(&zone->vm_stat[item]);
++	atomic_long_dec_unchecked(&vm_stat[item]);
+ }
+ 
+ static inline void __dec_zone_page_state(struct page *page,
+diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
+index 87b1df0..6638807 100644
+--- a/include/net/inetpeer.h
++++ b/include/net/inetpeer.h
+@@ -22,8 +22,8 @@ struct inet_peer {
+ 	__u32			dtime;		/* the time of last use of not
+ 						 * referenced entries */
+ 	atomic_t		refcnt;
+-	atomic_t		rid;		/* Frag reception counter */
+-	atomic_t		ip_id_count;	/* IP ID for the next packet */
++	atomic_unchecked_t	rid;		/* Frag reception counter */
++	atomic_unchecked_t	ip_id_count;	/* IP ID for the next packet */
+ 	__u32			tcp_ts;
+ 	__u32			tcp_ts_stamp;
+ };
+@@ -40,7 +40,7 @@ extern void inet_putpeer(struct inet_peer *p);
+ static inline __u16	inet_getid(struct inet_peer *p, int more)
+ {
+ 	more++;
+-	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 --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
+index eea2e61..447faeb 100644
+--- a/include/net/irda/ircomm_tty.h
++++ b/include/net/irda/ircomm_tty.h
 @@ -105,8 +105,8 @@ struct ircomm_tty_cb {
          unsigned short    close_delay;
          unsigned short    closing_wait; /* time to wait before closing */
@@ -47164,12 +48504,13 @@ diff -urNp linux-2.6.32.13/include/net/irda/ircomm_tty.h linux-2.6.32.13/include
  
  	/* Protect concurent access to :
  	 *	o self->open_count
-diff -urNp linux-2.6.32.13/include/net/neighbour.h linux-2.6.32.13/include/net/neighbour.h
---- linux-2.6.32.13/include/net/neighbour.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/net/neighbour.h	2010-05-15 13:21:17.956129899 -0400
-@@ -125,12 +125,12 @@ struct neighbour
- struct neigh_ops
- {
+diff --git a/include/net/neighbour.h b/include/net/neighbour.h
+index eb21340..ba630a3 100644
+--- a/include/net/neighbour.h
++++ b/include/net/neighbour.h
+@@ -116,12 +116,12 @@ struct neighbour {
+ 
+ struct neigh_ops {
  	int			family;
 -	void			(*solicit)(struct neighbour *, struct sk_buff*);
 -	void			(*error_report)(struct neighbour *, struct sk_buff*);
@@ -47185,10 +48526,11 @@ diff -urNp linux-2.6.32.13/include/net/neighbour.h linux-2.6.32.13/include/net/n
 +	int			(* const queue_xmit)(struct sk_buff*);
  };
  
- struct pneigh_entry
-diff -urNp linux-2.6.32.13/include/net/sctp/sctp.h linux-2.6.32.13/include/net/sctp/sctp.h
---- linux-2.6.32.13/include/net/sctp/sctp.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/net/sctp/sctp.h	2010-05-15 13:21:17.956129899 -0400
+ struct pneigh_entry {
+diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
+index 65946bc..7125d46 100644
+--- a/include/net/sctp/sctp.h
++++ b/include/net/sctp/sctp.h
 @@ -305,8 +305,8 @@ extern int sctp_debug_flag;
  
  #else	/* SCTP_DEBUG */
@@ -47200,10 +48542,11 @@ diff -urNp linux-2.6.32.13/include/net/sctp/sctp.h linux-2.6.32.13/include/net/s
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.32.13/include/net/tcp.h linux-2.6.32.13/include/net/tcp.h
---- linux-2.6.32.13/include/net/tcp.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/net/tcp.h	2010-05-15 13:21:17.956129899 -0400
-@@ -1420,6 +1420,7 @@ enum tcp_seq_states {
+diff --git a/include/net/tcp.h b/include/net/tcp.h
+index e824cf0..8b31ae1 100644
+--- a/include/net/tcp.h
++++ b/include/net/tcp.h
+@@ -1428,6 +1428,7 @@ enum tcp_seq_states {
  struct tcp_seq_afinfo {
  	char			*name;
  	sa_family_t		family;
@@ -47211,10 +48554,11 @@ diff -urNp linux-2.6.32.13/include/net/tcp.h linux-2.6.32.13/include/net/tcp.h
  	struct file_operations	seq_fops;
  	struct seq_operations	seq_ops;
  };
-diff -urNp linux-2.6.32.13/include/net/udp.h linux-2.6.32.13/include/net/udp.h
---- linux-2.6.32.13/include/net/udp.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/net/udp.h	2010-05-15 13:21:17.956129899 -0400
-@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
+diff --git a/include/net/udp.h b/include/net/udp.h
+index 4201dc8..bc2db06 100644
+--- a/include/net/udp.h
++++ b/include/net/udp.h
+@@ -222,6 +222,7 @@ struct udp_seq_afinfo {
  	char			*name;
  	sa_family_t		family;
  	struct udp_table	*udp_table;
@@ -47222,9 +48566,10 @@ diff -urNp linux-2.6.32.13/include/net/udp.h linux-2.6.32.13/include/net/udp.h
  	struct file_operations	seq_fops;
  	struct seq_operations	seq_ops;
  };
-diff -urNp linux-2.6.32.13/include/sound/ac97_codec.h linux-2.6.32.13/include/sound/ac97_codec.h
---- linux-2.6.32.13/include/sound/ac97_codec.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/sound/ac97_codec.h	2010-05-15 13:21:17.956129899 -0400
+diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
+index 4940045..b90d681 100644
+--- a/include/sound/ac97_codec.h
++++ b/include/sound/ac97_codec.h
 @@ -419,15 +419,15 @@
  struct snd_ac97;
  
@@ -47257,9 +48602,10 @@ diff -urNp linux-2.6.32.13/include/sound/ac97_codec.h linux-2.6.32.13/include/so
  	void *private_data;
  	void (*private_free) (struct snd_ac97 *ac97);
  	/* --- */
-diff -urNp linux-2.6.32.13/include/trace/events/irq.h linux-2.6.32.13/include/trace/events/irq.h
---- linux-2.6.32.13/include/trace/events/irq.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/trace/events/irq.h	2010-05-15 13:21:17.956129899 -0400
+diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
+index 0e4cfb6..8b183dc 100644
+--- a/include/trace/events/irq.h
++++ b/include/trace/events/irq.h
 @@ -34,7 +34,7 @@
   */
  TRACE_EVENT(irq_handler_entry,
@@ -47278,27 +48624,37 @@ diff -urNp linux-2.6.32.13/include/trace/events/irq.h linux-2.6.32.13/include/tr
  
  	TP_ARGS(irq, action, ret),
  
-@@ -95,7 +95,7 @@ TRACE_EVENT(irq_handler_exit,
-  */
- TRACE_EVENT(softirq_entry,
+@@ -84,7 +84,7 @@ TRACE_EVENT(irq_handler_exit,
+ 
+ DECLARE_EVENT_CLASS(softirq,
  
 -	TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
 +	TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
  
  	TP_ARGS(h, vec),
  
-@@ -124,7 +124,7 @@ TRACE_EVENT(softirq_entry,
+@@ -113,7 +113,7 @@ DECLARE_EVENT_CLASS(softirq,
   */
- TRACE_EVENT(softirq_exit,
+ DEFINE_EVENT(softirq, softirq_entry,
  
 -	TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
 +	TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
  
- 	TP_ARGS(h, vec),
+ 	TP_ARGS(h, vec)
+ );
+@@ -131,7 +131,7 @@ DEFINE_EVENT(softirq, softirq_entry,
+  */
+ DEFINE_EVENT(softirq, softirq_exit,
  
-diff -urNp linux-2.6.32.13/include/video/uvesafb.h linux-2.6.32.13/include/video/uvesafb.h
---- linux-2.6.32.13/include/video/uvesafb.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/include/video/uvesafb.h	2010-05-15 13:21:17.956129899 -0400
+-	TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
++	TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
+ 
+ 	TP_ARGS(h, vec)
+ );
+diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
+index 0993a22..32ba2fe 100644
+--- a/include/video/uvesafb.h
++++ b/include/video/uvesafb.h
 @@ -177,6 +177,7 @@ struct uvesafb_par {
  	u8 ypan;			/* 0 - nothing, 1 - ypan, 2 - ywrap */
  	u8 pmi_setpal;			/* PMI for palette changes */
@@ -47307,10 +48663,24 @@ diff -urNp linux-2.6.32.13/include/video/uvesafb.h linux-2.6.32.13/include/video
  	void *pmi_start;
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
-diff -urNp linux-2.6.32.13/init/do_mounts.c linux-2.6.32.13/init/do_mounts.c
---- linux-2.6.32.13/init/do_mounts.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/init/do_mounts.c	2010-05-15 13:21:17.956129899 -0400
-@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
+diff --git a/init/Kconfig b/init/Kconfig
+index 5cff9a9..7453f4e 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1063,7 +1063,7 @@ config SLUB_DEBUG
+ 
+ config COMPAT_BRK
+ 	bool "Disable heap randomization"
+-	default y
++	default n
+ 	help
+ 	  Randomizing heap placement makes heap exploits harder, but it
+ 	  also breaks ancient binaries (including anything libc5 based).
+diff --git a/init/do_mounts.c b/init/do_mounts.c
+index 02e3ca4..022ecb7 100644
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -217,11 +217,11 @@ static void __init get_fs_names(char *page)
  
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
  {
@@ -47324,7 +48694,7 @@ diff -urNp linux-2.6.32.13/init/do_mounts.c linux-2.6.32.13/init/do_mounts.c
  	ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
  	printk("VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
  	       current->fs->pwd.mnt->mnt_sb->s_type->name,
-@@ -311,18 +311,18 @@ void __init change_floppy(char *fmt, ...
+@@ -312,18 +312,18 @@ void __init change_floppy(char *fmt, ...)
  	va_start(args, fmt);
  	vsprintf(buf, fmt, args);
  	va_end(args);
@@ -47336,7 +48706,7 @@ diff -urNp linux-2.6.32.13/init/do_mounts.c linux-2.6.32.13/init/do_mounts.c
  	}
  	printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
 -	fd = sys_open("/dev/console", O_RDWR, 0);
-+	fd = sys_open((char __user *)"/dev/console", O_RDWR, 0);
++	fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
  	if (fd >= 0) {
  		sys_ioctl(fd, TCGETS, (long)&termios);
  		termios.c_lflag &= ~ICANON;
@@ -47346,7 +48716,7 @@ diff -urNp linux-2.6.32.13/init/do_mounts.c linux-2.6.32.13/init/do_mounts.c
  		termios.c_lflag |= ICANON;
  		sys_ioctl(fd, TCSETSF, (long)&termios);
  		sys_close(fd);
-@@ -416,6 +416,6 @@ void __init prepare_namespace(void)
+@@ -417,6 +417,6 @@ void __init prepare_namespace(void)
  	mount_root();
  out:
  	devtmpfs_mount("dev");
@@ -47355,9 +48725,10 @@ diff -urNp linux-2.6.32.13/init/do_mounts.c linux-2.6.32.13/init/do_mounts.c
 +	sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
 +	sys_chroot((__force char __user *)".");
  }
-diff -urNp linux-2.6.32.13/init/do_mounts.h linux-2.6.32.13/init/do_mounts.h
---- linux-2.6.32.13/init/do_mounts.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/init/do_mounts.h	2010-05-15 13:21:18.018620095 -0400
+diff --git a/init/do_mounts.h b/init/do_mounts.h
+index f5b978a..1228092 100644
+--- a/init/do_mounts.h
++++ b/init/do_mounts.h
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
@@ -47377,19 +48748,11 @@ diff -urNp linux-2.6.32.13/init/do_mounts.h linux-2.6.32.13/init/do_mounts.h
  		return 0;
  	if (!S_ISBLK(stat.st_mode))
  		return 0;
-diff -urNp linux-2.6.32.13/init/do_mounts_initrd.c linux-2.6.32.13/init/do_mounts_initrd.c
---- linux-2.6.32.13/init/do_mounts_initrd.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/init/do_mounts_initrd.c	2010-05-15 13:21:18.018620095 -0400
-@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
- 	sys_close(old_fd);sys_close(root_fd);
- 	sys_close(0);sys_close(1);sys_close(2);
- 	sys_setsid();
--	(void) sys_open("/dev/console",O_RDWR,0);
-+	(void) sys_open((__force const char __user *)"/dev/console",O_RDWR,0);
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
- 	return kernel_execve(shell, argv, envp_init);
-@@ -47,13 +47,13 @@ static void __init handle_initrd(void)
+diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
+index 2b10853..c566a9f 100644
+--- a/init/do_mounts_initrd.c
++++ b/init/do_mounts_initrd.c
+@@ -43,13 +43,13 @@ static void __init handle_initrd(void)
  	create_dev("/dev/root.old", Root_RAM0);
  	/* mount initrd on rootfs' /root */
  	mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
@@ -47409,7 +48772,7 @@ diff -urNp linux-2.6.32.13/init/do_mounts_initrd.c linux-2.6.32.13/init/do_mount
  
  	/*
  	 * In case that a resume from disk is carried out by linuxrc or one of
-@@ -70,15 +70,15 @@ static void __init handle_initrd(void)
+@@ -66,15 +66,15 @@ static void __init handle_initrd(void)
  
  	/* move initrd to rootfs' /old */
  	sys_fchdir(old_fd);
@@ -47428,7 +48791,7 @@ diff -urNp linux-2.6.32.13/init/do_mounts_initrd.c linux-2.6.32.13/init/do_mount
  		return;
  	}
  
-@@ -86,17 +86,17 @@ static void __init handle_initrd(void)
+@@ -82,17 +82,17 @@ static void __init handle_initrd(void)
  	mount_root();
  
  	printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
@@ -47449,7 +48812,7 @@ diff -urNp linux-2.6.32.13/init/do_mounts_initrd.c linux-2.6.32.13/init/do_mount
  		printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
  		if (fd < 0) {
  			error = fd;
-@@ -119,11 +119,11 @@ int __init initrd_load(void)
+@@ -115,11 +115,11 @@ int __init initrd_load(void)
  		 * mounted in the normal path.
  		 */
  		if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
@@ -47463,9 +48826,10 @@ diff -urNp linux-2.6.32.13/init/do_mounts_initrd.c linux-2.6.32.13/init/do_mount
 +	sys_unlink((__force const char __user *)"/initrd.image");
  	return 0;
  }
-diff -urNp linux-2.6.32.13/init/do_mounts_md.c linux-2.6.32.13/init/do_mounts_md.c
---- linux-2.6.32.13/init/do_mounts_md.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/init/do_mounts_md.c	2010-05-15 13:21:18.018620095 -0400
+diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
+index 69aebbf..be2f9ee 100644
+--- a/init/do_mounts_md.c
++++ b/init/do_mounts_md.c
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
  			partitioned ? "_d" : "", minor,
  			md_setup_args[ent].device_names);
@@ -47493,9 +48857,10 @@ diff -urNp linux-2.6.32.13/init/do_mounts_md.c linux-2.6.32.13/init/do_mounts_md
  	if (fd >= 0) {
  		sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
  		sys_close(fd);
-diff -urNp linux-2.6.32.13/init/initramfs.c linux-2.6.32.13/init/initramfs.c
---- linux-2.6.32.13/init/initramfs.c	2010-05-15 13:20:19.362999772 -0400
-+++ linux-2.6.32.13/init/initramfs.c	2010-05-15 13:21:18.018620095 -0400
+diff --git a/init/initramfs.c b/init/initramfs.c
+index 4b9c202..fa9e328 100644
+--- a/init/initramfs.c
++++ b/init/initramfs.c
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
  	}
  }
@@ -47523,7 +48888,7 @@ diff -urNp linux-2.6.32.13/init/initramfs.c linux-2.6.32.13/init/initramfs.c
  	}
  	return 0;
  }
-@@ -280,11 +280,11 @@ static void __init clean_path(char *path
+@@ -280,11 +280,11 @@ static void __init clean_path(char *path, mode_t mode)
  {
  	struct stat st;
  
@@ -47604,34 +48969,11 @@ diff -urNp linux-2.6.32.13/init/initramfs.c linux-2.6.32.13/init/initramfs.c
  	state = SkipIt;
  	next_state = Reset;
  	return 0;
-diff -urNp linux-2.6.32.13/init/Kconfig linux-2.6.32.13/init/Kconfig
---- linux-2.6.32.13/init/Kconfig	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/init/Kconfig	2010-05-15 13:21:18.034611512 -0400
-@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
- 
- config COMPAT_BRK
- 	bool "Disable heap randomization"
--	default y
-+	default n
- 	help
- 	  Randomizing heap placement makes heap exploits harder, but it
- 	  also breaks ancient binaries (including anything libc5 based).
-@@ -1116,9 +1116,9 @@ config HAVE_GENERIC_DMA_COHERENT
- 
- config SLABINFO
- 	bool
--	depends on PROC_FS
-+	depends on PROC_FS && !GRKERNSEC_PROC_ADD
- 	depends on SLAB || SLUB_DEBUG
--	default y
-+	default n
- 
- config RT_MUTEXES
- 	boolean
-diff -urNp linux-2.6.32.13/init/main.c linux-2.6.32.13/init/main.c
---- linux-2.6.32.13/init/main.c	2010-04-04 20:41:50.060586306 -0400
-+++ linux-2.6.32.13/init/main.c	2010-05-15 13:21:18.034611512 -0400
-@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 
+diff --git a/init/main.c b/init/main.c
+index a42fdf4..259082d 100644
+--- a/init/main.c
++++ b/init/main.c
+@@ -98,6 +98,7 @@ static inline void mark_rodata_ro(void) { }
  #ifdef CONFIG_TC
  extern void tc_init(void);
  #endif
@@ -47639,14 +48981,14 @@ diff -urNp linux-2.6.32.13/init/main.c linux-2.6.32.13/init/main.c
  
  enum system_states system_state __read_mostly;
  EXPORT_SYMBOL(system_state);
-@@ -183,6 +184,50 @@ static int __init set_reset_devices(char
+@@ -200,6 +201,47 @@ static int __init set_reset_devices(char *str)
  
  __setup("reset_devices", set_reset_devices);
  
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +extern void pax_enter_kernel_user(void);
 +extern void pax_exit_kernel_user(void);
-+extern pteval_t clone_pgd_mask;
++extern pgdval_t clone_pgd_mask;
 +#endif
 +
 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
@@ -47663,12 +49005,9 @@ diff -urNp linux-2.6.32.13/init/main.c linux-2.6.32.13/init/main.c
 +	asm("mov %0, %%es" : : "r" (__KERNEL_DS) : "memory");
 +	asm("mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
 +#else
-+	char *p;
-+	p = (char *)pax_enter_kernel_user;
-+	*p = 0xc3;
-+	p = (char *)pax_exit_kernel_user;
-+	*p = 0xc3;
-+	clone_pgd_mask = ~(pteval_t)0UL;
++	memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
++	memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
++	clone_pgd_mask = ~(pgdval_t)0UL;
 +#endif
 +
 +	return 0;
@@ -47690,7 +49029,7 @@ diff -urNp linux-2.6.32.13/init/main.c linux-2.6.32.13/init/main.c
  static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
  char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
  static const char *panic_later, *panic_param;
-@@ -697,52 +742,53 @@ int initcall_debug;
+@@ -725,52 +767,53 @@ int initcall_debug;
  core_param(initcall_debug, initcall_debug, bool, 0644);
  
  static char msgbuf[64];
@@ -47760,7 +49099,16 @@ diff -urNp linux-2.6.32.13/init/main.c linux-2.6.32.13/init/main.c
  }
  
  
-@@ -881,11 +927,13 @@ static int __init kernel_init(void * unu
+@@ -902,7 +945,7 @@ static int __init kernel_init(void * unused)
+ 	do_basic_setup();
+ 
+ 	/* Open the /dev/console on the rootfs, this should never fail */
+-	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
++	if (sys_open((__force const char __user *) "/dev/console", O_RDWR, 0) < 0)
+ 		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
+ 
+ 	(void) sys_dup(0);
+@@ -915,11 +958,13 @@ static int __init kernel_init(void * unused)
  	if (!ramdisk_execute_command)
  		ramdisk_execute_command = "/init";
  
@@ -47775,10 +49123,11 @@ diff -urNp linux-2.6.32.13/init/main.c linux-2.6.32.13/init/main.c
  	/*
  	 * Ok, we have completed the initial bootup, and
  	 * we're essentially up and running. Get rid of the
-diff -urNp linux-2.6.32.13/init/noinitramfs.c linux-2.6.32.13/init/noinitramfs.c
---- linux-2.6.32.13/init/noinitramfs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/init/noinitramfs.c	2010-05-15 13:21:18.034611512 -0400
-@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
+diff --git a/init/noinitramfs.c b/init/noinitramfs.c
+index f4c1a3a..8dcf3cc 100644
+--- a/init/noinitramfs.c
++++ b/init/noinitramfs.c
+@@ -29,17 +29,17 @@ static int __init default_rootfs(void)
  {
  	int err;
  
@@ -47787,7 +49136,10 @@ diff -urNp linux-2.6.32.13/init/noinitramfs.c linux-2.6.32.13/init/noinitramfs.c
  	if (err < 0)
  		goto out;
  
-@@ -39,7 +39,7 @@ static int __init default_rootfs(void)
+-	err = sys_mknod((const char __user *) "/dev/console",
++	err = sys_mknod((__force const char __user *) "/dev/console",
+ 			S_IFCHR | S_IRUSR | S_IWUSR,
+ 			new_encode_dev(MKDEV(5, 1)));
  	if (err < 0)
  		goto out;
  
@@ -47796,31 +49148,11 @@ diff -urNp linux-2.6.32.13/init/noinitramfs.c linux-2.6.32.13/init/noinitramfs.c
  	if (err < 0)
  		goto out;
  
-diff -urNp linux-2.6.32.13/ipc/ipc_sysctl.c linux-2.6.32.13/ipc/ipc_sysctl.c
---- linux-2.6.32.13/ipc/ipc_sysctl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/ipc/ipc_sysctl.c	2010-05-15 13:21:18.060013842 -0400
-@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
- 		.extra1		= &zero,
- 		.extra2		= &one,
- 	},
--	{}
-+	{ 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL }
- };
- 
- static struct ctl_table ipc_root_table[] = {
-@@ -277,7 +277,7 @@ static struct ctl_table ipc_root_table[]
- 		.mode		= 0555,
- 		.child		= ipc_kern_table,
- 	},
--	{}
-+	{ 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL }
- };
- 
- static int __init ipc_sysctl_init(void)
-diff -urNp linux-2.6.32.13/ipc/mqueue.c linux-2.6.32.13/ipc/mqueue.c
---- linux-2.6.32.13/ipc/mqueue.c	2010-04-04 20:41:50.060586306 -0400
-+++ linux-2.6.32.13/ipc/mqueue.c	2010-05-15 13:21:18.060013842 -0400
-@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
+diff --git a/ipc/mqueue.c b/ipc/mqueue.c
+index c93fd3f..1e684a5 100644
+--- a/ipc/mqueue.c
++++ b/ipc/mqueue.c
+@@ -153,6 +153,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
  			mq_bytes = (mq_msg_tblsz +
  				(info->attr.mq_maxmsg * info->attr.mq_msgsize));
  
@@ -47828,10 +49160,24 @@ diff -urNp linux-2.6.32.13/ipc/mqueue.c linux-2.6.32.13/ipc/mqueue.c
  			spin_lock(&mq_lock);
  			if (u->mq_bytes + mq_bytes < u->mq_bytes ||
  		 	    u->mq_bytes + mq_bytes >
-diff -urNp linux-2.6.32.13/ipc/shm.c linux-2.6.32.13/ipc/shm.c
---- linux-2.6.32.13/ipc/shm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/ipc/shm.c	2010-05-15 13:21:18.060013842 -0400
-@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
+diff --git a/ipc/sem.c b/ipc/sem.c
+index 40a8f46..0e0d49b 100644
+--- a/ipc/sem.c
++++ b/ipc/sem.c
+@@ -743,6 +743,8 @@ static unsigned long copy_semid_to_user(void __user *buf, struct semid64_ds *in,
+ 	    {
+ 		struct semid_ds out;
+ 
++		memset(&out, 0, sizeof(out));
++
+ 		ipc64_perm_to_ipc_perm(&in->sem_perm, &out.sem_perm);
+ 
+ 		out.sem_otime	= in->sem_otime;
+diff --git a/ipc/shm.c b/ipc/shm.c
+index b427380..3516324 100644
+--- a/ipc/shm.c
++++ b/ipc/shm.c
+@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
  static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
  #endif
  
@@ -47846,7 +49192,7 @@ diff -urNp linux-2.6.32.13/ipc/shm.c linux-2.6.32.13/ipc/shm.c
  void shm_init_ns(struct ipc_namespace *ns)
  {
  	ns->shm_ctlmax = SHMMAX;
-@@ -396,6 +404,14 @@ static int newseg(struct ipc_namespace *
+@@ -395,6 +403,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
  	shp->shm_lprid = 0;
  	shp->shm_atim = shp->shm_dtim = 0;
  	shp->shm_ctim = get_seconds();
@@ -47861,7 +49207,7 @@ diff -urNp linux-2.6.32.13/ipc/shm.c linux-2.6.32.13/ipc/shm.c
  	shp->shm_segsz = size;
  	shp->shm_nattch = 0;
  	shp->shm_file = file;
-@@ -879,9 +895,21 @@ long do_shmat(int shmid, char __user *sh
+@@ -878,9 +894,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
  	if (err)
  		goto out_unlock;
  
@@ -47874,8 +49220,8 @@ diff -urNp linux-2.6.32.13/ipc/shm.c linux-2.6.32.13/ipc/shm.c
 +	}
 +#endif
 +
- 	path.dentry = dget(shp->shm_file->f_path.dentry);
- 	path.mnt    = shp->shm_file->f_path.mnt;
+ 	path = shp->shm_file->f_path;
+ 	path_get(&path);
  	shp->shm_nattch++;
 +#ifdef CONFIG_GRKERNSEC
 +	shp->shm_lapid = current->pid;
@@ -47883,10 +49229,11 @@ diff -urNp linux-2.6.32.13/ipc/shm.c linux-2.6.32.13/ipc/shm.c
  	size = i_size_read(path.dentry->d_inode);
  	shm_unlock(shp);
  
-diff -urNp linux-2.6.32.13/kernel/acct.c linux-2.6.32.13/kernel/acct.c
---- linux-2.6.32.13/kernel/acct.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/acct.c	2010-05-15 13:21:18.060013842 -0400
-@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
+diff --git a/kernel/acct.c b/kernel/acct.c
+index 385b884..ef679fd 100644
+--- a/kernel/acct.c
++++ b/kernel/acct.c
+@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
  	 */
  	flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
  	current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
@@ -47895,35 +49242,59 @@ diff -urNp linux-2.6.32.13/kernel/acct.c linux-2.6.32.13/kernel/acct.c
  			       sizeof(acct_t), &file->f_pos);
  	current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
  	set_fs(fs);
-diff -urNp linux-2.6.32.13/kernel/capability.c linux-2.6.32.13/kernel/capability.c
---- linux-2.6.32.13/kernel/capability.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/capability.c	2010-05-15 13:21:18.079122751 -0400
-@@ -306,10 +306,21 @@ int capable(int cap)
+diff --git a/kernel/capability.c b/kernel/capability.c
+index 2f05303..768ad88 100644
+--- a/kernel/capability.c
++++ b/kernel/capability.c
+@@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
+ 		 * before modification is attempted and the application
+ 		 * fails.
+ 		 */
++		if (tocopy > ARRAY_SIZE(kdata))
++			return -EFAULT;
++
+ 		if (copy_to_user(dataptr, kdata, tocopy
+ 				 * sizeof(struct __user_cap_data_struct))) {
+ 			return -EFAULT;
+@@ -306,10 +309,21 @@ int capable(int cap)
  		BUG();
  	}
  
 -	if (security_capable(cap) == 0) {
 +	if (security_capable(cap) == 0 && gr_is_capable(cap)) {
- 		current->flags |= PF_SUPERPRIV;
- 		return 1;
- 	}
- 	return 0;
- }
-+
-+int capable_nolog(int cap)
-+{
-+	if (security_capable(cap) == 0 && gr_is_capable_nolog(cap)) {
 +		current->flags |= PF_SUPERPRIV;
 +		return 1;
 +	}
 +	return 0;
 +}
 +
++int capable_nolog(int cap)
++{
++	if (security_capable(cap) == 0 && gr_is_capable_nolog(cap)) {
+ 		current->flags |= PF_SUPERPRIV;
+ 		return 1;
+ 	}
+ 	return 0;
+ }
++
  EXPORT_SYMBOL(capable);
 +EXPORT_SYMBOL(capable_nolog);
-diff -urNp linux-2.6.32.13/kernel/configs.c linux-2.6.32.13/kernel/configs.c
---- linux-2.6.32.13/kernel/configs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/configs.c	2010-05-15 13:21:18.079122751 -0400
+diff --git a/kernel/compat.c b/kernel/compat.c
+index 91b33fb..38001b5 100644
+--- a/kernel/compat.c
++++ b/kernel/compat.c
+@@ -13,6 +13,7 @@
+ 
+ #include <linux/linkage.h>
+ #include <linux/compat.h>
++#include <linux/module.h>
+ #include <linux/errno.h>
+ #include <linux/time.h>
+ #include <linux/signal.h>
+diff --git a/kernel/configs.c b/kernel/configs.c
+index abaee68..047facd 100644
+--- a/kernel/configs.c
++++ b/kernel/configs.c
 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
  	struct proc_dir_entry *entry;
  
@@ -47944,22 +49315,11 @@ diff -urNp linux-2.6.32.13/kernel/configs.c linux-2.6.32.13/kernel/configs.c
  	if (!entry)
  		return -ENOMEM;
  
-diff -urNp linux-2.6.32.13/kernel/cpu.c linux-2.6.32.13/kernel/cpu.c
---- linux-2.6.32.13/kernel/cpu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/cpu.c	2010-05-15 13:21:18.079122751 -0400
-@@ -19,7 +19,7 @@
- /* Serializes the updates to cpu_online_mask, cpu_present_mask */
- static DEFINE_MUTEX(cpu_add_remove_lock);
- 
--static __cpuinitdata RAW_NOTIFIER_HEAD(cpu_chain);
-+static RAW_NOTIFIER_HEAD(cpu_chain);
- 
- /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
-  * Should always be manipulated under cpu_add_remove_lock
-diff -urNp linux-2.6.32.13/kernel/cred.c linux-2.6.32.13/kernel/cred.c
---- linux-2.6.32.13/kernel/cred.c	2010-05-15 13:20:19.362999772 -0400
-+++ linux-2.6.32.13/kernel/cred.c	2010-05-15 13:21:18.079122751 -0400
-@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
+diff --git a/kernel/cred.c b/kernel/cred.c
+index 60bc8b1..e04b039 100644
+--- a/kernel/cred.c
++++ b/kernel/cred.c
+@@ -489,6 +489,8 @@ int commit_creds(struct cred *new)
  
  	get_cred(new); /* we will require a ref for the subj creds too */
  
@@ -47968,12 +49328,66 @@ diff -urNp linux-2.6.32.13/kernel/cred.c linux-2.6.32.13/kernel/cred.c
  	/* dumpability changes */
  	if (old->euid != new->euid ||
  	    old->egid != new->egid ||
-diff -urNp linux-2.6.32.13/kernel/exit.c linux-2.6.32.13/kernel/exit.c
---- linux-2.6.32.13/kernel/exit.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/exit.c	2010-05-15 13:21:18.103069718 -0400
+diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
+index 8bc5eef..2e0e738 100644
+--- a/kernel/debug/debug_core.c
++++ b/kernel/debug/debug_core.c
+@@ -71,7 +71,7 @@ int			kgdb_io_module_registered;
+ /* Guard for recursive entry */
+ static int			exception_level;
+ 
+-struct kgdb_io		*dbg_io_ops;
++const struct kgdb_io		*dbg_io_ops;
+ static DEFINE_SPINLOCK(kgdb_registration_lock);
+ 
+ /* kgdb console driver is loaded */
+@@ -871,7 +871,7 @@ static void kgdb_initial_breakpoint(void)
+  *
+  *	Register it with the KGDB core.
+  */
+-int kgdb_register_io_module(struct kgdb_io *new_dbg_io_ops)
++int kgdb_register_io_module(const struct kgdb_io *new_dbg_io_ops)
+ {
+ 	int err;
+ 
+@@ -916,7 +916,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_module);
+  *
+  *	Unregister it with the KGDB core.
+  */
+-void kgdb_unregister_io_module(struct kgdb_io *old_dbg_io_ops)
++void kgdb_unregister_io_module(const struct kgdb_io *old_dbg_io_ops)
+ {
+ 	BUG_ON(kgdb_connected);
+ 
+diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
+index ebe4a28..19a35f3 100644
+--- a/kernel/debug/kdb/kdb_main.c
++++ b/kernel/debug/kdb/kdb_main.c
+@@ -1872,7 +1872,7 @@ static int kdb_lsmod(int argc, const char **argv)
+ 	list_for_each_entry(mod, kdb_modules, list) {
+ 
+ 		kdb_printf("%-20s%8u  0x%p ", mod->name,
+-			   mod->core_size, (void *)mod);
++			   mod->core_size_rx + mod->core_size_rw, (void *)mod);
+ #ifdef CONFIG_MODULE_UNLOAD
+ 		kdb_printf("%4d ", module_refcount(mod));
+ #endif
+@@ -1882,7 +1882,7 @@ static int kdb_lsmod(int argc, const char **argv)
+ 			kdb_printf(" (Loading)");
+ 		else
+ 			kdb_printf(" (Live)");
+-		kdb_printf(" 0x%p", mod->module_core);
++		kdb_printf(" 0x%p 0x%p", mod->module_core_rx,  mod->module_core_rw);
+ 
+ #ifdef CONFIG_MODULE_UNLOAD
+ 		{
+diff --git a/kernel/exit.c b/kernel/exit.c
+index d1e6789..db62916 100644
+--- a/kernel/exit.c
++++ b/kernel/exit.c
 @@ -56,6 +56,10 @@
+ #include <asm/pgtable.h>
  #include <asm/mmu_context.h>
- #include "cred-internals.h"
  
 +#ifdef CONFIG_GRKERNSEC
 +extern rwlock_t grsec_exec_file_lock;
@@ -47981,8 +49395,8 @@ diff -urNp linux-2.6.32.13/kernel/exit.c linux-2.6.32.13/kernel/exit.c
 +
  static void exit_mm(struct task_struct * tsk);
  
- static void __unhash_process(struct task_struct *p)
-@@ -167,6 +171,8 @@ void release_task(struct task_struct * p
+ static void __unhash_process(struct task_struct *p, bool group_dead)
+@@ -162,6 +166,8 @@ void release_task(struct task_struct * p)
  	struct task_struct *leader;
  	int zap_leader;
  repeat:
@@ -47990,8 +49404,8 @@ diff -urNp linux-2.6.32.13/kernel/exit.c linux-2.6.32.13/kernel/exit.c
 +
  	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 */
-@@ -334,11 +340,22 @@ static void reparent_to_kthreadd(void)
+ 	 * can't be modifying its own credentials. But shut RCU-lockdep up */
+@@ -331,11 +337,22 @@ static void reparent_to_kthreadd(void)
  {
  	write_lock_irq(&tasklist_lock);
  
@@ -48014,7 +49428,7 @@ diff -urNp linux-2.6.32.13/kernel/exit.c linux-2.6.32.13/kernel/exit.c
  	/* Set the exit signal to SIGCHLD so we signal init on exit */
  	current->exit_signal = SIGCHLD;
  
-@@ -390,7 +407,7 @@ int allow_signal(int sig)
+@@ -387,7 +404,7 @@ int allow_signal(int sig)
  	 * know it'll be handled, so that they don't get converted to
  	 * SIGKILL or just silently dropped.
  	 */
@@ -48023,7 +49437,7 @@ diff -urNp linux-2.6.32.13/kernel/exit.c linux-2.6.32.13/kernel/exit.c
  	recalc_sigpending();
  	spin_unlock_irq(&current->sighand->siglock);
  	return 0;
-@@ -426,6 +443,17 @@ void daemonize(const char *name, ...)
+@@ -423,6 +440,17 @@ void daemonize(const char *name, ...)
  	vsnprintf(current->comm, sizeof(current->comm), name, args);
  	va_end(args);
  
@@ -48041,7 +49455,7 @@ diff -urNp linux-2.6.32.13/kernel/exit.c linux-2.6.32.13/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
-@@ -957,6 +985,9 @@ NORET_TYPE void do_exit(long code)
+@@ -969,6 +997,9 @@ NORET_TYPE void do_exit(long code)
  	tsk->exit_code = code;
  	taskstats_exit(tsk, group_dead);
  
@@ -48051,19 +49465,11 @@ diff -urNp linux-2.6.32.13/kernel/exit.c linux-2.6.32.13/kernel/exit.c
  	exit_mm(tsk);
  
  	if (group_dead)
-@@ -1172,7 +1203,7 @@ static int wait_task_zombie(struct wait_
- 
- 	if (unlikely(wo->wo_flags & WNOWAIT)) {
- 		int exit_code = p->exit_code;
--		int why, status;
-+		int why;
- 
- 		get_task_struct(p);
- 		read_unlock(&tasklist_lock);
-diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c
---- linux-2.6.32.13/kernel/fork.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/fork.c	2010-05-15 13:21:18.103069718 -0400
-@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
+diff --git a/kernel/fork.c b/kernel/fork.c
+index e96c0cd..a0bb859 100644
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -276,7 +276,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
  	*stackend = STACK_END_MAGIC;	/* for overflow detection */
  
  #ifdef CONFIG_CC_STACKPROTECTOR
@@ -48072,7 +49478,88 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c
  #endif
  
  	/* One for us, one for whoever does the "release_task()" (usually parent) */
-@@ -293,8 +293,8 @@ static int dup_mmap(struct mm_struct *mm
+@@ -298,13 +298,78 @@ out:
+ }
+ 
+ #ifdef CONFIG_MMU
++static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct vm_area_struct *mpnt)
++{
++	struct vm_area_struct *tmp;
++	unsigned long charge;
++	struct mempolicy *pol;
++	struct file *file;
++
++	charge = 0;
++	if (mpnt->vm_flags & VM_ACCOUNT) {
++		unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
++		if (security_vm_enough_memory(len))
++			goto fail_nomem;
++		charge = len;
++	}
++	tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
++	if (!tmp)
++		goto fail_nomem;
++	*tmp = *mpnt;
++	tmp->vm_mm = mm;
++	INIT_LIST_HEAD(&tmp->anon_vma_chain);
++	pol = mpol_dup(vma_policy(mpnt));
++	if (IS_ERR(pol))
++		goto fail_nomem_policy;
++	vma_set_policy(tmp, pol);
++	if (anon_vma_fork(tmp, mpnt))
++		goto fail_nomem_anon_vma_fork;
++	tmp->vm_flags &= ~VM_LOCKED;
++	tmp->vm_next = tmp->vm_prev = NULL;
++	tmp->vm_mirror = NULL;
++	file = tmp->vm_file;
++	if (file) {
++		struct inode *inode = file->f_path.dentry->d_inode;
++		struct address_space *mapping = file->f_mapping;
++
++		get_file(file);
++		if (tmp->vm_flags & VM_DENYWRITE)
++			atomic_dec(&inode->i_writecount);
++		spin_lock(&mapping->i_mmap_lock);
++		if (tmp->vm_flags & VM_SHARED)
++			mapping->i_mmap_writable++;
++		tmp->vm_truncate_count = mpnt->vm_truncate_count;
++		flush_dcache_mmap_lock(mapping);
++		/* insert tmp into the share list, just after mpnt */
++		vma_prio_tree_add(tmp, mpnt);
++		flush_dcache_mmap_unlock(mapping);
++		spin_unlock(&mapping->i_mmap_lock);
++	}
++
++	/*
++	 * Clear hugetlb-related page reserves for children. This only
++	 * affects MAP_PRIVATE mappings. Faults generated by the child
++	 * are not guaranteed to succeed, even if read-only
++	 */
++	if (is_vm_hugetlb_page(tmp))
++		reset_vma_resv_huge_pages(tmp);
++
++	return tmp;
++
++fail_nomem_anon_vma_fork:
++	mpol_put(pol);
++fail_nomem_policy:
++	kmem_cache_free(vm_area_cachep, tmp);
++fail_nomem:
++	vm_unacct_memory(charge);
++	return NULL;
++}
++
+ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+ {
+ 	struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
+ 	struct rb_node **rb_link, *rb_parent;
+ 	int retval;
+-	unsigned long charge;
+-	struct mempolicy *pol;
+ 
+ 	down_write(&oldmm->mmap_sem);
+ 	flush_cache_dup_mm(oldmm);
+@@ -316,8 +381,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
  	mm->locked_vm = 0;
  	mm->mmap = NULL;
  	mm->mmap_cache = NULL;
@@ -48083,15 +49570,77 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c
  	mm->map_count = 0;
  	cpumask_clear(mm_cpumask(mm));
  	mm->mm_rb = RB_ROOT;
-@@ -334,6 +334,7 @@ static int dup_mmap(struct mm_struct *mm
- 		tmp->vm_flags &= ~VM_LOCKED;
- 		tmp->vm_mm = mm;
- 		tmp->vm_next = NULL;
-+		tmp->vm_mirror = NULL;
- 		anon_vma_link(tmp);
- 		file = tmp->vm_file;
- 		if (file) {
-@@ -381,6 +382,31 @@ static int dup_mmap(struct mm_struct *mm
+@@ -330,8 +395,6 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+ 
+ 	prev = NULL;
+ 	for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
+-		struct file *file;
+-
+ 		if (mpnt->vm_flags & VM_DONTCOPY) {
+ 			long pages = vma_pages(mpnt);
+ 			mm->total_vm -= pages;
+@@ -339,56 +402,13 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+ 								-pages);
+ 			continue;
+ 		}
+-		charge = 0;
+-		if (mpnt->vm_flags & VM_ACCOUNT) {
+-			unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
+-			if (security_vm_enough_memory(len))
+-				goto fail_nomem;
+-			charge = len;
+-		}
+-		tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
+-		if (!tmp)
+-			goto fail_nomem;
+-		*tmp = *mpnt;
+-		INIT_LIST_HEAD(&tmp->anon_vma_chain);
+-		pol = mpol_dup(vma_policy(mpnt));
+-		retval = PTR_ERR(pol);
+-		if (IS_ERR(pol))
+-			goto fail_nomem_policy;
+-		vma_set_policy(tmp, pol);
+-		if (anon_vma_fork(tmp, mpnt))
+-			goto fail_nomem_anon_vma_fork;
+-		tmp->vm_flags &= ~VM_LOCKED;
+-		tmp->vm_mm = mm;
+-		tmp->vm_next = tmp->vm_prev = NULL;
+-		file = tmp->vm_file;
+-		if (file) {
+-			struct inode *inode = file->f_path.dentry->d_inode;
+-			struct address_space *mapping = file->f_mapping;
+-
+-			get_file(file);
+-			if (tmp->vm_flags & VM_DENYWRITE)
+-				atomic_dec(&inode->i_writecount);
+-			spin_lock(&mapping->i_mmap_lock);
+-			if (tmp->vm_flags & VM_SHARED)
+-				mapping->i_mmap_writable++;
+-			tmp->vm_truncate_count = mpnt->vm_truncate_count;
+-			flush_dcache_mmap_lock(mapping);
+-			/* insert tmp into the share list, just after mpnt */
+-			vma_prio_tree_add(tmp, mpnt);
+-			flush_dcache_mmap_unlock(mapping);
+-			spin_unlock(&mapping->i_mmap_lock);
++		tmp = dup_vma(mm, mpnt);
++		if (!tmp) {
++			retval = -ENOMEM;
++			goto out;
+ 		}
+ 
+ 		/*
+-		 * Clear hugetlb-related page reserves for children. This only
+-		 * affects MAP_PRIVATE mappings. Faults generated by the child
+-		 * are not guaranteed to succeed, even if read-only
+-		 */
+-		if (is_vm_hugetlb_page(tmp))
+-			reset_vma_resv_huge_pages(tmp);
+-
+-		/*
+ 		 * Link in the new vma and copy the page table entries.
+ 		 */
+ 		*pprev = tmp;
+@@ -409,6 +429,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
  		if (retval)
  			goto out;
  	}
@@ -48123,7 +49672,22 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c
  	/* a new mm has just been created */
  	arch_dup_mmap(oldmm, mm);
  	retval = 0;
-@@ -731,7 +757,7 @@ static int copy_fs(unsigned long clone_f
+@@ -417,14 +462,6 @@ out:
+ 	flush_tlb_mm(oldmm);
+ 	up_write(&oldmm->mmap_sem);
+ 	return retval;
+-fail_nomem_anon_vma_fork:
+-	mpol_put(pol);
+-fail_nomem_policy:
+-	kmem_cache_free(vm_area_cachep, tmp);
+-fail_nomem:
+-	retval = -ENOMEM;
+-	vm_unacct_memory(charge);
+-	goto out;
+ }
+ 
+ static inline int mm_alloc_pgd(struct mm_struct * mm)
+@@ -760,13 +797,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
  			write_unlock(&fs->lock);
  			return -EAGAIN;
  		}
@@ -48132,7 +49696,14 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c
  		write_unlock(&fs->lock);
  		return 0;
  	}
-@@ -1027,10 +1053,13 @@ static struct task_struct *copy_process(
+ 	tsk->fs = copy_fs_struct(fs);
+ 	if (!tsk->fs)
+ 		return -ENOMEM;
++	gr_set_chroot_entries(tsk, &tsk->fs->root);
+ 	return 0;
+ }
+ 
+@@ -1019,10 +1057,13 @@ static struct task_struct *copy_process(unsigned long clone_flags,
  	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
  #endif
  	retval = -EAGAIN;
@@ -48140,26 +49711,15 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c
 +	gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
 +
  	if (atomic_read(&p->real_cred->user->processes) >=
- 			p->signal->rlim[RLIMIT_NPROC].rlim_cur) {
+ 			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_RESOURCE) && !capable(CAP_SYS_ADMIN))
++		    !capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE))
  			goto bad_fork_free;
  	}
  
-@@ -1059,6 +1088,10 @@ static struct task_struct *copy_process(
- 	p->vfork_done = NULL;
- 	spin_lock_init(&p->alloc_lock);
- 
-+#ifdef CONFIG_GRKERNSEC
-+	rwlock_init(&p->gr_fs_lock);
-+#endif
-+
- 	init_sigpending(&p->pending);
- 
- 	p->utime = cputime_zero;
-@@ -1179,6 +1212,8 @@ static struct task_struct *copy_process(
+@@ -1176,6 +1217,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
  			goto bad_fork_free_pid;
  	}
  
@@ -48168,7 +49728,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c
  	p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
  	/*
  	 * Clear TID on mm_release()?
-@@ -1344,6 +1379,8 @@ bad_fork_cleanup_count:
+@@ -1328,6 +1371,8 @@ bad_fork_cleanup_count:
  bad_fork_free:
  	free_task(p);
  fork_out:
@@ -48177,7 +49737,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c
  	return ERR_PTR(retval);
  }
  
-@@ -1437,6 +1474,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1433,6 +1478,8 @@ long do_fork(unsigned long clone_flags,
  		if (clone_flags & CLONE_PARENT_SETTID)
  			put_user(nr, parent_tidptr);
  
@@ -48186,7 +49746,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c
  		if (clone_flags & CLONE_VFORK) {
  			p->vfork_done = &vfork;
  			init_completion(&vfork);
-@@ -1569,7 +1608,7 @@ static int unshare_fs(unsigned long unsh
+@@ -1557,7 +1604,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
  		return 0;
  
  	/* don't need lock here; in the worst case we'll do useless copy */
@@ -48195,29 +49755,20 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c
  		return 0;
  
  	*new_fsp = copy_fs_struct(fs);
-@@ -1689,14 +1728,18 @@ SYSCALL_DEFINE1(unshare, unsigned long, 
- 		task_lock(current);
- 
- 		if (new_fs) {
-+			unsigned long flags;
-+
-+			gr_fs_write_lock_irqsave(current, flags);
+@@ -1680,7 +1727,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
  			fs = current->fs;
  			write_lock(&fs->lock);
  			current->fs = new_fs;
 -			if (--fs->users)
++			gr_set_chroot_entries(current, &current->fs->root);
 +			if (atomic_dec_return(&fs->users))
  				new_fs = NULL;
  			else
  				new_fs = fs;
- 			write_unlock(&fs->lock);
-+			gr_fs_write_unlock_irqrestore(current, flags);
- 		}
- 
- 		if (new_mm) {
-diff -urNp linux-2.6.32.13/kernel/futex.c linux-2.6.32.13/kernel/futex.c
---- linux-2.6.32.13/kernel/futex.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/futex.c	2010-05-15 13:21:18.106616956 -0400
+diff --git a/kernel/futex.c b/kernel/futex.c
+index e328f57..bd34ac9 100644
+--- a/kernel/futex.c
++++ b/kernel/futex.c
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -48226,7 +49777,7 @@ diff -urNp linux-2.6.32.13/kernel/futex.c linux-2.6.32.13/kernel/futex.c
  #include <linux/signal.h>
  #include <linux/module.h>
  #include <linux/magic.h>
-@@ -221,6 +222,11 @@ get_futex_key(u32 __user *uaddr, int fsh
+@@ -221,6 +222,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key)
  	struct page *page;
  	int err;
  
@@ -48238,7 +49789,7 @@ diff -urNp linux-2.6.32.13/kernel/futex.c linux-2.6.32.13/kernel/futex.c
  	/*
  	 * The futex address must be "naturally" aligned.
  	 */
-@@ -1852,7 +1858,7 @@ retry:
+@@ -1841,7 +1847,7 @@ retry:
  
  	restart = &current_thread_info()->restart_block;
  	restart->fn = futex_wait_restart;
@@ -48247,19 +49798,17 @@ diff -urNp linux-2.6.32.13/kernel/futex.c linux-2.6.32.13/kernel/futex.c
  	restart->futex.val = val;
  	restart->futex.time = abs_time->tv64;
  	restart->futex.bitset = bitset;
-@@ -2385,7 +2391,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
+@@ -2377,7 +2383,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
  {
  	struct robust_list_head __user *head;
  	unsigned long ret;
--	const struct cred *cred = current_cred(), *pcred;
 +#ifndef CONFIG_GRKERNSEC_PROC_MEMMAP
-+	const struct cred *cred = current_cred();
-+	const struct cred *pcred;
+ 	const struct cred *cred = current_cred(), *pcred;
 +#endif
  
  	if (!futex_cmpxchg_enabled)
  		return -ENOSYS;
-@@ -2401,11 +2410,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
+@@ -2393,11 +2401,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
  		if (!p)
  			goto err_unlock;
  		ret = -EPERM;
@@ -48276,7 +49825,7 @@ diff -urNp linux-2.6.32.13/kernel/futex.c linux-2.6.32.13/kernel/futex.c
  		head = p->robust_list;
  		rcu_read_unlock();
  	}
-@@ -2467,7 +2481,7 @@ retry:
+@@ -2459,7 +2472,7 @@ retry:
   */
  static inline int fetch_robust_entry(struct robust_list __user **entry,
  				     struct robust_list __user * __user *head,
@@ -48285,9 +49834,10 @@ diff -urNp linux-2.6.32.13/kernel/futex.c linux-2.6.32.13/kernel/futex.c
  {
  	unsigned long uentry;
  
-diff -urNp linux-2.6.32.13/kernel/futex_compat.c linux-2.6.32.13/kernel/futex_compat.c
---- linux-2.6.32.13/kernel/futex_compat.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/futex_compat.c	2010-05-15 13:21:18.106616956 -0400
+diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
+index d49afb2..24fb393 100644
+--- a/kernel/futex_compat.c
++++ b/kernel/futex_compat.c
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -48296,19 +49846,19 @@ diff -urNp linux-2.6.32.13/kernel/futex_compat.c linux-2.6.32.13/kernel/futex_co
  
  #include <asm/uaccess.h>
  
-@@ -135,7 +136,10 @@ compat_sys_get_robust_list(int pid, comp
+@@ -135,7 +136,10 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
  {
  	struct compat_robust_list_head __user *head;
  	unsigned long ret;
 -	const struct cred *cred = current_cred(), *pcred;
-+	const struct cred *cred = current_cred();
 +#ifndef CONFIG_GRKERNSEC_PROC_MEMMAP
++	const struct cred *cred = current_cred();
 +	const struct cred *pcred;
 +#endif
  
  	if (!futex_cmpxchg_enabled)
  		return -ENOSYS;
-@@ -151,11 +155,16 @@ compat_sys_get_robust_list(int pid, comp
+@@ -151,11 +155,16 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
  		if (!p)
  			goto err_unlock;
  		ret = -EPERM;
@@ -48323,11 +49873,12 @@ diff -urNp linux-2.6.32.13/kernel/futex_compat.c linux-2.6.32.13/kernel/futex_co
  			goto err_unlock;
 +#endif
  		head = p->compat_robust_list;
- 		read_unlock(&tasklist_lock);
+ 		rcu_read_unlock();
  	}
-diff -urNp linux-2.6.32.13/kernel/gcov/base.c linux-2.6.32.13/kernel/gcov/base.c
---- linux-2.6.32.13/kernel/gcov/base.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/gcov/base.c	2010-05-15 13:21:18.106616956 -0400
+diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
+index 9b22d03..6295b62 100644
+--- a/kernel/gcov/base.c
++++ b/kernel/gcov/base.c
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -48340,7 +49891,7 @@ diff -urNp linux-2.6.32.13/kernel/gcov/base.c linux-2.6.32.13/kernel/gcov/base.c
  /* Update list and generate events when modules are unloaded. */
  static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
  				void *data)
-@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct n
+@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
  	prev = NULL;
  	/* Remove entries located in module from linked list. */
  	for (info = gcov_info_head; info; info = info->next) {
@@ -48349,10 +49900,11 @@ diff -urNp linux-2.6.32.13/kernel/gcov/base.c linux-2.6.32.13/kernel/gcov/base.c
  			if (prev)
  				prev->next = info->next;
  			else
-diff -urNp linux-2.6.32.13/kernel/hrtimer.c linux-2.6.32.13/kernel/hrtimer.c
---- linux-2.6.32.13/kernel/hrtimer.c	2010-04-04 20:41:50.064534828 -0400
-+++ linux-2.6.32.13/kernel/hrtimer.c	2010-05-15 13:21:18.118636223 -0400
-@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void)
+diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
+index 21e0c5e..7de60f8 100644
+--- a/kernel/hrtimer.c
++++ b/kernel/hrtimer.c
+@@ -1407,7 +1407,7 @@ void hrtimer_peek_ahead_timers(void)
  	local_irq_restore(flags);
  }
  
@@ -48361,9 +49913,10 @@ diff -urNp linux-2.6.32.13/kernel/hrtimer.c linux-2.6.32.13/kernel/hrtimer.c
  {
  	hrtimer_peek_ahead_timers();
  }
-diff -urNp linux-2.6.32.13/kernel/kallsyms.c linux-2.6.32.13/kernel/kallsyms.c
---- linux-2.6.32.13/kernel/kallsyms.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/kallsyms.c	2010-05-15 13:21:18.118636223 -0400
+diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
+index 6f6d091..b3aaa18 100644
+--- a/kernel/kallsyms.c
++++ b/kernel/kallsyms.c
 @@ -11,6 +11,9 @@
   *      Changed the compression method from stem compression to "table lookup"
   *      compression (see scripts/kallsyms.c for a more complete description)
@@ -48374,7 +49927,7 @@ diff -urNp linux-2.6.32.13/kernel/kallsyms.c linux-2.6.32.13/kernel/kallsyms.c
  #include <linux/kallsyms.h>
  #include <linux/module.h>
  #include <linux/init.h>
-@@ -51,6 +54,9 @@ extern const unsigned long kallsyms_mark
+@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
  
  static inline int is_kernel_inittext(unsigned long addr)
  {
@@ -48384,34 +49937,60 @@ diff -urNp linux-2.6.32.13/kernel/kallsyms.c linux-2.6.32.13/kernel/kallsyms.c
  	if (addr >= (unsigned long)_sinittext
  	    && addr <= (unsigned long)_einittext)
  		return 1;
-@@ -67,6 +73,26 @@ static inline int is_kernel_text(unsigne
+ 	return 0;
+ }
  
- static inline int is_kernel(unsigned long addr)
- {
-+	if (is_kernel_inittext(addr))
-+		return 1;
-+
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
 +#ifdef CONFIG_MODULES
-+	if ((unsigned long)MODULES_EXEC_VADDR <= ktla_ktva(addr) && ktla_ktva(addr) <= (unsigned long)MODULES_EXEC_END)
-+		return 0;
++static inline int is_module_text(unsigned long addr)
++{
++	if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
++		return 1;
++
++	addr = ktla_ktva(addr);
++	return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
++}
++#else
++static inline int is_module_text(unsigned long addr)
++{
++	return 0;
++}
++#endif
 +#endif
 +
-+	if (is_kernel_text(addr))
-+		return 1;
+ static inline int is_kernel_text(unsigned long addr)
+ {
+ 	if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
+@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
+ 
+ static inline int is_kernel(unsigned long addr)
+ {
 +
-+	if (ktla_ktva((unsigned long)_stext) <= addr && addr < ktla_ktva((unsigned long)_etext))
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++	if (is_kernel_text(addr) || is_kernel_inittext(addr))
 +		return 1;
 +
-+	if ((addr >= (unsigned long)_sdata && addr <= (unsigned long)_end))
-+		return 1;
-+	return in_gate_area_no_task(addr);
++	if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
++#else
+ 	if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
 +#endif
 +
- 	if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
  		return 1;
  	return in_gate_area_no_task(addr);
-@@ -413,7 +439,6 @@ static unsigned long get_ksymbol_core(st
+ }
+ 
+ static int is_ksym_addr(unsigned long addr)
+ {
++
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++	if (is_module_text(addr))
++		return 0;
++#endif
++
+ 	if (all_var)
+ 		return is_kernel(addr);
+ 
+@@ -416,7 +455,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
  
  static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
  {
@@ -48419,7 +49998,7 @@ diff -urNp linux-2.6.32.13/kernel/kallsyms.c linux-2.6.32.13/kernel/kallsyms.c
  	iter->nameoff = get_symbol_offset(new_pos);
  	iter->pos = new_pos;
  }
-@@ -461,6 +486,11 @@ static int s_show(struct seq_file *m, vo
+@@ -464,6 +502,11 @@ static int s_show(struct seq_file *m, void *p)
  {
  	struct kallsym_iter *iter = m->private;
  
@@ -48431,7 +50010,7 @@ diff -urNp linux-2.6.32.13/kernel/kallsyms.c linux-2.6.32.13/kernel/kallsyms.c
  	/* Some debugging symbols have no name.  Ignore them. */
  	if (!iter->name[0])
  		return 0;
-@@ -501,7 +531,7 @@ static int kallsyms_open(struct inode *i
+@@ -504,7 +547,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
  	struct kallsym_iter *iter;
  	int ret;
  
@@ -48440,47 +50019,18 @@ diff -urNp linux-2.6.32.13/kernel/kallsyms.c linux-2.6.32.13/kernel/kallsyms.c
  	if (!iter)
  		return -ENOMEM;
  	reset_iter(iter, 0);
-diff -urNp linux-2.6.32.13/kernel/kgdb.c linux-2.6.32.13/kernel/kgdb.c
---- linux-2.6.32.13/kernel/kgdb.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/kgdb.c	2010-05-15 13:21:18.118636223 -0400
-@@ -86,7 +86,7 @@ static int			kgdb_io_module_registered;
- /* Guard for recursive entry */
- static int			exception_level;
- 
--static struct kgdb_io		*kgdb_io_ops;
-+static const struct kgdb_io	*kgdb_io_ops;
- static DEFINE_SPINLOCK(kgdb_registration_lock);
- 
- /* kgdb console driver is loaded */
-@@ -1637,7 +1637,7 @@ static void kgdb_initial_breakpoint(void
-  *
-  *	Register it with the KGDB core.
-  */
--int kgdb_register_io_module(struct kgdb_io *new_kgdb_io_ops)
-+int kgdb_register_io_module(const struct kgdb_io *new_kgdb_io_ops)
- {
- 	int err;
- 
-@@ -1682,7 +1682,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_modul
-  *
-  *	Unregister it with the KGDB core.
-  */
--void kgdb_unregister_io_module(struct kgdb_io *old_kgdb_io_ops)
-+void kgdb_unregister_io_module(const struct kgdb_io *old_kgdb_io_ops)
- {
- 	BUG_ON(kgdb_connected);
- 
-diff -urNp linux-2.6.32.13/kernel/kmod.c linux-2.6.32.13/kernel/kmod.c
---- linux-2.6.32.13/kernel/kmod.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/kmod.c	2010-05-15 13:21:18.118636223 -0400
-@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
- 	if (ret >= MODULE_NAME_LEN)
- 		return -ENAMETOOLONG;
+diff --git a/kernel/kmod.c b/kernel/kmod.c
+index 6e9b196..8d06f5b 100644
+--- a/kernel/kmod.c
++++ b/kernel/kmod.c
+@@ -90,6 +90,18 @@ int __request_module(bool wait, const char *fmt, ...)
+ 	if (ret)
+ 		return ret;
  
 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
 +	/* we could do a tighter check here, but some distros
 +	   are taking it upon themselves to remove CAP_SYS_MODULE
-+	   from even root-running apps which cause modules to be 
++	   from even root-running apps which cause modules to be
 +	   auto-loaded
 +	*/
 +	if (current_uid()) {
@@ -48492,10 +50042,11 @@ diff -urNp linux-2.6.32.13/kernel/kmod.c linux-2.6.32.13/kernel/kmod.c
  	/* If modprobe needs a service that is in a module, we get a recursive
  	 * loop.  Limit the number of running kmod threads to max_threads/2 or
  	 * MAX_KMOD_CONCURRENT, whichever is the smaller.  A cleaner method
-diff -urNp linux-2.6.32.13/kernel/kprobes.c linux-2.6.32.13/kernel/kprobes.c
---- linux-2.6.32.13/kernel/kprobes.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/kprobes.c	2010-05-15 13:21:18.118636223 -0400
-@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
+diff --git a/kernel/kprobes.c b/kernel/kprobes.c
+index 282035f..f4d28ca 100644
+--- a/kernel/kprobes.c
++++ b/kernel/kprobes.c
+@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
  	 * kernel image and loaded module images reside. This is required
  	 * so x86_64 can correctly handle the %rip-relative fixups.
  	 */
@@ -48504,16 +50055,16 @@ diff -urNp linux-2.6.32.13/kernel/kprobes.c linux-2.6.32.13/kernel/kprobes.c
  	if (!kip->insns) {
  		kfree(kip);
  		return NULL;
-@@ -220,7 +220,7 @@ static int __kprobes collect_one_slot(st
+@@ -223,7 +223,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
  		 */
- 		if (!list_is_singular(&kprobe_insn_pages)) {
+ 		if (!list_is_singular(&kip->list)) {
  			list_del(&kip->list);
 -			module_free(NULL, kip->insns);
 +			module_free_exec(NULL, kip->insns);
  			kfree(kip);
  		}
  		return 1;
-@@ -1189,7 +1189,7 @@ static int __init init_kprobes(void)
+@@ -1709,7 +1709,7 @@ static int __init init_kprobes(void)
  {
  	int i, err = 0;
  	unsigned long offset = 0, size = 0;
@@ -48522,7 +50073,7 @@ diff -urNp linux-2.6.32.13/kernel/kprobes.c linux-2.6.32.13/kernel/kprobes.c
  	const char *symbol_name;
  	void *addr;
  	struct kprobe_blackpoint *kb;
-@@ -1304,7 +1304,7 @@ static int __kprobes show_kprobe_addr(st
+@@ -1835,7 +1835,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
  	const char *sym = NULL;
  	unsigned int i = *(loff_t *) v;
  	unsigned long offset = 0;
@@ -48531,12 +50082,13 @@ diff -urNp linux-2.6.32.13/kernel/kprobes.c linux-2.6.32.13/kernel/kprobes.c
  
  	head = &kprobe_table[i];
  	preempt_disable();
-diff -urNp linux-2.6.32.13/kernel/lockdep.c linux-2.6.32.13/kernel/lockdep.c
---- linux-2.6.32.13/kernel/lockdep.c	2010-04-29 17:49:38.578001941 -0400
-+++ linux-2.6.32.13/kernel/lockdep.c	2010-05-15 13:21:18.122615093 -0400
-@@ -577,6 +577,10 @@ static int static_obj(void *obj)
- 	int i;
- #endif
+diff --git a/kernel/lockdep.c b/kernel/lockdep.c
+index 5428679..6192ffe 100644
+--- a/kernel/lockdep.c
++++ b/kernel/lockdep.c
+@@ -571,6 +571,10 @@ static int static_obj(void *obj)
+ 		      end   = (unsigned long) &_end,
+ 		      addr  = (unsigned long) obj;
  
 +#ifdef CONFIG_PAX_KERNEXEC
 +	start = ktla_ktva(start);
@@ -48545,17 +50097,7 @@ diff -urNp linux-2.6.32.13/kernel/lockdep.c linux-2.6.32.13/kernel/lockdep.c
  	/*
  	 * static variable?
  	 */
-@@ -592,8 +596,7 @@ static int static_obj(void *obj)
- 	 */
- 	for_each_possible_cpu(i) {
- 		start = (unsigned long) per_cpu_ptr(&__per_cpu_start, i);
--		end   = (unsigned long) per_cpu_ptr(&__per_cpu_start, i)
--					+ PERCPU_ENOUGH_ROOM;
-+		end   = start + PERCPU_ENOUGH_ROOM;
- 
- 		if ((addr >= start) && (addr < end))
- 			return 1;
-@@ -710,6 +713,7 @@ register_lock_class(struct lockdep_map *
+@@ -696,6 +700,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
  	if (!static_obj(lock->key)) {
  		debug_locks_off();
  		printk("INFO: trying to register non-static key.\n");
@@ -48563,10 +50105,11 @@ diff -urNp linux-2.6.32.13/kernel/lockdep.c linux-2.6.32.13/kernel/lockdep.c
  		printk("the code is fine but needs lockdep annotation.\n");
  		printk("turning off the locking correctness validator.\n");
  		dump_stack();
-diff -urNp linux-2.6.32.13/kernel/lockdep_proc.c linux-2.6.32.13/kernel/lockdep_proc.c
---- linux-2.6.32.13/kernel/lockdep_proc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/lockdep_proc.c	2010-05-15 13:21:18.122615093 -0400
-@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
+diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
+index 59b76c8..c25d1db 100644
+--- a/kernel/lockdep_proc.c
++++ b/kernel/lockdep_proc.c
+@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
  
  static void print_name(struct seq_file *m, struct lock_class *class)
  {
@@ -48575,20 +50118,21 @@ diff -urNp linux-2.6.32.13/kernel/lockdep_proc.c linux-2.6.32.13/kernel/lockdep_
  	const char *name = class->name;
  
  	if (!name) {
-diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
---- linux-2.6.32.13/kernel/module.c	2010-04-29 17:49:38.586002480 -0400
-+++ linux-2.6.32.13/kernel/module.c	2010-05-15 13:21:18.134612708 -0400
-@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
- static BLOCKING_NOTIFIER_HEAD(module_notify_list);
- 
- /* Bounds of module allocation, for speeding __module_address */
+diff --git a/kernel/module.c b/kernel/module.c
+index 6c56282..390a8a7 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -96,7 +96,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
+ 
+ /* Bounds of module allocation, for speeding __module_address.
+  * Protected by module_mutex. */
 -static unsigned long module_addr_min = -1UL, module_addr_max = 0;
 +static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
 +static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
  
  int register_module_notifier(struct notifier_block * nb)
  {
-@@ -245,7 +246,7 @@ bool each_symbol(bool (*fn)(const struct
+@@ -250,7 +251,7 @@ bool each_symbol(bool (*fn)(const struct symsearch *arr, struct module *owner,
  		return true;
  
  	list_for_each_entry_rcu(mod, &modules, list) {
@@ -48597,7 +50141,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  			{ mod->syms, mod->syms + mod->num_syms, mod->crcs,
  			  NOT_GPL_ONLY, false },
  			{ mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
-@@ -267,7 +268,7 @@ bool each_symbol(bool (*fn)(const struct
+@@ -272,7 +273,7 @@ bool each_symbol(bool (*fn)(const struct symsearch *arr, struct module *owner,
  #endif
  		};
  
@@ -48606,16 +50150,16 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  			return true;
  	}
  	return false;
-@@ -442,7 +443,7 @@ static void *percpu_modalloc(unsigned lo
- 	void *ptr;
- 	int cpu;
- 
+@@ -383,7 +384,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
+ static int percpu_modalloc(struct module *mod,
+ 			   unsigned long size, unsigned long align)
+ {
 -	if (align > PAGE_SIZE) {
 +	if (align-1 >= PAGE_SIZE) {
  		printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
- 		       name, align, PAGE_SIZE);
+ 		       mod->name, align, PAGE_SIZE);
  		align = PAGE_SIZE;
-@@ -1543,7 +1544,8 @@ static void free_module(struct module *m
+@@ -1562,7 +1563,8 @@ static void free_module(struct module *mod)
  	destroy_params(mod->kp, mod->num_kp);
  
  	/* This may be NULL, but that's OK */
@@ -48623,10 +50167,10 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
 +	module_free(mod, mod->module_init_rw);
 +	module_free_exec(mod, mod->module_init_rx);
  	kfree(mod->args);
- 	if (mod->percpu)
- 		percpu_modfree(mod->percpu);
-@@ -1552,10 +1554,12 @@ static void free_module(struct module *m
- 		percpu_modfree(mod->refptr);
+ 	percpu_modfree(mod);
+ #if defined(CONFIG_MODULE_UNLOAD)
+@@ -1570,10 +1572,12 @@ static void free_module(struct module *mod)
+ 		free_percpu(mod->refptr);
  #endif
  	/* Free lock-classes: */
 -	lockdep_free_key_range(mod->module_core, mod->core_size);
@@ -48640,18 +50184,18 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  
  #ifdef CONFIG_MPU
  	update_protections(current->mm);
-@@ -1649,7 +1653,9 @@ static int simplify_symbols(Elf_Shdr *se
- 					      strtab + sym[i].st_name, mod);
+@@ -1670,7 +1674,9 @@ static int simplify_symbols(Elf_Shdr *sechdrs,
+ 						   mod);
  			/* Ok if resolved.  */
- 			if (ksym) {
+ 			if (ksym && !IS_ERR(ksym)) {
 +				pax_open_kernel();
  				sym[i].st_value = ksym->value;
 +				pax_close_kernel();
  				break;
  			}
  
-@@ -1668,7 +1674,9 @@ static int simplify_symbols(Elf_Shdr *se
- 				secbase = (unsigned long)mod->percpu;
+@@ -1690,7 +1696,9 @@ static int simplify_symbols(Elf_Shdr *sechdrs,
+ 				secbase = (unsigned long)mod_percpu(mod);
  			else
  				secbase = sechdrs[sym[i].st_shndx].sh_addr;
 +			pax_open_kernel();
@@ -48660,7 +50204,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  			break;
  		}
  	}
-@@ -1729,11 +1737,12 @@ static void layout_sections(struct modul
+@@ -1751,11 +1759,12 @@ static void layout_sections(struct module *mod,
  			    || s->sh_entsize != ~0UL
  			    || strstarts(secstrings + s->sh_name, ".init"))
  				continue;
@@ -48676,7 +50220,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  	}
  
  	DEBUGP("Init section allocation order:\n");
-@@ -1746,12 +1755,13 @@ static void layout_sections(struct modul
+@@ -1768,12 +1777,13 @@ static void layout_sections(struct module *mod,
  			    || s->sh_entsize != ~0UL
  			    || !strstarts(secstrings + s->sh_name, ".init"))
  				continue;
@@ -48694,7 +50238,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  	}
  }
  
-@@ -1855,9 +1865,8 @@ static int is_exported(const char *name,
+@@ -1877,9 +1887,8 @@ static int is_exported(const char *name, unsigned long value,
  
  /* As per nm */
  static char elf_type(const Elf_Sym *sym,
@@ -48706,7 +50250,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  {
  	if (ELF_ST_BIND(sym->st_info) == STB_WEAK) {
  		if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT)
-@@ -1932,7 +1941,7 @@ static unsigned long layout_symtab(struc
+@@ -1954,7 +1963,7 @@ static unsigned long layout_symtab(struct module *mod,
  
  	/* Put symbol section at end of init part of module. */
  	symsect->sh_flags |= SHF_ALLOC;
@@ -48715,7 +50259,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  					 symindex) | INIT_OFFSET_MASK;
  	DEBUGP("\t%s\n", secstrings + symsect->sh_name);
  
-@@ -1949,19 +1958,19 @@ static unsigned long layout_symtab(struc
+@@ -1971,19 +1980,19 @@ static unsigned long layout_symtab(struct module *mod,
  		}
  
  	/* Append room for core symbols at end of core part. */
@@ -48740,7 +50284,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  
  	return symoffs;
  }
-@@ -1985,12 +1994,14 @@ static void add_kallsyms(struct module *
+@@ -2007,12 +2016,14 @@ static void add_kallsyms(struct module *mod,
  	mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
  	mod->strtab = (void *)sechdrs[strindex].sh_addr;
  
@@ -48757,7 +50301,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  	src = mod->symtab;
  	*dst = *src;
  	for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
-@@ -2002,10 +2013,12 @@ static void add_kallsyms(struct module *
+@@ -2024,10 +2035,12 @@ static void add_kallsyms(struct module *mod,
  	}
  	mod->core_num_syms = ndst;
  
@@ -48771,8 +50315,8 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  }
  #else
  static inline unsigned long layout_symtab(struct module *mod,
-@@ -2042,16 +2055,30 @@ static void dynamic_debug_setup(struct _
- #endif
+@@ -2070,17 +2083,33 @@ static void dynamic_debug_remove(struct _ddebug *debug)
+ 		ddebug_remove_module(debug->modname);
  }
  
 -static void *module_alloc_update_bounds(unsigned long size)
@@ -48781,6 +50325,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  	void *ret = module_alloc(size);
  
  	if (ret) {
+ 		mutex_lock(&module_mutex);
  		/* Update module bounds. */
 -		if ((unsigned long)ret < module_addr_min)
 -			module_addr_min = (unsigned long)ret;
@@ -48790,6 +50335,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
 +			module_addr_min_rw = (unsigned long)ret;
 +		if ((unsigned long)ret + size > module_addr_max_rw)
 +			module_addr_max_rw = (unsigned long)ret + size;
++		mutex_unlock(&module_mutex);
 +	}
 +	return ret;
 +}
@@ -48799,37 +50345,16 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
 +	void *ret = module_alloc_exec(size);
 +
 +	if (ret) {
++		mutex_lock(&module_mutex);
 +		/* Update module bounds. */
 +		if ((unsigned long)ret < module_addr_min_rx)
 +			module_addr_min_rx = (unsigned long)ret;
 +		if ((unsigned long)ret + size > module_addr_max_rx)
 +			module_addr_max_rx = (unsigned long)ret + size;
+ 		mutex_unlock(&module_mutex);
  	}
  	return ret;
- }
-@@ -2063,8 +2090,8 @@ static void kmemleak_load_module(struct 
- 	unsigned int i;
- 
- 	/* only scan the sections containing data */
--	kmemleak_scan_area(mod->module_core, (unsigned long)mod -
--			   (unsigned long)mod->module_core,
-+	kmemleak_scan_area(mod->module_core_rw, (unsigned long)mod -
-+			   (unsigned long)mod->module_core_rw,
- 			   sizeof(struct module), GFP_KERNEL);
- 
- 	for (i = 1; i < hdr->e_shnum; i++) {
-@@ -2074,8 +2101,8 @@ static void kmemleak_load_module(struct 
- 		    && strncmp(secstrings + sechdrs[i].sh_name, ".bss", 4) != 0)
- 			continue;
- 
--		kmemleak_scan_area(mod->module_core, sechdrs[i].sh_addr -
--				   (unsigned long)mod->module_core,
-+		kmemleak_scan_area(mod->module_core_rw, sechdrs[i].sh_addr -
-+				   (unsigned long)mod->module_core_rw,
- 				   sechdrs[i].sh_size, GFP_KERNEL);
- 	}
- }
-@@ -2261,7 +2288,7 @@ static noinline struct module *load_modu
+@@ -2284,7 +2313,7 @@ static noinline struct module *load_module(void __user *umod,
  				secstrings, &stroffs, strmap);
  
  	/* Do the allocs. */
@@ -48838,7 +50363,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/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
-@@ -2272,23 +2299,47 @@ static noinline struct module *load_modu
+@@ -2295,23 +2324,47 @@ static noinline struct module *load_module(void __user *umod,
  		err = -ENOMEM;
  		goto free_percpu;
  	}
@@ -48868,12 +50393,9 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
 +	ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
 +	kmemleak_not_leak(ptr);
 +	if (!ptr) {
- 		err = -ENOMEM;
--		goto free_core;
++		err = -ENOMEM;
 +		goto free_init_rw;
- 	}
--	memset(ptr, 0, mod->init_size);
--	mod->module_init = ptr;
++	}
 +
 +	pax_open_kernel();
 +	memset(ptr, 0, mod->core_size_rx);
@@ -48883,9 +50405,12 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
 +	ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
 +	kmemleak_not_leak(ptr);
 +	if (!ptr && mod->init_size_rx) {
-+		err = -ENOMEM;
+ 		err = -ENOMEM;
+-		goto free_core;
 +		goto free_core_rx;
-+	}
+ 	}
+-	memset(ptr, 0, mod->init_size);
+-	mod->module_init = ptr;
 +
 +	pax_open_kernel();
 +	memset(ptr, 0, mod->init_size_rx);
@@ -48894,7 +50419,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  
  	/* Transfer each section which specifies SHF_ALLOC */
  	DEBUGP("final section addresses:\n");
-@@ -2298,17 +2349,41 @@ static noinline struct module *load_modu
+@@ -2321,17 +2374,41 @@ static noinline struct module *load_module(void __user *umod,
  		if (!(sechdrs[i].sh_flags & SHF_ALLOC))
  			continue;
  
@@ -48918,7 +50443,10 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
 +		}
 +
 +		if (sechdrs[i].sh_type != SHT_NOBITS) {
-+
+ 
+-		if (sechdrs[i].sh_type != SHT_NOBITS)
+-			memcpy(dest, (void *)sechdrs[i].sh_addr,
+-			       sechdrs[i].sh_size);
 +#ifdef CONFIG_PAX_KERNEXEC
 +			if (!(sechdrs[i].sh_flags & SHF_WRITE) && (sechdrs[i].sh_flags & SHF_ALLOC)) {
 +				pax_open_kernel();
@@ -48926,10 +50454,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
 +				pax_close_kernel();
 +			} else
 +#endif
- 
--		if (sechdrs[i].sh_type != SHT_NOBITS)
--			memcpy(dest, (void *)sechdrs[i].sh_addr,
--			       sechdrs[i].sh_size);
++
 +			memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size);
 +		}
  		/* Update sh_addr to point to copy in image. */
@@ -48945,8 +50470,8 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  		DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name);
  	}
  	/* Module has been moved. */
-@@ -2320,7 +2395,7 @@ static noinline struct module *load_modu
- 				      mod->name);
+@@ -2342,7 +2419,7 @@ static noinline struct module *load_module(void __user *umod,
+ 	mod->refptr = alloc_percpu(struct module_ref);
  	if (!mod->refptr) {
  		err = -ENOMEM;
 -		goto free_init;
@@ -48954,7 +50479,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  	}
  #endif
  	/* Now we've moved module, initialize linked lists, etc. */
-@@ -2429,8 +2504,8 @@ static noinline struct module *load_modu
+@@ -2452,8 +2529,8 @@ static noinline struct module *load_module(void __user *umod,
  
  	/* Now do relocations. */
  	for (i = 1; i < hdr->e_shnum; i++) {
@@ -48964,7 +50489,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  
  		/* Not a valid relocation section? */
  		if (info >= hdr->e_shnum)
-@@ -2491,12 +2566,12 @@ static noinline struct module *load_modu
+@@ -2503,12 +2580,12 @@ static noinline struct module *load_module(void __user *umod,
  	 * Do it before processing of module parameters, so the module
  	 * can provide parameter accessor functions of its own.
  	 */
@@ -48983,12 +50508,12 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  
  	set_fs(old_fs);
  
-@@ -2544,12 +2619,16 @@ static noinline struct module *load_modu
-  free_unload:
+@@ -2574,12 +2651,16 @@ static noinline struct module *load_module(void __user *umod,
+ 	free_modinfo(mod);
  	module_unload_free(mod);
- #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP)
+ #if defined(CONFIG_MODULE_UNLOAD)
 + free_init_rx:
- 	percpu_modfree(mod->refptr);
+ 	free_percpu(mod->refptr);
 - free_init:
  #endif
 -	module_free(mod, mod->module_init);
@@ -49003,8 +50528,8 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
 +	module_free(mod, mod->module_core_rw);
  	/* mod will be freed with core. Don't access it beyond this line! */
   free_percpu:
- 	if (percpu)
-@@ -2651,10 +2730,12 @@ SYSCALL_DEFINE3(init_module, void __user
+ 	free_percpu(percpu);
+@@ -2669,10 +2750,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
  	mod->symtab = mod->core_symtab;
  	mod->strtab = mod->core_strtab;
  #endif
@@ -49021,7 +50546,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  	mutex_unlock(&module_mutex);
  
  	return 0;
-@@ -2685,10 +2766,16 @@ static const char *get_ksymbol(struct mo
+@@ -2703,10 +2786,16 @@ static const char *get_ksymbol(struct module *mod,
  	unsigned long nextval;
  
  	/* At worse, next value is at end of module */
@@ -49041,7 +50566,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  
  	/* Scan for closest preceeding symbol, and next symbol. (ELF
  	   starts real symbols at 1). */
-@@ -2934,7 +3021,7 @@ static int m_show(struct seq_file *m, vo
+@@ -2952,7 +3041,7 @@ static int m_show(struct seq_file *m, void *p)
  	char buf[8];
  
  	seq_printf(m, "%s %u",
@@ -49050,7 +50575,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  	print_unload_info(m, mod);
  
  	/* Informative for users. */
-@@ -2943,7 +3030,7 @@ static int m_show(struct seq_file *m, vo
+@@ -2961,7 +3050,7 @@ static int m_show(struct seq_file *m, void *p)
  		   mod->state == MODULE_STATE_COMING ? "Loading":
  		   "Live");
  	/* Used by oprofile and other similar tools. */
@@ -49059,7 +50584,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  
  	/* Taints info */
  	if (mod->taints)
-@@ -2979,7 +3066,17 @@ static const struct file_operations proc
+@@ -2997,7 +3086,17 @@ static const struct file_operations proc_modules_operations = {
  
  static int __init proc_modules_init(void)
  {
@@ -49077,7 +50602,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  	return 0;
  }
  module_init(proc_modules_init);
-@@ -3038,12 +3135,12 @@ struct module *__module_address(unsigned
+@@ -3056,12 +3155,12 @@ struct module *__module_address(unsigned long addr)
  {
  	struct module *mod;
  
@@ -49093,7 +50618,7 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  			return mod;
  	return NULL;
  }
-@@ -3077,11 +3174,20 @@ bool is_module_text_address(unsigned lon
+@@ -3095,11 +3194,20 @@ bool is_module_text_address(unsigned long addr)
   */
  struct module *__module_text_address(unsigned long addr)
  {
@@ -49117,10 +50642,11 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
  			mod = NULL;
  	}
  	return mod;
-diff -urNp linux-2.6.32.13/kernel/panic.c linux-2.6.32.13/kernel/panic.c
---- linux-2.6.32.13/kernel/panic.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/panic.c	2010-05-15 13:21:18.146612793 -0400
-@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
+diff --git a/kernel/panic.c b/kernel/panic.c
+index 3b16cd9..f0e5630 100644
+--- a/kernel/panic.c
++++ b/kernel/panic.c
+@@ -429,7 +429,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
   */
  void __stack_chk_fail(void)
  {
@@ -49130,30 +50656,10 @@ diff -urNp linux-2.6.32.13/kernel/panic.c linux-2.6.32.13/kernel/panic.c
  		__builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.32.13/kernel/params.c linux-2.6.32.13/kernel/params.c
---- linux-2.6.32.13/kernel/params.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/params.c	2010-05-15 13:21:18.146612793 -0400
-@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct 
- 	return ret;
- }
- 
--static struct sysfs_ops module_sysfs_ops = {
-+static const struct sysfs_ops module_sysfs_ops = {
- 	.show = module_attr_show,
- 	.store = module_attr_store,
- };
-@@ -739,7 +739,7 @@ static int uevent_filter(struct kset *ks
- 	return 0;
- }
- 
--static struct kset_uevent_ops module_uevent_ops = {
-+static const struct kset_uevent_ops module_uevent_ops = {
- 	.filter = uevent_filter,
- };
- 
-diff -urNp linux-2.6.32.13/kernel/pid.c linux-2.6.32.13/kernel/pid.c
---- linux-2.6.32.13/kernel/pid.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/pid.c	2010-05-15 13:21:18.154611186 -0400
+diff --git a/kernel/pid.c b/kernel/pid.c
+index e9fd8c1..bc28f95 100644
+--- a/kernel/pid.c
++++ b/kernel/pid.c
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -49162,7 +50668,7 @@ diff -urNp linux-2.6.32.13/kernel/pid.c linux-2.6.32.13/kernel/pid.c
  #include <linux/pid_namespace.h>
  #include <linux/init_task.h>
  #include <linux/syscalls.h>
-@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT
+@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
  
  int pid_max = PID_MAX_DEFAULT;
  
@@ -49171,7 +50677,7 @@ diff -urNp linux-2.6.32.13/kernel/pid.c linux-2.6.32.13/kernel/pid.c
  
  int pid_max_min = RESERVED_PIDS + 1;
  int pid_max_max = PID_MAX_LIMIT;
-@@ -380,7 +381,14 @@ EXPORT_SYMBOL(pid_task);
+@@ -382,7 +383,14 @@ EXPORT_SYMBOL(pid_task);
   */
  struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
  {
@@ -49187,9 +50693,10 @@ diff -urNp linux-2.6.32.13/kernel/pid.c linux-2.6.32.13/kernel/pid.c
  }
  
  struct task_struct *find_task_by_vpid(pid_t vnr)
-diff -urNp linux-2.6.32.13/kernel/posix-cpu-timers.c linux-2.6.32.13/kernel/posix-cpu-timers.c
---- linux-2.6.32.13/kernel/posix-cpu-timers.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/posix-cpu-timers.c	2010-05-15 13:21:18.158615271 -0400
+diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
+index 9829646..47f2b35 100644
+--- a/kernel/posix-cpu-timers.c
++++ b/kernel/posix-cpu-timers.c
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -49198,26 +50705,27 @@ diff -urNp linux-2.6.32.13/kernel/posix-cpu-timers.c linux-2.6.32.13/kernel/posi
  #include <asm/uaccess.h>
  #include <linux/kernel_stat.h>
  #include <trace/events/timer.h>
-@@ -1044,6 +1045,7 @@ static void check_thread_timers(struct t
- 			__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
- 			return;
- 		}
-+		gr_learn_resource(tsk, RLIMIT_RTTIME, tsk->rt.timeout, 1);
- 		if (tsk->rt.timeout > DIV_ROUND_UP(*soft, USEC_PER_SEC/HZ)) {
+@@ -972,6 +973,7 @@ static void check_thread_timers(struct task_struct *tsk,
+ 		unsigned long hard =
+ 			ACCESS_ONCE(sig->rlim[RLIMIT_RTTIME].rlim_max);
+ 
++		gr_learn_resource(tsk, RLIMIT_RTTIME, tsk->rt.timeout * (USEC_PER_SEC/HZ), 1);
+ 		if (hard != RLIM_INFINITY &&
+ 		    tsk->rt.timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) {
  			/*
- 			 * At the soft limit, send a SIGXCPU every second.
-@@ -1206,6 +1208,7 @@ static void check_process_timers(struct 
- 			__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
- 			return;
- 		}
+@@ -1138,6 +1140,7 @@ static void check_process_timers(struct task_struct *tsk,
+ 		unsigned long hard =
+ 			ACCESS_ONCE(sig->rlim[RLIMIT_CPU].rlim_max);
+ 		cputime_t x;
 +		gr_learn_resource(tsk, RLIMIT_CPU, psecs, 0);
- 		if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) {
+ 		if (psecs >= hard) {
  			/*
- 			 * At the soft limit, send a SIGXCPU every second.
-diff -urNp linux-2.6.32.13/kernel/power/hibernate.c linux-2.6.32.13/kernel/power/hibernate.c
---- linux-2.6.32.13/kernel/power/hibernate.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/power/hibernate.c	2010-05-15 13:21:18.158615271 -0400
-@@ -48,14 +48,14 @@ enum {
+ 			 * At the hard limit, we just die.
+diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
+index 684463e..21353fb 100644
+--- a/kernel/power/hibernate.c
++++ b/kernel/power/hibernate.c
+@@ -50,14 +50,14 @@ enum {
  
  static int hibernation_mode = HIBERNATION_SHUTDOWN;
  
@@ -49234,10 +50742,11 @@ diff -urNp linux-2.6.32.13/kernel/power/hibernate.c linux-2.6.32.13/kernel/power
  {
  	if (ops && !(ops->begin && ops->end &&  ops->pre_snapshot
  	    && ops->prepare && ops->finish && ops->enter && ops->pre_restore
-diff -urNp linux-2.6.32.13/kernel/power/poweroff.c linux-2.6.32.13/kernel/power/poweroff.c
---- linux-2.6.32.13/kernel/power/poweroff.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/power/poweroff.c	2010-05-15 13:21:18.158615271 -0400
-@@ -37,7 +37,7 @@ static struct sysrq_key_op	sysrq_powerof
+diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
+index e8b3370..484c2e4 100644
+--- a/kernel/power/poweroff.c
++++ b/kernel/power/poweroff.c
+@@ -37,7 +37,7 @@ static struct sysrq_key_op	sysrq_poweroff_op = {
  	.enable_mask	= SYSRQ_ENABLE_BOOT,
  };
  
@@ -49246,10 +50755,11 @@ diff -urNp linux-2.6.32.13/kernel/power/poweroff.c linux-2.6.32.13/kernel/power/
  {
  	register_sysrq_key('o', &sysrq_poweroff_op);
  	return 0;
-diff -urNp linux-2.6.32.13/kernel/power/process.c linux-2.6.32.13/kernel/power/process.c
---- linux-2.6.32.13/kernel/power/process.c	2010-04-29 17:49:38.590000225 -0400
-+++ linux-2.6.32.13/kernel/power/process.c	2010-05-15 13:21:18.158615271 -0400
-@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
+diff --git a/kernel/power/process.c b/kernel/power/process.c
+index 71ae290..3ab7c83 100644
+--- a/kernel/power/process.c
++++ b/kernel/power/process.c
+@@ -38,12 +38,15 @@ static int try_to_freeze_tasks(bool sig_only)
  	struct timeval start, end;
  	u64 elapsed_csecs64;
  	unsigned int elapsed_csecs;
@@ -49258,14 +50768,14 @@ diff -urNp linux-2.6.32.13/kernel/power/process.c linux-2.6.32.13/kernel/power/p
  	do_gettimeofday(&start);
  
  	end_time = jiffies + TIMEOUT;
- 	do {
+ 	while (true) {
  		todo = 0;
 +		if (time_after(jiffies, end_time))
 +			timedout = true;
  		read_lock(&tasklist_lock);
  		do_each_thread(g, p) {
  			if (frozen(p) || !freezeable(p))
-@@ -57,15 +60,17 @@ static int try_to_freeze_tasks(bool sig_
+@@ -58,12 +61,16 @@ static int try_to_freeze_tasks(bool sig_only)
  			 * It is "frozen enough".  If the task does wake
  			 * up, it will immediately call try_to_freeze.
  			 */
@@ -49280,18 +50790,16 @@ diff -urNp linux-2.6.32.13/kernel/power/process.c linux-2.6.32.13/kernel/power/p
 +			}
  		} while_each_thread(g, p);
  		read_unlock(&tasklist_lock);
- 		yield();			/* Yield is okay here */
--		if (time_after(jiffies, end_time))
--			break;
--	} while (todo);
-+	} while (todo && !timedout);
- 
- 	do_gettimeofday(&end);
- 	elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
-diff -urNp linux-2.6.32.13/kernel/power/suspend.c linux-2.6.32.13/kernel/power/suspend.c
---- linux-2.6.32.13/kernel/power/suspend.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/power/suspend.c	2010-05-15 13:21:18.158615271 -0400
-@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
+-		if (!todo || time_after(jiffies, end_time))
++		if (!todo || timedout)
+ 			break;
+ 
+ 		/*
+diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
+index b0f28dd..d380af8 100644
+--- a/kernel/power/suspend.c
++++ b/kernel/power/suspend.c
+@@ -30,13 +30,13 @@ const char *const pm_states[PM_SUSPEND_MAX] = {
  	[PM_SUSPEND_MEM]	= "mem",
  };
  
@@ -49307,10 +50815,11 @@ diff -urNp linux-2.6.32.13/kernel/power/suspend.c linux-2.6.32.13/kernel/power/s
  {
  	mutex_lock(&pm_mutex);
  	suspend_ops = ops;
-diff -urNp linux-2.6.32.13/kernel/printk.c linux-2.6.32.13/kernel/printk.c
---- linux-2.6.32.13/kernel/printk.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/printk.c	2010-05-15 13:21:18.158615271 -0400
-@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
+diff --git a/kernel/printk.c b/kernel/printk.c
+index 444b770..6a0eaf4 100644
+--- a/kernel/printk.c
++++ b/kernel/printk.c
+@@ -266,6 +266,11 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
  	char c;
  	int error = 0;
  
@@ -49319,13 +50828,14 @@ diff -urNp linux-2.6.32.13/kernel/printk.c linux-2.6.32.13/kernel/printk.c
 +		return -EPERM;
 +#endif
 +
- 	error = security_syslog(type);
+ 	error = security_syslog(type, from_file);
  	if (error)
  		return error;
-diff -urNp linux-2.6.32.13/kernel/ptrace.c linux-2.6.32.13/kernel/ptrace.c
---- linux-2.6.32.13/kernel/ptrace.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/ptrace.c	2010-05-15 13:21:18.158615271 -0400
-@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
+diff --git a/kernel/ptrace.c b/kernel/ptrace.c
+index 74a3d69..fe6f3fb 100644
+--- a/kernel/ptrace.c
++++ b/kernel/ptrace.c
+@@ -140,7 +140,7 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
  	     cred->gid != tcred->egid ||
  	     cred->gid != tcred->sgid ||
  	     cred->gid != tcred->gid) &&
@@ -49334,7 +50844,7 @@ diff -urNp linux-2.6.32.13/kernel/ptrace.c linux-2.6.32.13/kernel/ptrace.c
  		rcu_read_unlock();
  		return -EPERM;
  	}
-@@ -149,7 +149,7 @@ int __ptrace_may_access(struct task_stru
+@@ -148,7 +148,7 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
  	smp_rmb();
  	if (task->mm)
  		dumpable = get_dumpable(task->mm);
@@ -49343,7 +50853,7 @@ diff -urNp linux-2.6.32.13/kernel/ptrace.c linux-2.6.32.13/kernel/ptrace.c
  		return -EPERM;
  
  	return security_ptrace_access_check(task, mode);
-@@ -199,7 +199,7 @@ int ptrace_attach(struct task_struct *ta
+@@ -198,7 +198,7 @@ int ptrace_attach(struct task_struct *task)
  		goto unlock_tasklist;
  
  	task->ptrace = PT_PTRACED;
@@ -49352,7 +50862,16 @@ diff -urNp linux-2.6.32.13/kernel/ptrace.c linux-2.6.32.13/kernel/ptrace.c
  		task->ptrace |= PT_PTRACE_CAP;
  
  	__ptrace_link(task, current);
-@@ -532,18 +532,18 @@ int ptrace_request(struct task_struct *c
+@@ -361,7 +361,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
+ 				break;
+ 			return -EIO;
+ 		}
+-		if (copy_to_user(dst, buf, retval))
++		if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
+ 			return -EFAULT;
+ 		copied += retval;
+ 		src += retval;
+@@ -572,18 +572,18 @@ int ptrace_request(struct task_struct *child, long request,
  		ret = ptrace_setoptions(child, data);
  		break;
  	case PTRACE_GETEVENTMSG:
@@ -49374,7 +50893,7 @@ diff -urNp linux-2.6.32.13/kernel/ptrace.c linux-2.6.32.13/kernel/ptrace.c
  				   sizeof siginfo))
  			ret = -EFAULT;
  		else
-@@ -621,14 +621,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
+@@ -703,14 +703,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, long, addr, long, data)
  		goto out;
  	}
  
@@ -49397,7 +50916,7 @@ diff -urNp linux-2.6.32.13/kernel/ptrace.c linux-2.6.32.13/kernel/ptrace.c
  		goto out_put_task_struct;
  	}
  
-@@ -653,7 +660,7 @@ int generic_ptrace_peekdata(struct task_
+@@ -734,7 +741,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data)
  	copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
  	if (copied != sizeof(tmp))
  		return -EIO;
@@ -49406,10 +50925,11 @@ diff -urNp linux-2.6.32.13/kernel/ptrace.c linux-2.6.32.13/kernel/ptrace.c
  }
  
  int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
-diff -urNp linux-2.6.32.13/kernel/rcutree.c linux-2.6.32.13/kernel/rcutree.c
---- linux-2.6.32.13/kernel/rcutree.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/rcutree.c	2010-05-15 13:21:18.162587722 -0400
-@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
+diff --git a/kernel/rcutree.c b/kernel/rcutree.c
+index d443734..6d5ddfc 100644
+--- a/kernel/rcutree.c
++++ b/kernel/rcutree.c
+@@ -1356,7 +1356,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
  /*
   * Do softirq processing for the current CPU.
   */
@@ -49418,22 +50938,11 @@ diff -urNp linux-2.6.32.13/kernel/rcutree.c linux-2.6.32.13/kernel/rcutree.c
  {
  	/*
  	 * Memory references from any prior RCU read-side critical sections
-diff -urNp linux-2.6.32.13/kernel/relay.c linux-2.6.32.13/kernel/relay.c
---- linux-2.6.32.13/kernel/relay.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/relay.c	2010-05-15 13:21:18.162587722 -0400
-@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi
- 		return 0;
- 
- 	ret = *nonpad_ret = splice_to_pipe(pipe, &spd);
--	if (ret < 0 || ret < total_len)
-+	if ((int)ret < 0 || ret < total_len)
- 		return ret;
- 
-         if (read_start + ret == nonpad_end)
-diff -urNp linux-2.6.32.13/kernel/resource.c linux-2.6.32.13/kernel/resource.c
---- linux-2.6.32.13/kernel/resource.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/resource.c	2010-05-15 13:21:18.162587722 -0400
-@@ -132,8 +132,18 @@ static const struct file_operations proc
+diff --git a/kernel/resource.c b/kernel/resource.c
+index 7b36976..b7fb57a 100644
+--- a/kernel/resource.c
++++ b/kernel/resource.c
+@@ -133,8 +133,18 @@ static const struct file_operations proc_iomem_operations = {
  
  static int __init ioresources_init(void)
  {
@@ -49452,28 +50961,33 @@ diff -urNp linux-2.6.32.13/kernel/resource.c linux-2.6.32.13/kernel/resource.c
  	return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-2.6.32.13/kernel/sched.c linux-2.6.32.13/kernel/sched.c
---- linux-2.6.32.13/kernel/sched.c	2010-04-29 17:49:38.609495328 -0400
-+++ linux-2.6.32.13/kernel/sched.c	2010-05-15 13:21:18.180350069 -0400
-@@ -4841,7 +4841,7 @@ out:
-  * In CONFIG_NO_HZ case, the idle load balance owner will do the
-  * rebalancing for all the cpus for whom scheduler ticks are stopped.
-  */
--static void run_rebalance_domains(struct softirq_action *h)
-+static void run_rebalance_domains(void)
- {
- 	int this_cpu = smp_processor_id();
- 	struct rq *this_rq = cpu_rq(this_cpu);
-@@ -6110,6 +6110,8 @@ int can_nice(const struct task_struct *p
+diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
+index a960481..d373438 100644
+--- a/kernel/rtmutex.c
++++ b/kernel/rtmutex.c
+@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt_mutex *lock)
+ 	 */
+ 	raw_spin_lock_irqsave(&pendowner->pi_lock, flags);
+ 
+-	WARN_ON(!pendowner->pi_blocked_on);
++	BUG_ON(!pendowner->pi_blocked_on);
+ 	WARN_ON(pendowner->pi_blocked_on != waiter);
+ 	WARN_ON(pendowner->pi_blocked_on->lock != lock);
+ 
+diff --git a/kernel/sched.c b/kernel/sched.c
+index 837f480..b9c779e 100644
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -4259,6 +4259,8 @@ int can_nice(const struct task_struct *p, const int nice)
  	/* convert nice value [19,-20] to rlimit style value [1,40] */
  	int nice_rlim = 20 - nice;
  
 +	gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
 +
- 	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
+ 	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
  		capable(CAP_SYS_NICE));
  }
-@@ -6143,7 +6145,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4292,7 +4294,8 @@ SYSCALL_DEFINE1(nice, int, increment)
  	if (nice > 19)
  		nice = 19;
  
@@ -49483,39 +50997,43 @@ diff -urNp linux-2.6.32.13/kernel/sched.c linux-2.6.32.13/kernel/sched.c
  		return -EPERM;
  
  	retval = security_task_setnice(current, nice);
-@@ -6293,6 +6296,8 @@ recheck:
- 		if (rt_policy(policy)) {
- 			unsigned long rlim_rtprio;
+@@ -4439,6 +4442,7 @@ recheck:
+ 			rlim_rtprio = task_rlimit(p, RLIMIT_RTPRIO);
+ 			unlock_task_sighand(p, &flags);
  
 +			gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
-+
- 			if (!lock_task_sighand(p, &flags))
- 				return -ESRCH;
- 			rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur;
-@@ -7452,7 +7457,7 @@ static struct ctl_table sd_ctl_dir[] = {
- 		.procname	= "sched_domain",
- 		.mode		= 0555,
- 	},
--	{0, },
-+	{ 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL }
- };
+ 			/* can't set/change the rt policy */
+ 			if (policy != p->policy && !rlim_rtprio)
+ 				return -EPERM;
+@@ -6593,7 +6597,7 @@ static void init_sched_groups_power(int cpu, struct sched_domain *sd)
+ 	long power;
+ 	int weight;
  
- static struct ctl_table sd_ctl_root[] = {
-@@ -7462,7 +7467,7 @@ static struct ctl_table sd_ctl_root[] = 
- 		.mode		= 0555,
- 		.child		= sd_ctl_dir,
- 	},
--	{0, },
-+	{ 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL }
- };
+-	WARN_ON(!sd || !sd->groups);
++	BUG_ON(!sd || !sd->groups);
  
- static struct ctl_table *sd_alloc_ctl_entry(int n)
-diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c
---- linux-2.6.32.13/kernel/signal.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/signal.c	2010-05-15 13:21:18.180350069 -0400
-@@ -41,12 +41,12 @@
+ 	if (cpu != group_first_cpu(sd->groups))
+ 		return;
+diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
+index a878b53..5e7a646 100644
+--- a/kernel/sched_fair.c
++++ b/kernel/sched_fair.c
+@@ -3390,7 +3390,7 @@ out:
+  * In CONFIG_NO_HZ case, the idle load balance owner will do the
+  * rebalancing for all the cpus for whom scheduler ticks are stopped.
+  */
+-static void run_rebalance_domains(struct softirq_action *h)
++static void run_rebalance_domains(void)
+ {
+ 	int this_cpu = smp_processor_id();
+ 	struct rq *this_rq = cpu_rq(this_cpu);
+diff --git a/kernel/signal.c b/kernel/signal.c
+index bded651..cd470ef 100644
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cachep;
  
- static struct kmem_cache *sigqueue_cachep;
+ int print_fatal_signals __read_mostly;
  
 -static void __user *sig_handler(struct task_struct *t, int sig)
 +static __sighandler_t sig_handler(struct task_struct *t, int sig)
@@ -49528,7 +51046,7 @@ diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c
  {
  	/* Is it explicitly or implicitly ignored? */
  	return handler == SIG_IGN ||
-@@ -56,7 +56,7 @@ static int sig_handler_ignored(void __us
+@@ -60,7 +60,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
  static int sig_task_ignored(struct task_struct *t, int sig,
  		int from_ancestor_ns)
  {
@@ -49537,17 +51055,17 @@ diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c
  
  	handler = sig_handler(t, sig);
  
-@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc
- 	 */
- 	user = get_uid(__task_cred(t)->user);
+@@ -243,6 +243,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
  	atomic_inc(&user->sigpending);
-+
+ 	rcu_read_unlock();
+ 
 +	if (!override_rlimit)
 +		gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
++
  	if (override_rlimit ||
  	    atomic_read(&user->sigpending) <=
- 			t->signal->rlim[RLIMIT_SIGPENDING].rlim_cur)
-@@ -327,7 +330,7 @@ flush_signal_handlers(struct task_struct
+ 			task_rlimit(t, RLIMIT_SIGPENDING)) {
+@@ -367,7 +370,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
  
  int unhandled_signal(struct task_struct *tsk, int sig)
  {
@@ -49556,7 +51074,7 @@ diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c
  	if (is_global_init(tsk))
  		return 1;
  	if (handler != SIG_IGN && handler != SIG_DFL)
-@@ -625,6 +628,9 @@ static int check_kill_permission(int sig
+@@ -678,6 +681,9 @@ static int check_kill_permission(int sig, struct siginfo *info,
  		}
  	}
  
@@ -49566,7 +51084,7 @@ diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c
  	return security_task_kill(t, info, sig, 0);
  }
  
-@@ -966,7 +972,7 @@ __group_send_sig_info(int sig, struct si
+@@ -1025,7 +1031,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
  	return send_signal(sig, info, p, 1);
  }
  
@@ -49575,7 +51093,7 @@ diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c
  specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  {
  	return send_signal(sig, info, t, 0);
-@@ -1020,6 +1026,9 @@ force_sig_info(int sig, struct siginfo *
+@@ -1079,6 +1085,9 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  	ret = specific_send_sig_info(sig, info, t);
  	spin_unlock_irqrestore(&t->sighand->siglock, flags);
  
@@ -49585,9 +51103,9 @@ diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c
  	return ret;
  }
  
-@@ -1079,8 +1088,11 @@ int group_send_sig_info(int sig, struct 
- {
- 	int ret = check_kill_permission(sig, info, p);
+@@ -1136,8 +1145,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
+ 	ret = check_kill_permission(sig, info, p);
+ 	rcu_read_unlock();
  
 -	if (!ret && sig)
 +	if (!ret && sig) {
@@ -49598,40 +51116,42 @@ diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c
  
  	return ret;
  }
-diff -urNp linux-2.6.32.13/kernel/smp.c linux-2.6.32.13/kernel/smp.c
---- linux-2.6.32.13/kernel/smp.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/smp.c	2010-05-15 13:21:18.180350069 -0400
-@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void 
+diff --git a/kernel/smp.c b/kernel/smp.c
+index 75c970c..fe561b3 100644
+--- a/kernel/smp.c
++++ b/kernel/smp.c
+@@ -499,22 +499,22 @@ int smp_call_function(void (*func)(void *), void *info, int wait)
  }
  EXPORT_SYMBOL(smp_call_function);
  
 -void ipi_call_lock(void)
 +void ipi_call_lock(void) __acquires(call_function.lock)
  {
- 	spin_lock(&call_function.lock);
+ 	raw_spin_lock(&call_function.lock);
  }
  
 -void ipi_call_unlock(void)
 +void ipi_call_unlock(void) __releases(call_function.lock)
  {
- 	spin_unlock(&call_function.lock);
+ 	raw_spin_unlock(&call_function.lock);
  }
  
 -void ipi_call_lock_irq(void)
 +void ipi_call_lock_irq(void) __acquires(call_function.lock)
  {
- 	spin_lock_irq(&call_function.lock);
+ 	raw_spin_lock_irq(&call_function.lock);
  }
  
 -void ipi_call_unlock_irq(void)
 +void ipi_call_unlock_irq(void) __releases(call_function.lock)
  {
- 	spin_unlock_irq(&call_function.lock);
+ 	raw_spin_unlock_irq(&call_function.lock);
  }
-diff -urNp linux-2.6.32.13/kernel/softirq.c linux-2.6.32.13/kernel/softirq.c
---- linux-2.6.32.13/kernel/softirq.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/softirq.c	2010-05-15 13:21:18.186622968 -0400
-@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
+diff --git a/kernel/softirq.c b/kernel/softirq.c
+index 07b4f1b..7ea31d6 100644
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
+@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
  
  static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
  
@@ -49667,7 +51187,7 @@ diff -urNp linux-2.6.32.13/kernel/softirq.c linux-2.6.32.13/kernel/softirq.c
  {
  	softirq_vec[nr].action = action;
  }
-@@ -396,7 +396,7 @@ void __tasklet_hi_schedule_first(struct 
+@@ -396,7 +396,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
  
  EXPORT_SYMBOL(__tasklet_hi_schedule_first);
  
@@ -49676,7 +51196,7 @@ diff -urNp linux-2.6.32.13/kernel/softirq.c linux-2.6.32.13/kernel/softirq.c
  {
  	struct tasklet_struct *list;
  
-@@ -431,7 +431,7 @@ static void tasklet_action(struct softir
+@@ -431,7 +431,7 @@ static void tasklet_action(struct softirq_action *a)
  	}
  }
  
@@ -49685,10 +51205,11 @@ diff -urNp linux-2.6.32.13/kernel/softirq.c linux-2.6.32.13/kernel/softirq.c
  {
  	struct tasklet_struct *list;
  
-diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c
---- linux-2.6.32.13/kernel/sys.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/sys.c	2010-05-15 13:21:18.223438230 -0400
-@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
+diff --git a/kernel/sys.c b/kernel/sys.c
+index f4fcc6e..20fe9aa 100644
+--- a/kernel/sys.c
++++ b/kernel/sys.c
+@@ -134,6 +134,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
  		error = -EACCES;
  		goto out;
  	}
@@ -49701,36 +51222,7 @@ diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c
  	no_nice = security_task_setnice(p, niceval);
  	if (no_nice) {
  		error = no_nice;
-@@ -190,10 +196,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
- 				 !(user = find_user(who)))
- 				goto out_unlock;	/* No processes for this user */
- 
--			do_each_thread(g, p)
-+			do_each_thread(g, p) {
- 				if (__task_cred(p)->uid == who)
- 					error = set_one_prio(p, niceval, error);
--			while_each_thread(g, p);
-+			} while_each_thread(g, p);
- 			if (who != cred->uid)
- 				free_uid(user);		/* For find_user() */
- 			break;
-@@ -253,13 +259,13 @@ SYSCALL_DEFINE2(getpriority, int, which,
- 				 !(user = find_user(who)))
- 				goto out_unlock;	/* No processes for this user */
- 
--			do_each_thread(g, p)
-+			do_each_thread(g, p) {
- 				if (__task_cred(p)->uid == who) {
- 					niceval = 20 - task_nice(p);
- 					if (niceval > retval)
- 						retval = niceval;
- 				}
--			while_each_thread(g, p);
-+			} while_each_thread(g, p);
- 			if (who != cred->uid)
- 				free_uid(user);		/* for find_user() */
- 			break;
-@@ -509,6 +515,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
+@@ -511,6 +517,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
  			goto error;
  	}
  
@@ -49740,8 +51232,8 @@ diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c
  	if (rgid != (gid_t) -1 ||
  	    (egid != (gid_t) -1 && egid != old->gid))
  		new->sgid = new->egid;
-@@ -542,6 +551,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
- 		goto error;
+@@ -540,6 +549,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
+ 	old = current_cred();
  
  	retval = -EPERM;
 +
@@ -49751,7 +51243,7 @@ diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c
  	if (capable(CAP_SETGID))
  		new->gid = new->egid = new->sgid = new->fsgid = gid;
  	else if (gid == old->gid || gid == old->sgid)
-@@ -632,6 +645,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
+@@ -620,6 +633,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
  			goto error;
  	}
  
@@ -49761,8 +51253,8 @@ diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c
  	if (new->uid != old->uid) {
  		retval = set_user(new);
  		if (retval < 0)
-@@ -680,6 +696,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
- 		goto error;
+@@ -664,6 +680,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
+ 	old = current_cred();
  
  	retval = -EPERM;
 +
@@ -49774,7 +51266,7 @@ diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c
  	if (capable(CAP_SETUID)) {
  		new->suid = new->uid = uid;
  		if (uid != old->uid) {
-@@ -737,6 +759,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, 
+@@ -718,6 +740,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
  			goto error;
  	}
  
@@ -49784,7 +51276,7 @@ diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c
  	if (ruid != (uid_t) -1) {
  		new->uid = ruid;
  		if (ruid != old->uid) {
-@@ -805,6 +830,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, 
+@@ -782,6 +807,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
  			goto error;
  	}
  
@@ -49794,9 +51286,9 @@ diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c
  	if (rgid != (gid_t) -1)
  		new->gid = rgid;
  	if (egid != (gid_t) -1)
-@@ -854,6 +882,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
- 	if (security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_FS) < 0)
- 		goto error;
+@@ -828,6 +856,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+ 	old = current_cred();
+ 	old_fsuid = old->fsuid;
  
 +	if (gr_check_user_change(-1, -1, uid))
 +		goto error;
@@ -49804,7 +51296,15 @@ diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c
  	if (uid == old->uid  || uid == old->euid  ||
  	    uid == old->suid || uid == old->fsuid ||
  	    capable(CAP_SETUID)) {
-@@ -894,6 +925,9 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
+@@ -838,6 +869,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+ 		}
+ 	}
+ 
++error:
+ 	abort_creds(new);
+ 	return old_fsuid;
+ 
+@@ -864,12 +896,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
  	if (gid == old->gid  || gid == old->egid  ||
  	    gid == old->sgid || gid == old->fsgid ||
  	    capable(CAP_SETGID)) {
@@ -49814,7 +51314,14 @@ diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c
  		if (gid != old_fsgid) {
  			new->fsgid = gid;
  			goto change_okay;
-@@ -1459,7 +1493,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
+ 		}
+ 	}
+ 
++error:
+ 	abort_creds(new);
+ 	return old_fsgid;
+ 
+@@ -1493,7 +1529,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
  			error = get_dumpable(me->mm);
  			break;
  		case PR_SET_DUMPABLE:
@@ -49823,11 +51330,12 @@ diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c
  				error = -EINVAL;
  				break;
  			}
-diff -urNp linux-2.6.32.13/kernel/sysctl.c linux-2.6.32.13/kernel/sysctl.c
---- linux-2.6.32.13/kernel/sysctl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/sysctl.c	2010-05-15 13:21:18.258852946 -0400
-@@ -63,6 +63,13 @@
- static int deprecated_sysctl_warning(struct __sysctl_args *args);
+diff --git a/kernel/sysctl.c b/kernel/sysctl.c
+index d24f761..016010c 100644
+--- a/kernel/sysctl.c
++++ b/kernel/sysctl.c
+@@ -78,6 +78,13 @@
+ 
  
  #if defined(CONFIG_SYSCTL)
 +#include <linux/grsecurity.h>
@@ -49839,23 +51347,22 @@ diff -urNp linux-2.6.32.13/kernel/sysctl.c linux-2.6.32.13/kernel/sysctl.c
 +extern int gr_handle_chroot_sysctl(const int op);
  
  /* External variables not in a header file. */
- extern int C_A_D;
-@@ -168,6 +175,7 @@ static int proc_do_cad_pid(struct ctl_ta
- static int proc_taint(struct ctl_table *table, int write,
- 			       void __user *buffer, size_t *lenp, loff_t *ppos);
+ extern int sysctl_overcommit_memory;
+@@ -185,6 +192,7 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
+ }
+ 
  #endif
-+extern ctl_table grsecurity_table[];
++extern struct ctl_table grsecurity_table[];
  
  static struct ctl_table root_table[];
  static struct ctl_table_root sysctl_table_root;
-@@ -200,6 +208,21 @@ extern struct ctl_table epoll_table[];
+@@ -217,6 +225,20 @@ extern struct ctl_table epoll_table[];
  int sysctl_legacy_va_layout;
  #endif
  
 +#ifdef CONFIG_PAX_SOFTMODE
 +static ctl_table pax_table[] = {
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "softmode",
 +		.data		= &pax_softmode,
 +		.maxlen		= sizeof(unsigned int),
@@ -49863,20 +51370,19 @@ diff -urNp linux-2.6.32.13/kernel/sysctl.c linux-2.6.32.13/kernel/sysctl.c
 +		.proc_handler	= &proc_dointvec,
 +	},
 +
-+	{ .ctl_name = 0 }
++	{ }
 +};
 +#endif
 +
- extern int prove_locking;
- extern int lock_stat;
+ /* The default sysctl tables: */
  
-@@ -251,6 +274,24 @@ static int max_wakeup_granularity_ns = N
+ static struct ctl_table root_table[] = {
+@@ -269,6 +291,22 @@ static int max_extfrag_threshold = 1000;
  #endif
  
  static struct ctl_table kern_table[] = {
 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "grsecurity",
 +		.mode		= 0500,
 +		.child		= grsecurity_table,
@@ -49885,7 +51391,6 @@ diff -urNp linux-2.6.32.13/kernel/sysctl.c linux-2.6.32.13/kernel/sysctl.c
 +
 +#ifdef CONFIG_PAX_SOFTMODE
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "pax",
 +		.mode		= 0500,
 +		.child		= pax_table,
@@ -49893,27 +51398,23 @@ diff -urNp linux-2.6.32.13/kernel/sysctl.c linux-2.6.32.13/kernel/sysctl.c
 +#endif
 +
  	{
- 		.ctl_name	= CTL_UNNUMBERED,
  		.procname	= "sched_child_runs_first",
-@@ -1803,6 +1844,8 @@ static int do_sysctl_strategy(struct ctl
- 	return 0;
- }
- 
-+static int sysctl_perm_nochk(struct ctl_table_root *root, struct ctl_table *table, int op);
-+
- static int parse_table(int __user *name, int nlen,
- 		       void __user *oldval, size_t __user *oldlenp,
- 		       void __user *newval, size_t newlen,
-@@ -1821,7 +1864,7 @@ repeat:
- 		if (n == table->ctl_name) {
- 			int error;
- 			if (table->child) {
--				if (sysctl_perm(root, table, MAY_EXEC))
-+				if (sysctl_perm_nochk(root, table, MAY_EXEC))
- 					return -EPERM;
- 				name++;
- 				nlen--;
-@@ -1906,6 +1949,33 @@ int sysctl_perm(struct ctl_table_root *r
+ 		.data		= &sysctl_sched_child_runs_first,
+@@ -1171,6 +1209,13 @@ static struct ctl_table vm_table[] = {
+ 		.proc_handler	= proc_dointvec_minmax,
+ 		.extra1		= &zero,
+ 	},
++	{
++		.procname	= "heap_stack_gap",
++		.data		= &sysctl_heap_stack_gap,
++		.maxlen		= sizeof(sysctl_heap_stack_gap),
++		.mode		= 0644,
++		.proc_handler	= proc_doulongvec_minmax,
++	},
+ #else
+ 	{
+ 		.procname	= "nr_trim_pages",
+@@ -1686,6 +1731,16 @@ int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
  	int error;
  	int mode;
  
@@ -49927,30 +51428,45 @@ diff -urNp linux-2.6.32.13/kernel/sysctl.c linux-2.6.32.13/kernel/sysctl.c
 +	if (error)
 +		return error;
 +
-+	error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
-+	if (error)
-+		return error;
-+
-+	if (root->permissions)
-+		mode = root->permissions(root, current->nsproxy, table);
-+	else
-+		mode = table->mode;
-+
-+	return test_perm(mode, op);
-+}
-+
-+int sysctl_perm_nochk(struct ctl_table_root *root, struct ctl_table *table, int op)
-+{
-+	int error;
-+	int mode;
-+
  	error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
  	if (error)
  		return error;
-diff -urNp linux-2.6.32.13/kernel/taskstats.c linux-2.6.32.13/kernel/taskstats.c
---- linux-2.6.32.13/kernel/taskstats.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/taskstats.c	2010-05-15 13:21:18.258852946 -0400
-@@ -26,9 +26,12 @@
+@@ -2201,6 +2256,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
+ 	len = strlen(tmp);
+ 	if (len > *size)
+ 		len = *size;
++	if (len > sizeof(tmp))
++		len = sizeof(tmp);
+ 	if (copy_to_user(*buf, tmp, len))
+ 		return -EFAULT;
+ 	*size -= len;
+@@ -2486,7 +2543,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
+ 		kbuf[left] = 0;
+ 	}
+ 
+-	for (; left && vleft--; i++, min++, max++, first=0) {
++	for (; left && vleft--; i++, first=0) {
+ 		unsigned long val;
+ 
+ 		if (write) {
+@@ -2506,8 +2563,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
+ 			*i = val;
+ 		} else {
+ 			val = convdiv * (*i) / convmul;
+-			if (!first)
++			if (!first) {
+ 				err = proc_put_char(&buffer, &left, '\t');
++				if (err)
++					break;
++			}
+ 			err = proc_put_long(&buffer, &left, val, false);
+ 			if (err)
+ 				break;
+diff --git a/kernel/taskstats.c b/kernel/taskstats.c
+index 11281d5..4586db0 100644
+--- a/kernel/taskstats.c
++++ b/kernel/taskstats.c
+@@ -27,9 +27,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
  #include <linux/file.h>
@@ -49963,7 +51479,7 @@ diff -urNp linux-2.6.32.13/kernel/taskstats.c linux-2.6.32.13/kernel/taskstats.c
  /*
   * Maximum length of a cpumask that can be specified in
   * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
-@@ -433,6 +436,9 @@ static int taskstats_user_cmd(struct sk_
+@@ -432,6 +435,9 @@ static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
  	size_t size;
  	cpumask_var_t mask;
  
@@ -49973,22 +51489,11 @@ diff -urNp linux-2.6.32.13/kernel/taskstats.c linux-2.6.32.13/kernel/taskstats.c
  	if (!alloc_cpumask_var(&mask, GFP_KERNEL))
  		return -ENOMEM;
  
-diff -urNp linux-2.6.32.13/kernel/time/tick-broadcast.c linux-2.6.32.13/kernel/time/tick-broadcast.c
---- linux-2.6.32.13/kernel/time/tick-broadcast.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/time/tick-broadcast.c	2010-05-15 13:21:18.258852946 -0400
-@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
- 		 * then clear the broadcast bit.
- 		 */
- 		if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
--			int cpu = smp_processor_id();
-+			cpu = smp_processor_id();
- 
- 			cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
- 			tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.32.13/kernel/time.c linux-2.6.32.13/kernel/time.c
---- linux-2.6.32.13/kernel/time.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/time.c	2010-05-15 13:21:18.262613670 -0400
-@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 
+diff --git a/kernel/time.c b/kernel/time.c
+index 848b1c2..848cb6f 100644
+--- a/kernel/time.c
++++ b/kernel/time.c
+@@ -93,6 +93,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, tptr)
  		return err;
  
  	do_settimeofday(&tv);
@@ -49998,7 +51503,7 @@ diff -urNp linux-2.6.32.13/kernel/time.c linux-2.6.32.13/kernel/time.c
  	return 0;
  }
  
-@@ -202,6 +205,8 @@ SYSCALL_DEFINE2(settimeofday, struct tim
+@@ -200,6 +203,8 @@ SYSCALL_DEFINE2(settimeofday, struct timeval __user *, tv,
  			return -EFAULT;
  	}
  
@@ -50007,7 +51512,7 @@ diff -urNp linux-2.6.32.13/kernel/time.c linux-2.6.32.13/kernel/time.c
  	return do_sys_settimeofday(tv ? &new_ts : NULL, tz ? &new_tz : NULL);
  }
  
-@@ -240,7 +245,7 @@ EXPORT_SYMBOL(current_fs_time);
+@@ -238,7 +243,7 @@ EXPORT_SYMBOL(current_fs_time);
   * Avoid unnecessary multiplications/divisions in the
   * two most common HZ cases:
   */
@@ -50016,7 +51521,7 @@ diff -urNp linux-2.6.32.13/kernel/time.c linux-2.6.32.13/kernel/time.c
  {
  #if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)
  	return (MSEC_PER_SEC / HZ) * j;
-@@ -256,7 +261,7 @@ unsigned int inline jiffies_to_msecs(con
+@@ -254,7 +259,7 @@ unsigned int inline jiffies_to_msecs(const unsigned long j)
  }
  EXPORT_SYMBOL(jiffies_to_msecs);
  
@@ -50025,10 +51530,102 @@ diff -urNp linux-2.6.32.13/kernel/time.c linux-2.6.32.13/kernel/time.c
  {
  #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
  	return (USEC_PER_SEC / HZ) * j;
-diff -urNp linux-2.6.32.13/kernel/timer.c linux-2.6.32.13/kernel/timer.c
---- linux-2.6.32.13/kernel/timer.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/timer.c	2010-05-15 13:21:18.262613670 -0400
-@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick)
+diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
+index b3bafd5..87de26c 100644
+--- a/kernel/time/tick-broadcast.c
++++ b/kernel/time/tick-broadcast.c
+@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
+ 		 * then clear the broadcast bit.
+ 		 */
+ 		if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
+-			int cpu = smp_processor_id();
++			cpu = smp_processor_id();
+ 
+ 			cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
+ 			tick_broadcast_clear_oneshot(cpu);
+diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
+index ab8f5e3..538acb9 100644
+--- a/kernel/time/timer_list.c
++++ b/kernel/time/timer_list.c
+@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
+ 
+ static void print_name_offset(struct seq_file *m, void *sym)
+ {
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++	SEQ_printf(m, "<%p>", NULL);
++#else
+ 	char symname[KSYM_NAME_LEN];
+ 
+ 	if (lookup_symbol_name((unsigned long)sym, symname) < 0)
+ 		SEQ_printf(m, "<%p>", sym);
+ 	else
+ 		SEQ_printf(m, "%s", symname);
++#endif
+ }
+ 
+ static void
+@@ -112,7 +116,11 @@ next_one:
+ static void
+ print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
+ {
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++	SEQ_printf(m, "  .base:       %p\n", NULL);
++#else
+ 	SEQ_printf(m, "  .base:       %p\n", base);
++#endif
+ 	SEQ_printf(m, "  .index:      %d\n",
+ 			base->index);
+ 	SEQ_printf(m, "  .resolution: %Lu nsecs\n",
+@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void)
+ {
+ 	struct proc_dir_entry *pe;
+ 
++#ifdef CONFIG_GRKERNSEC_PROC_ADD
++	pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
++#else
+ 	pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
++#endif
+ 	if (!pe)
+ 		return -ENOMEM;
+ 	return 0;
+diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
+index 2f3b585..4ae39fa 100644
+--- a/kernel/time/timer_stats.c
++++ b/kernel/time/timer_stats.c
+@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
+ 
+ static void print_name_offset(struct seq_file *m, unsigned long addr)
+ {
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++	seq_printf(m, "<%p>", NULL);
++#else
+ 	char symname[KSYM_NAME_LEN];
+ 
+ 	if (lookup_symbol_name(addr, symname) < 0)
+ 		seq_printf(m, "<%p>", (void *)addr);
+ 	else
+ 		seq_printf(m, "%s", symname);
++#endif
+ }
+ 
+ static int tstats_show(struct seq_file *m, void *v)
+@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
+ {
+ 	struct proc_dir_entry *pe;
+ 
++#ifdef CONFIG_GRKERNSEC_PROC_ADD
++	pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
++#else
+ 	pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
++#endif
+ 	if (!pe)
+ 		return -ENOMEM;
+ 	return 0;
+diff --git a/kernel/timer.c b/kernel/timer.c
+index ee305c8..91cbbfe 100644
+--- a/kernel/timer.c
++++ b/kernel/timer.c
+@@ -1272,7 +1272,7 @@ void update_process_times(int user_tick)
  /*
   * This function runs timers and the timer-tq in bottom half context.
   */
@@ -50037,10 +51634,11 @@ diff -urNp linux-2.6.32.13/kernel/timer.c linux-2.6.32.13/kernel/timer.c
  {
  	struct tvec_base *base = __get_cpu_var(tvec_bases);
  
-diff -urNp linux-2.6.32.13/kernel/trace/ftrace.c linux-2.6.32.13/kernel/trace/ftrace.c
---- linux-2.6.32.13/kernel/trace/ftrace.c	2010-04-04 20:41:50.068477203 -0400
-+++ linux-2.6.32.13/kernel/trace/ftrace.c	2010-05-15 13:21:18.274619950 -0400
-@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, 
+diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
+index 6b316b3..3bc44ee 100644
+--- a/kernel/trace/ftrace.c
++++ b/kernel/trace/ftrace.c
+@@ -1108,13 +1108,18 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
  
  	ip = rec->ip;
  
@@ -50061,29 +51659,11 @@ diff -urNp linux-2.6.32.13/kernel/trace/ftrace.c linux-2.6.32.13/kernel/trace/ft
  }
  
  /*
-diff -urNp linux-2.6.32.13/kernel/trace/Kconfig linux-2.6.32.13/kernel/trace/Kconfig
---- linux-2.6.32.13/kernel/trace/Kconfig	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/trace/Kconfig	2010-05-15 13:21:18.278715003 -0400
-@@ -126,6 +126,7 @@ if FTRACE
- config FUNCTION_TRACER
- 	bool "Kernel Function Tracer"
- 	depends on HAVE_FUNCTION_TRACER
-+	depends on !PAX_KERNEXEC
- 	select FRAME_POINTER
- 	select KALLSYMS
- 	select GENERIC_TRACER
-@@ -343,6 +344,7 @@ config POWER_TRACER
- config STACK_TRACER
- 	bool "Trace max stack"
- 	depends on HAVE_FUNCTION_TRACER
-+	depends on !PAX_KERNEXEC
- 	select FUNCTION_TRACER
- 	select STACKTRACE
- 	select KALLSYMS
-diff -urNp linux-2.6.32.13/kernel/trace/ring_buffer.c linux-2.6.32.13/kernel/trace/ring_buffer.c
---- linux-2.6.32.13/kernel/trace/ring_buffer.c	2010-04-04 20:41:50.072525146 -0400
-+++ linux-2.6.32.13/kernel/trace/ring_buffer.c	2010-05-15 13:21:18.278715003 -0400
-@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
+diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
+index 6cd7334..3b75866 100644
+--- a/kernel/trace/ring_buffer.c
++++ b/kernel/trace/ring_buffer.c
+@@ -635,7 +635,7 @@ static struct list_head *rb_list_head(struct list_head *list)
   * the reader page). But if the next page is a header page,
   * its flags will be non zero.
   */
@@ -50092,10 +51672,11 @@ diff -urNp linux-2.6.32.13/kernel/trace/ring_buffer.c linux-2.6.32.13/kernel/tra
  rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
  		struct buffer_page *page, struct list_head *list)
  {
-diff -urNp linux-2.6.32.13/kernel/trace/trace.c linux-2.6.32.13/kernel/trace/trace.c
---- linux-2.6.32.13/kernel/trace/trace.c	2010-04-04 20:41:50.072525146 -0400
-+++ linux-2.6.32.13/kernel/trace/trace.c	2010-05-15 13:21:18.278715003 -0400
-@@ -3808,10 +3808,9 @@ static const struct file_operations trac
+diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
+index 086d363..e751991 100644
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -3965,10 +3965,9 @@ static const struct file_operations tracing_dyn_info_fops = {
  };
  #endif
  
@@ -50107,7 +51688,7 @@ diff -urNp linux-2.6.32.13/kernel/trace/trace.c linux-2.6.32.13/kernel/trace/tra
  	static int once;
  
  	if (d_tracer)
-@@ -3831,10 +3830,9 @@ struct dentry *tracing_init_dentry(void)
+@@ -3988,10 +3987,9 @@ struct dentry *tracing_init_dentry(void)
  	return d_tracer;
  }
  
@@ -50119,23 +51700,12 @@ diff -urNp linux-2.6.32.13/kernel/trace/trace.c linux-2.6.32.13/kernel/trace/tra
  	static int once;
  	struct dentry *d_tracer;
  
-diff -urNp linux-2.6.32.13/kernel/trace/trace_events.c linux-2.6.32.13/kernel/trace/trace_events.c
---- linux-2.6.32.13/kernel/trace/trace_events.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/trace/trace_events.c	2010-05-15 13:21:18.282652483 -0400
-@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
-  * Modules must own their file_operations to keep up with
-  * reference counting.
-  */
-+
-+/* cannot be const */
- struct ftrace_module_file_ops {
- 	struct list_head		list;
- 	struct module			*mod;
-diff -urNp linux-2.6.32.13/kernel/trace/trace_output.c linux-2.6.32.13/kernel/trace/trace_output.c
---- linux-2.6.32.13/kernel/trace/trace_output.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/trace/trace_output.c	2010-05-15 13:21:18.282652483 -0400
-@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, 
- 		return 0;
+diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
+index 57c1b45..3c6ad7f 100644
+--- a/kernel/trace/trace_output.c
++++ b/kernel/trace/trace_output.c
+@@ -281,7 +281,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path)
+ 
  	p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
  	if (!IS_ERR(p)) {
 -		p = mangle_path(s->buffer + s->len, p, "\n");
@@ -50143,9 +51713,10 @@ diff -urNp linux-2.6.32.13/kernel/trace/trace_output.c linux-2.6.32.13/kernel/tr
  		if (p) {
  			s->len = p - s->buffer;
  			return 1;
-diff -urNp linux-2.6.32.13/kernel/trace/trace_stack.c linux-2.6.32.13/kernel/trace/trace_stack.c
---- linux-2.6.32.13/kernel/trace/trace_stack.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/trace/trace_stack.c	2010-05-15 13:21:18.282652483 -0400
+diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
+index f4bc9b2..4ae9c93 100644
+--- a/kernel/trace/trace_stack.c
++++ b/kernel/trace/trace_stack.c
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
  		return;
  
@@ -50155,31 +51726,24 @@ diff -urNp linux-2.6.32.13/kernel/trace/trace_stack.c linux-2.6.32.13/kernel/tra
  		return;
  
  	local_irq_save(flags);
-diff -urNp linux-2.6.32.13/kernel/utsname_sysctl.c linux-2.6.32.13/kernel/utsname_sysctl.c
---- linux-2.6.32.13/kernel/utsname_sysctl.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/kernel/utsname_sysctl.c	2010-05-15 13:21:18.282652483 -0400
-@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
- 		.proc_handler	= proc_do_uts_string,
- 		.strategy	= sysctl_uts_string,
- 	},
--	{}
-+	{ 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL }
- };
- 
- static struct ctl_table uts_root_table[] = {
-@@ -133,7 +133,7 @@ static struct ctl_table uts_root_table[]
- 		.mode		= 0555,
- 		.child		= uts_kern_table,
- 	},
--	{}
-+	{ 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL }
- };
- 
- static int __init utsname_sysctl_init(void)
-diff -urNp linux-2.6.32.13/lib/bug.c linux-2.6.32.13/lib/bug.c
---- linux-2.6.32.13/lib/bug.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/lib/bug.c	2010-05-15 13:21:18.282652483 -0400
-@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
+diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
+index e722e9d..e83dda1 100644
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -970,7 +970,7 @@ config LATENCYTOP
+ 	select STACKTRACE
+ 	select SCHEDSTATS
+ 	select SCHED_DEBUG
+-	depends on HAVE_LATENCYTOP_SUPPORT
++	depends on HAVE_LATENCYTOP_SUPPORT && !GRKERNSEC_HIDESYM
+ 	help
+ 	  Enable this option if you want to use the LatencyTOP tool
+ 	  to find out which userspace is blocking on what kernel operations.
+diff --git a/lib/bug.c b/lib/bug.c
+index f13daf4..4ea0ac8 100644
+--- a/lib/bug.c
++++ b/lib/bug.c
+@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
  		return BUG_TRAP_TYPE_NONE;
  
  	bug = find_bug(bugaddr);
@@ -50188,10 +51752,11 @@ diff -urNp linux-2.6.32.13/lib/bug.c linux-2.6.32.13/lib/bug.c
  
  	printk(KERN_EMERG "------------[ cut here ]------------\n");
  
-diff -urNp linux-2.6.32.13/lib/debugobjects.c linux-2.6.32.13/lib/debugobjects.c
---- linux-2.6.32.13/lib/debugobjects.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/lib/debugobjects.c	2010-05-15 13:21:18.298622839 -0400
-@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
+diff --git a/lib/debugobjects.c b/lib/debugobjects.c
+index deebcc5..6f0a6ef 100644
+--- a/lib/debugobjects.c
++++ b/lib/debugobjects.c
+@@ -281,7 +281,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
  	if (limit > 4)
  		return;
  
@@ -50200,9 +51765,10 @@ diff -urNp linux-2.6.32.13/lib/debugobjects.c linux-2.6.32.13/lib/debugobjects.c
  	if (is_on_stack == onstack)
  		return;
  
-diff -urNp linux-2.6.32.13/lib/dma-debug.c linux-2.6.32.13/lib/dma-debug.c
---- linux-2.6.32.13/lib/dma-debug.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/lib/dma-debug.c	2010-05-15 13:21:18.322629085 -0400
+diff --git a/lib/dma-debug.c b/lib/dma-debug.c
+index 01e6427..a4ed270 100644
+--- a/lib/dma-debug.c
++++ b/lib/dma-debug.c
 @@ -861,7 +861,7 @@ out:
  
  static void check_for_stack(struct device *dev, void *addr)
@@ -50212,22 +51778,11 @@ diff -urNp linux-2.6.32.13/lib/dma-debug.c linux-2.6.32.13/lib/dma-debug.c
  		err_printk(dev, NULL, "DMA-API: device driver maps memory from"
  				"stack [addr=%p]\n", addr);
  }
-diff -urNp linux-2.6.32.13/lib/idr.c linux-2.6.32.13/lib/idr.c
---- linux-2.6.32.13/lib/idr.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/lib/idr.c	2010-05-15 13:21:18.327545957 -0400
-@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
- 			id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
- 
- 			/* if already at the top layer, we need to grow */
--			if (id >= 1 << (idp->layers * IDR_BITS)) {
-+			if (id >= (1 << (idp->layers * IDR_BITS))) {
- 				*starting_id = id;
- 				return IDR_NEED_TO_GROW;
- 			}
-diff -urNp linux-2.6.32.13/lib/inflate.c linux-2.6.32.13/lib/inflate.c
---- linux-2.6.32.13/lib/inflate.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/lib/inflate.c	2010-05-15 13:21:18.327545957 -0400
-@@ -266,7 +266,7 @@ static void free(void *where)
+diff --git a/lib/inflate.c b/lib/inflate.c
+index 677b738..5efb43f 100644
+--- a/lib/inflate.c
++++ b/lib/inflate.c
+@@ -267,7 +267,7 @@ static void free(void *where)
  		malloc_ptr = free_mem_ptr;
  }
  #else
@@ -50236,64 +51791,24 @@ diff -urNp linux-2.6.32.13/lib/inflate.c linux-2.6.32.13/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-2.6.32.13/lib/Kconfig.debug linux-2.6.32.13/lib/Kconfig.debug
---- linux-2.6.32.13/lib/Kconfig.debug	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/lib/Kconfig.debug	2010-05-15 13:21:18.339667096 -0400
-@@ -905,7 +905,7 @@ config LATENCYTOP
- 	select STACKTRACE
- 	select SCHEDSTATS
- 	select SCHED_DEBUG
--	depends on HAVE_LATENCYTOP_SUPPORT
-+	depends on HAVE_LATENCYTOP_SUPPORT && !GRKERNSEC_HIDESYM
- 	help
- 	  Enable this option if you want to use the LatencyTOP tool
- 	  to find out which userspace is blocking on what kernel operations.
-diff -urNp linux-2.6.32.13/lib/kobject.c linux-2.6.32.13/lib/kobject.c
---- linux-2.6.32.13/lib/kobject.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/lib/kobject.c	2010-05-15 13:21:18.355221413 -0400
-@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
- 	return ret;
- }
- 
--struct sysfs_ops kobj_sysfs_ops = {
-+const struct sysfs_ops kobj_sysfs_ops = {
- 	.show	= kobj_attr_show,
- 	.store	= kobj_attr_store,
- };
-@@ -789,7 +789,7 @@ static struct kobj_type kset_ktype = {
-  * If the kset was not able to be created, NULL will be returned.
-  */
- static struct kset *kset_create(const char *name,
--				struct kset_uevent_ops *uevent_ops,
-+				const struct kset_uevent_ops *uevent_ops,
- 				struct kobject *parent_kobj)
- {
- 	struct kset *kset;
-@@ -832,7 +832,7 @@ static struct kset *kset_create(const ch
-  * If the kset was not able to be created, NULL will be returned.
+diff --git a/lib/kref.c b/lib/kref.c
+index d3d227a..e0840c6 100644
+--- a/lib/kref.c
++++ b/lib/kref.c
+@@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
   */
- struct kset *kset_create_and_add(const char *name,
--				 struct kset_uevent_ops *uevent_ops,
-+				 const struct kset_uevent_ops *uevent_ops,
- 				 struct kobject *parent_kobj)
- {
- 	struct kset *kset;
-diff -urNp linux-2.6.32.13/lib/kobject_uevent.c linux-2.6.32.13/lib/kobject_uevent.c
---- linux-2.6.32.13/lib/kobject_uevent.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/lib/kobject_uevent.c	2010-05-15 13:21:18.355221413 -0400
-@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
- 	const char *subsystem;
- 	struct kobject *top_kobj;
- 	struct kset *kset;
--	struct kset_uevent_ops *uevent_ops;
-+	const struct kset_uevent_ops *uevent_ops;
- 	u64 seq;
- 	int i = 0;
- 	int retval = 0;
-diff -urNp linux-2.6.32.13/lib/parser.c linux-2.6.32.13/lib/parser.c
---- linux-2.6.32.13/lib/parser.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/lib/parser.c	2010-05-15 13:21:18.358625413 -0400
-@@ -126,7 +126,7 @@ static int match_number(substring_t *s, 
+ int kref_put(struct kref *kref, void (*release)(struct kref *kref))
+ {
+-	WARN_ON(release == NULL);
++	BUG_ON(release == NULL);
+ 	WARN_ON(release == (void (*)(struct kref *))kfree);
+ 
+ 	if (atomic_dec_and_test(&kref->refcount)) {
+diff --git a/lib/parser.c b/lib/parser.c
+index fb34977..f5db621 100644
+--- a/lib/parser.c
++++ b/lib/parser.c
+@@ -129,7 +129,7 @@ static int match_number(substring_t *s, int *result, int base)
  	char *buf;
  	int ret;
  
@@ -50302,62 +51817,94 @@ diff -urNp linux-2.6.32.13/lib/parser.c linux-2.6.32.13/lib/parser.c
  	if (!buf)
  		return -ENOMEM;
  	memcpy(buf, s->from, s->to - s->from);
-diff -urNp linux-2.6.32.13/lib/radix-tree.c linux-2.6.32.13/lib/radix-tree.c
---- linux-2.6.32.13/lib/radix-tree.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/lib/radix-tree.c	2010-05-15 13:21:18.366643034 -0400
-@@ -81,7 +81,7 @@ struct radix_tree_preload {
+diff --git a/lib/radix-tree.c b/lib/radix-tree.c
+index 5f0ed4b..d0d657d 100644
+--- a/lib/radix-tree.c
++++ b/lib/radix-tree.c
+@@ -80,7 +80,7 @@ struct radix_tree_preload {
  	int nr;
  	struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
  };
 -static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
 +static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
  
- static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
- {
-diff -urNp linux-2.6.32.13/lib/random32.c linux-2.6.32.13/lib/random32.c
---- linux-2.6.32.13/lib/random32.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/lib/random32.c	2010-05-15 13:21:18.370623064 -0400
-@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
-  */
- static inline u32 __seed(u32 x, u32 m)
- {
--	return (x < m) ? x + m : x;
-+	return (x <= m) ? x + m + 1 : x;
- }
- 
- /**
-diff -urNp linux-2.6.32.13/localversion-grsec linux-2.6.32.13/localversion-grsec
---- linux-2.6.32.13/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.13/localversion-grsec	2010-05-15 13:21:18.370623064 -0400
+ static inline void *ptr_to_indirect(void *ptr)
+ {
+diff --git a/lib/vsprintf.c b/lib/vsprintf.c
+index b8a2f54..a383ff5 100644
+--- a/lib/vsprintf.c
++++ b/lib/vsprintf.c
+@@ -990,7 +990,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+ 	      struct printf_spec spec)
+ {
+ 	if (!ptr)
+-		return string(buf, end, "(null)", spec);
++		return string(buf, end, "(nil)", spec);
+ 
+ 	switch (*fmt) {
+ 	case 'F':
+diff --git a/localversion-grsec b/localversion-grsec
+new file mode 100644
+index 0000000..7cd6065
+--- /dev/null
++++ b/localversion-grsec
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-2.6.32.13/Makefile linux-2.6.32.13/Makefile
---- linux-2.6.32.13/Makefile	2010-05-15 13:20:18.396226636 -0400
-+++ linux-2.6.32.13/Makefile	2010-05-15 13:21:18.370623064 -0400
-@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
- 
- HOSTCC       = gcc
- HOSTCXX      = g++
--HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
--HOSTCXXFLAGS = -O2
-+HOSTCFLAGS   = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
-+HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
- 
- # Decide whether to build built-in, modular, or both.
- # Normally, just do built-in.
-@@ -644,7 +644,7 @@ export mod_strip_cmd
- 
- 
- ifeq ($(KBUILD_EXTMOD),)
--core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
+diff --git a/mm/Kconfig b/mm/Kconfig
+index f4e516e..a5462a1 100644
+--- a/mm/Kconfig
++++ b/mm/Kconfig
+@@ -240,7 +240,7 @@ config KSM
+ config DEFAULT_MMAP_MIN_ADDR
+         int "Low address space to protect from user allocation"
+ 	depends on MMU
+-        default 4096
++        default 65536
+         help
+ 	  This is the portion of low virtual memory which should be protected
+ 	  from userspace allocation.  Keeping a user from writing to low pages
+diff --git a/mm/bootmem.c b/mm/bootmem.c
+index 142c84a..59d8f7c 100644
+--- a/mm/bootmem.c
++++ b/mm/bootmem.c
+@@ -200,19 +200,30 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
+ unsigned long __init free_all_memory_core_early(int nodeid)
+ {
+ 	int i;
+-	u64 start, end;
++	u64 start, end, startrange, endrange;
+ 	unsigned long count = 0;
+-	struct range *range = NULL;
++	struct range *range = NULL, rangerange = { 0, 0 };
+ 	int nr_range;
+ 
+ 	nr_range = get_free_all_memory_range(&range, nodeid);
++	startrange = __pa(range) >> PAGE_SHIFT;
++	endrange = (__pa(range + nr_range) - 1) >> PAGE_SHIFT;
+ 
+ 	for (i = 0; i < nr_range; i++) {
+ 		start = range[i].start;
+ 		end = range[i].end;
++		if (start <= endrange && startrange < end) {
++			BUG_ON(rangerange.start | rangerange.end);
++			rangerange = range[i];
++			continue;
++		}
+ 		count += end - start;
+ 		__free_pages_memory(start, end);
+ 	}
++	start = rangerange.start;
++	end = rangerange.end;
++	count += end - start;
++	__free_pages_memory(start, end);
  
- vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
- 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -urNp linux-2.6.32.13/mm/filemap.c linux-2.6.32.13/mm/filemap.c
---- linux-2.6.32.13/mm/filemap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/filemap.c	2010-05-15 13:21:18.370623064 -0400
-@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file
+ 	return count;
+ }
+diff --git a/mm/filemap.c b/mm/filemap.c
+index 183d2d4..d5c67db 100644
+--- a/mm/filemap.c
++++ b/mm/filemap.c
+@@ -1637,7 +1637,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
  	struct address_space *mapping = file->f_mapping;
  
  	if (!mapping->a_ops->readpage)
@@ -50366,7 +51913,7 @@ diff -urNp linux-2.6.32.13/mm/filemap.c linux-2.6.32.13/mm/filemap.c
  	file_accessed(file);
  	vma->vm_ops = &generic_file_vm_ops;
  	vma->vm_flags |= VM_CAN_NONLINEAR;
-@@ -2018,6 +2018,7 @@ inline int generic_write_checks(struct f
+@@ -2033,6 +2033,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
                          *pos = i_size_read(inode);
  
  		if (limit != RLIM_INFINITY) {
@@ -50374,10 +51921,11 @@ diff -urNp linux-2.6.32.13/mm/filemap.c linux-2.6.32.13/mm/filemap.c
  			if (*pos >= limit) {
  				send_sig(SIGXFSZ, current, 0);
  				return -EFBIG;
-diff -urNp linux-2.6.32.13/mm/fremap.c linux-2.6.32.13/mm/fremap.c
---- linux-2.6.32.13/mm/fremap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/fremap.c	2010-05-15 13:21:18.370623064 -0400
-@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
+diff --git a/mm/fremap.c b/mm/fremap.c
+index 46f5dac..eb91b0e 100644
+--- a/mm/fremap.c
++++ b/mm/fremap.c
+@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
   retry:
  	vma = find_vma(mm, start);
  
@@ -50389,9 +51937,19 @@ diff -urNp linux-2.6.32.13/mm/fremap.c linux-2.6.32.13/mm/fremap.c
  	/*
  	 * Make sure the vma is shared, that it supports prefaulting,
  	 * and that the remapped range is valid and fully within
-diff -urNp linux-2.6.32.13/mm/highmem.c linux-2.6.32.13/mm/highmem.c
---- linux-2.6.32.13/mm/highmem.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/highmem.c	2010-05-15 13:21:18.370623064 -0400
+@@ -221,7 +226,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+ 		/*
+ 		 * drop PG_Mlocked flag for over-mapped range
+ 		 */
+-		unsigned int saved_flags = vma->vm_flags;
++		unsigned long saved_flags = vma->vm_flags;
+ 		munlock_vma_pages_range(vma, start, start + size);
+ 		vma->vm_flags = saved_flags;
+ 	}
+diff --git a/mm/highmem.c b/mm/highmem.c
+index 66baa20..9cb47bf 100644
+--- a/mm/highmem.c
++++ b/mm/highmem.c
 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
  		 * So no dangers, even with speculative execution.
  		 */
@@ -50417,10 +51975,11 @@ diff -urNp linux-2.6.32.13/mm/highmem.c linux-2.6.32.13/mm/highmem.c
  	pkmap_count[last_pkmap_nr] = 1;
  	set_page_address(page, (void *)vaddr);
  
-diff -urNp linux-2.6.32.13/mm/hugetlb.c linux-2.6.32.13/mm/hugetlb.c
---- linux-2.6.32.13/mm/hugetlb.c	2010-05-15 13:20:19.411414284 -0400
-+++ linux-2.6.32.13/mm/hugetlb.c	2010-05-15 13:21:18.370623064 -0400
-@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s
+diff --git a/mm/hugetlb.c b/mm/hugetlb.c
+index 54d42b0..e63e00c 100644
+--- a/mm/hugetlb.c
++++ b/mm/hugetlb.c
+@@ -2272,6 +2272,26 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
  	return 1;
  }
  
@@ -50447,7 +52006,7 @@ diff -urNp linux-2.6.32.13/mm/hugetlb.c linux-2.6.32.13/mm/hugetlb.c
  static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
  			unsigned long address, pte_t *ptep, pte_t pte,
  			struct page *pagecache_page)
-@@ -1996,6 +2016,11 @@ retry_avoidcopy:
+@@ -2352,6 +2372,11 @@ retry_avoidcopy:
  		huge_ptep_clear_flush(vma, address, ptep);
  		set_huge_pte_at(mm, address, ptep,
  				make_huge_pte(vma, new_page, 1));
@@ -50459,7 +52018,7 @@ diff -urNp linux-2.6.32.13/mm/hugetlb.c linux-2.6.32.13/mm/hugetlb.c
  		/* Make the old page be freed below */
  		new_page = old_page;
  	}
-@@ -2127,6 +2152,10 @@ retry:
+@@ -2483,6 +2508,10 @@ retry:
  				&& (vma->vm_flags & VM_SHARED)));
  	set_huge_pte_at(mm, address, ptep, new_pte);
  
@@ -50470,7 +52029,7 @@ diff -urNp linux-2.6.32.13/mm/hugetlb.c linux-2.6.32.13/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);
-@@ -2155,6 +2184,28 @@ int hugetlb_fault(struct mm_struct *mm, 
+@@ -2511,6 +2540,28 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  	static DEFINE_MUTEX(hugetlb_instantiation_mutex);
  	struct hstate *h = hstate_vma(vma);
  
@@ -50499,43 +52058,41 @@ diff -urNp linux-2.6.32.13/mm/hugetlb.c linux-2.6.32.13/mm/hugetlb.c
  	ptep = huge_pte_alloc(mm, address, huge_page_size(h));
  	if (!ptep)
  		return VM_FAULT_OOM;
-diff -urNp linux-2.6.32.13/mm/Kconfig linux-2.6.32.13/mm/Kconfig
---- linux-2.6.32.13/mm/Kconfig	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/Kconfig	2010-05-15 13:21:18.370623064 -0400
-@@ -228,7 +228,7 @@ config KSM
- config DEFAULT_MMAP_MIN_ADDR
-         int "Low address space to protect from user allocation"
- 	depends on MMU
--        default 4096
-+        default 65536
-         help
- 	  This is the portion of low virtual memory which should be protected
- 	  from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-2.6.32.13/mm/maccess.c linux-2.6.32.13/mm/maccess.c
---- linux-2.6.32.13/mm/maccess.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/maccess.c	2010-05-15 13:21:18.370623064 -0400
-@@ -14,7 +14,7 @@
-  * Safely read from address @src to the buffer at @dst.  If a kernel fault
+diff --git a/mm/maccess.c b/mm/maccess.c
+index 4e348db..d6b78e7 100644
+--- a/mm/maccess.c
++++ b/mm/maccess.c
+@@ -15,10 +15,10 @@
   * happens, handle that and return -EFAULT.
   */
--long probe_kernel_read(void *dst, void *src, size_t size)
-+long probe_kernel_read(void *dst, const void *src, size_t size)
+ 
+-long __weak probe_kernel_read(void *dst, void *src, size_t size)
++long __weak probe_kernel_read(void *dst, const void *src, size_t size)
+     __attribute__((alias("__probe_kernel_read")));
+ 
+-long __probe_kernel_read(void *dst, void *src, size_t size)
++long __probe_kernel_read(void *dst, const void *src, size_t size)
  {
  	long ret;
  	mm_segment_t old_fs = get_fs();
-@@ -39,7 +39,7 @@ EXPORT_SYMBOL_GPL(probe_kernel_read);
+@@ -43,10 +43,10 @@ EXPORT_SYMBOL_GPL(probe_kernel_read);
   * Safely write to address @dst from the buffer at @src.  If a kernel fault
   * happens, handle that and return -EFAULT.
   */
--long notrace __weak probe_kernel_write(void *dst, void *src, size_t size)
-+long notrace __weak probe_kernel_write(void *dst, const void *src, size_t size)
+-long __weak probe_kernel_write(void *dst, void *src, size_t size)
++long __weak probe_kernel_write(void *dst, const void *src, size_t size)
+     __attribute__((alias("__probe_kernel_write")));
+ 
+-long __probe_kernel_write(void *dst, void *src, size_t size)
++long __probe_kernel_write(void *dst, const void *src, size_t size)
  {
  	long ret;
  	mm_segment_t old_fs = get_fs();
-diff -urNp linux-2.6.32.13/mm/madvise.c linux-2.6.32.13/mm/madvise.c
---- linux-2.6.32.13/mm/madvise.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/madvise.c	2010-05-15 13:21:18.378626814 -0400
-@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
+diff --git a/mm/madvise.c b/mm/madvise.c
+index 319528b..8d67810 100644
+--- a/mm/madvise.c
++++ b/mm/madvise.c
+@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
  	pgoff_t pgoff;
  	unsigned long new_flags = vma->vm_flags;
  
@@ -50546,7 +52103,7 @@ diff -urNp linux-2.6.32.13/mm/madvise.c linux-2.6.32.13/mm/madvise.c
  	switch (behavior) {
  	case MADV_NORMAL:
  		new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
-@@ -103,6 +107,13 @@ success:
+@@ -104,6 +108,13 @@ success:
  	/*
  	 * vm_flags is protected by the mmap_sem held in write mode.
  	 */
@@ -50560,7 +52117,7 @@ diff -urNp linux-2.6.32.13/mm/madvise.c linux-2.6.32.13/mm/madvise.c
  	vma->vm_flags = new_flags;
  
  out:
-@@ -161,6 +172,11 @@ static long madvise_dontneed(struct vm_a
+@@ -162,6 +173,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
  			     struct vm_area_struct ** prev,
  			     unsigned long start, unsigned long end)
  {
@@ -50572,7 +52129,7 @@ diff -urNp linux-2.6.32.13/mm/madvise.c linux-2.6.32.13/mm/madvise.c
  	*prev = vma;
  	if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
  		return -EINVAL;
-@@ -173,6 +189,21 @@ static long madvise_dontneed(struct vm_a
+@@ -174,6 +190,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
  		zap_page_range(vma, start, end - start, &details);
  	} else
  		zap_page_range(vma, start, end - start, NULL);
@@ -50594,7 +52151,7 @@ diff -urNp linux-2.6.32.13/mm/madvise.c linux-2.6.32.13/mm/madvise.c
  	return 0;
  }
  
-@@ -359,6 +390,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, 
+@@ -366,6 +397,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
  	if (end < start)
  		goto out;
  
@@ -50611,18 +52168,95 @@ diff -urNp linux-2.6.32.13/mm/madvise.c linux-2.6.32.13/mm/madvise.c
  	error = 0;
  	if (end == start)
  		goto out;
-diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
---- linux-2.6.32.13/mm/memory.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/memory.c	2010-05-15 13:21:18.394625565 -0400
-@@ -48,6 +48,7 @@
- #include <linux/ksm.h>
- #include <linux/rmap.h>
- #include <linux/module.h>
-+#include <linux/security.h>
- #include <linux/delayacct.h>
- #include <linux/init.h>
- #include <linux/writeback.h>
-@@ -1251,10 +1252,10 @@ int __get_user_pages(struct task_struct 
+diff --git a/mm/memory-failure.c b/mm/memory-failure.c
+index 620b0b4..0cdb10f 100644
+--- a/mm/memory-failure.c
++++ b/mm/memory-failure.c
+@@ -51,7 +51,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
+ 
+ int sysctl_memory_failure_recovery __read_mostly = 1;
+ 
+-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
++atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
+ 
+ #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
+ 
+@@ -939,7 +939,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
+ 		return 0;
+ 	}
+ 
+-	atomic_long_add(1, &mce_bad_pages);
++	atomic_long_add_unchecked(1, &mce_bad_pages);
+ 
+ 	/*
+ 	 * We need/can do nothing about count=0 pages.
+@@ -1003,7 +1003,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
+ 	}
+ 	if (hwpoison_filter(p)) {
+ 		if (TestClearPageHWPoison(p))
+-			atomic_long_dec(&mce_bad_pages);
++			atomic_long_dec_unchecked(&mce_bad_pages);
+ 		unlock_page(p);
+ 		put_page(p);
+ 		return 0;
+@@ -1096,7 +1096,7 @@ int unpoison_memory(unsigned long pfn)
+ 
+ 	if (!get_page_unless_zero(page)) {
+ 		if (TestClearPageHWPoison(p))
+-			atomic_long_dec(&mce_bad_pages);
++			atomic_long_dec_unchecked(&mce_bad_pages);
+ 		pr_debug("MCE: Software-unpoisoned free page %#lx\n", pfn);
+ 		return 0;
+ 	}
+@@ -1110,7 +1110,7 @@ int unpoison_memory(unsigned long pfn)
+ 	 */
+ 	if (TestClearPageHWPoison(p)) {
+ 		pr_debug("MCE: Software-unpoisoned page %#lx\n", pfn);
+-		atomic_long_dec(&mce_bad_pages);
++		atomic_long_dec_unchecked(&mce_bad_pages);
+ 		freeit = 1;
+ 	}
+ 	unlock_page(page);
+@@ -1291,7 +1291,7 @@ int soft_offline_page(struct page *page, int flags)
+ 		return ret;
+ 
+ done:
+-	atomic_long_add(1, &mce_bad_pages);
++	atomic_long_add_unchecked(1, &mce_bad_pages);
+ 	SetPageHWPoison(page);
+ 	/* keep elevated page count for bad page */
+ 	return ret;
+diff --git a/mm/memory.c b/mm/memory.c
+index 7550758..3f21de3 100644
+--- a/mm/memory.c
++++ b/mm/memory.c
+@@ -259,8 +259,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
+ 		return;
+ 
+ 	pmd = pmd_offset(pud, start);
++
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
+ 	pud_clear(pud);
+ 	pmd_free_tlb(tlb, pmd, start);
++#endif
++
+ }
+ 
+ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+@@ -291,9 +295,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+ 	if (end - 1 > ceiling - 1)
+ 		return;
+ 
++#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
+ 	pud = pud_offset(pgd, start);
+ 	pgd_clear(pgd);
+ 	pud_free_tlb(tlb, pud, start);
++#endif
++
+ }
+ 
+ /*
+@@ -1363,10 +1370,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
  			(VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
  	i = 0;
  
@@ -50635,7 +52269,7 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  		if (!vma && in_gate_area(tsk, start)) {
  			unsigned long pg = start & PAGE_MASK;
  			struct vm_area_struct *gate_vma = get_gate_vma(tsk);
-@@ -1296,7 +1297,7 @@ int __get_user_pages(struct task_struct 
+@@ -1418,7 +1425,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
  			continue;
  		}
  
@@ -50644,7 +52278,7 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  		    (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
  		    !(vm_flags & vma->vm_flags))
  			return i ? : -EFAULT;
-@@ -1371,7 +1372,7 @@ int __get_user_pages(struct task_struct 
+@@ -1493,7 +1500,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
  			start += PAGE_SIZE;
  			nr_pages--;
  		} while (nr_pages && start < vma->vm_end);
@@ -50653,7 +52287,49 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  	return i;
  }
  
-@@ -1967,6 +1968,186 @@ static inline void cow_user_page(struct 
+@@ -1638,6 +1645,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
+ 	page_add_file_rmap(page);
+ 	set_pte_at(mm, addr, pte, mk_pte(page, prot));
+ 
++#ifdef CONFIG_PAX_SEGMEXEC
++	pax_mirror_file_pte(vma, addr, page, ptl);
++#endif
++
+ 	retval = 0;
+ 	pte_unmap_unlock(pte, ptl);
+ 	return retval;
+@@ -1672,10 +1683,22 @@ out:
+ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
+ 			struct page *page)
+ {
++
++#ifdef CONFIG_PAX_SEGMEXEC
++	struct vm_area_struct *vma_m;
++#endif
++
+ 	if (addr < vma->vm_start || addr >= vma->vm_end)
+ 		return -EFAULT;
+ 	if (!page_count(page))
+ 		return -EINVAL;
++
++#ifdef CONFIG_PAX_SEGMEXEC
++	vma_m = pax_find_mirror_vma(vma);
++	if (vma_m)
++		vma_m->vm_flags |= VM_INSERTPAGE;
++#endif
++
+ 	vma->vm_flags |= VM_INSERTPAGE;
+ 	return insert_page(vma, addr, page, vma->vm_page_prot);
+ }
+@@ -1761,6 +1784,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
+ 			unsigned long pfn)
+ {
+ 	BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
++	BUG_ON(vma->vm_mirror);
+ 
+ 	if (addr < vma->vm_start || addr >= vma->vm_end)
+ 		return -EFAULT;
+@@ -2089,6 +2113,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
  		copy_user_highpage(dst, src, va, vma);
  }
  
@@ -50682,9 +52358,9 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
 +		if (page) {
 +			update_hiwater_rss(mm);
 +			if (PageAnon(page))
-+				dec_mm_counter(mm, anon_rss);
++				dec_mm_counter_fast(mm, MM_ANONPAGES);
 +			else
-+				dec_mm_counter(mm, file_rss);
++				dec_mm_counter_fast(mm, MM_FILEPAGES);
 +			page_remove_rmap(page);
 +			page_cache_release(page);
 +		}
@@ -50727,7 +52403,7 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
 +	entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
 +	page_cache_get(page_m);
 +	page_add_anon_rmap(page_m, vma_m, address_m);
-+	inc_mm_counter(mm, anon_rss);
++	inc_mm_counter_fast(mm, MM_ANONPAGES);
 +	set_pte_at(mm, address_m, pte_m, entry_m);
 +	update_mmu_cache(vma_m, address_m, entry_m);
 +out:
@@ -50766,7 +52442,7 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
 +	entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
 +	page_cache_get(page_m);
 +	page_add_file_rmap(page_m);
-+	inc_mm_counter(mm, file_rss);
++	inc_mm_counter_fast(mm, MM_FILEPAGES);
 +	set_pte_at(mm, address_m, pte_m, entry_m);
 +	update_mmu_cache(vma_m, address_m, entry_m);
 +out:
@@ -50840,7 +52516,7 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/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
-@@ -2146,6 +2327,12 @@ gotten:
+@@ -2275,6 +2479,12 @@ gotten:
  	 */
  	page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
  	if (likely(pte_same(*page_table, orig_pte))) {
@@ -50852,8 +52528,8 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
 +
  		if (old_page) {
  			if (!PageAnon(old_page)) {
- 				dec_mm_counter(mm, file_rss);
-@@ -2197,6 +2384,10 @@ gotten:
+ 				dec_mm_counter_fast(mm, MM_FILEPAGES);
+@@ -2326,6 +2536,10 @@ gotten:
  			page_remove_rmap(old_page);
  		}
  
@@ -50864,7 +52540,7 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  		/* Free the old page.. */
  		new_page = old_page;
  		ret |= VM_FAULT_WRITE;
-@@ -2594,6 +2785,11 @@ static int do_swap_page(struct mm_struct
+@@ -2749,19 +2963,12 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
  	swap_free(entry);
  	if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
  		try_to_free_swap(page);
@@ -50874,12 +52550,25 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
 +#endif
 +
  	unlock_page(page);
+-	if (swapcache) {
+-		/*
+-		 * Hold the lock to avoid the swap entry to be reused
+-		 * until we take the PT lock for the pte_same() check
+-		 * (to avoid false positives from pte_same). For
+-		 * further safety release the lock after the swap_free
+-		 * so that the swap count won't change under a
+-		 * parallel locked swapcache.
+-		 */
+-		unlock_page(swapcache);
+-		page_cache_release(swapcache);
+-	}
  
  	if (flags & FAULT_FLAG_WRITE) {
-@@ -2605,6 +2801,11 @@ static int do_swap_page(struct mm_struct
+ 		ret |= do_wp_page(mm, vma, address, page_table, pmd, ptl, pte);
+@@ -2772,6 +2979,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
  
  	/* No need to invalidate - it was non-present before */
- 	update_mmu_cache(vma, address, pte);
+ 	update_mmu_cache(vma, address, page_table);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	pax_mirror_anon_pte(vma, address, page, ptl);
@@ -50888,7 +52577,56 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  unlock:
  	pte_unmap_unlock(page_table, ptl);
  out:
-@@ -2628,7 +2829,7 @@ static int do_anonymous_page(struct mm_s
+@@ -2783,48 +2995,10 @@ out_page:
+ 	unlock_page(page);
+ out_release:
+ 	page_cache_release(page);
+-	if (swapcache) {
+-		unlock_page(swapcache);
+-		page_cache_release(swapcache);
+-	}
+ 	return ret;
+ }
+ 
+ /*
+- * This is like a special single-page "expand_{down|up}wards()",
+- * except we must first make sure that 'address{-|+}PAGE_SIZE'
+- * doesn't hit another vma.
+- */
+-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
+-{
+-	address &= PAGE_MASK;
+-	if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
+-		struct vm_area_struct *prev = vma->vm_prev;
+-
+-		/*
+-		 * Is there a mapping abutting this one below?
+-		 *
+-		 * That's only ok if it's the same stack mapping
+-		 * that has gotten split..
+-		 */
+-		if (prev && prev->vm_end == address)
+-			return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
+-
+-		expand_stack(vma, address - PAGE_SIZE);
+-	}
+-	if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
+-		struct vm_area_struct *next = vma->vm_next;
+-
+-		/* As VM_GROWSDOWN but s/below/above/ */
+-		if (next && next->vm_start == address + PAGE_SIZE)
+-			return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
+-
+-		expand_upwards(vma, address + PAGE_SIZE);
+-	}
+-	return 0;
+-}
+-
+-/*
+  * 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.
+@@ -2833,27 +3007,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
  		unsigned long address, pte_t *page_table, pmd_t *pmd,
  		unsigned int flags)
  {
@@ -50897,7 +52635,31 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  	spinlock_t *ptl;
  	pte_t entry;
  
-@@ -2663,6 +2864,11 @@ static int do_anonymous_page(struct mm_s
+-	pte_unmap(page_table);
+-
+-	/* Check if we need to add a guard page to the stack */
+-	if (check_stack_guard_page(vma, address) < 0)
+-		return VM_FAULT_SIGBUS;
+-
+-	/* Use the zero-page for reads */
+ 	if (!(flags & FAULT_FLAG_WRITE)) {
+ 		entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
+ 						vma->vm_page_prot));
+-		page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
++		ptl = pte_lockptr(mm, pmd);
++		spin_lock(ptl);
+ 		if (!pte_none(*page_table))
+ 			goto unlock;
+ 		goto setpte;
+ 	}
+ 
+ 	/* Allocate our own private page. */
++	pte_unmap(page_table);
++
+ 	if (unlikely(anon_vma_prepare(vma)))
+ 		goto oom;
+ 	page = alloc_zeroed_user_highpage_movable(vma, address);
+@@ -2872,6 +3042,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
  	if (!pte_none(*page_table))
  		goto release;
  
@@ -50906,13 +52668,13 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
 +		BUG_ON(!trylock_page(page));
 +#endif
 +
- 	inc_mm_counter(mm, anon_rss);
+ 	inc_mm_counter_fast(mm, MM_ANONPAGES);
  	page_add_new_anon_rmap(page, vma, address);
  setpte:
-@@ -2670,6 +2876,12 @@ setpte:
+@@ -2879,6 +3054,12 @@ setpte:
  
  	/* No need to invalidate - it was non-present before */
- 	update_mmu_cache(vma, address, entry);
+ 	update_mmu_cache(vma, address, page_table);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	if (page)
@@ -50922,7 +52684,7 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  unlock:
  	pte_unmap_unlock(page_table, ptl);
  	return 0;
-@@ -2812,6 +3024,12 @@ static int __do_fault(struct mm_struct *
+@@ -3021,6 +3202,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  	 */
  	/* Only go through if we didn't race with anybody else... */
  	if (likely(pte_same(*page_table, orig_pte))) {
@@ -50935,10 +52697,10 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  		flush_icache_page(vma, page);
  		entry = mk_pte(page, vma->vm_page_prot);
  		if (flags & FAULT_FLAG_WRITE)
-@@ -2831,6 +3049,14 @@ static int __do_fault(struct mm_struct *
+@@ -3040,6 +3227,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  
  		/* no need to invalidate: a not-present page won't be cached */
- 		update_mmu_cache(vma, address, entry);
+ 		update_mmu_cache(vma, address, page_table);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +		if (anon)
@@ -50950,7 +52712,7 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  	} else {
  		if (charged)
  			mem_cgroup_uncharge_page(page);
-@@ -2978,6 +3204,12 @@ static inline int handle_pte_fault(struc
+@@ -3187,6 +3382,12 @@ static inline int handle_pte_fault(struct mm_struct *mm,
  		if (flags & FAULT_FLAG_WRITE)
  			flush_tlb_page(vma, address);
  	}
@@ -50963,7 +52725,7 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  unlock:
  	pte_unmap_unlock(pte, ptl);
  	return 0;
-@@ -2994,6 +3226,10 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3203,6 +3404,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  	pmd_t *pmd;
  	pte_t *pte;
  
@@ -50974,7 +52736,7 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  	__set_current_state(TASK_RUNNING);
  
  	count_vm_event(PGFAULT);
-@@ -3001,6 +3237,34 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3213,6 +3418,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  	if (unlikely(is_vm_hugetlb_page(vma)))
  		return hugetlb_fault(mm, vma, address, flags);
  
@@ -51009,7 +52771,7 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  	pgd = pgd_offset(mm, address);
  	pud = pud_alloc(mm, pgd, address);
  	if (!pud)
-@@ -3098,7 +3362,7 @@ static int __init gate_vma_init(void)
+@@ -3310,7 +3543,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;
@@ -51018,59 +52780,39 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
  	/*
  	 * Make sure the vDSO gets into every core dump.
  	 * Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-2.6.32.13/mm/memory-failure.c linux-2.6.32.13/mm/memory-failure.c
---- linux-2.6.32.13/mm/memory-failure.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/memory-failure.c	2010-05-15 13:21:18.394625565 -0400
-@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
- 
- int sysctl_memory_failure_recovery __read_mostly = 1;
- 
--atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
-+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
- 
- /*
-  * Send all the processes who have the page mapped an ``action optional''
-@@ -741,7 +741,7 @@ int __memory_failure(unsigned long pfn, 
- 		return 0;
- 	}
- 
--	atomic_long_add(1, &mce_bad_pages);
-+	atomic_long_add_unchecked(1, &mce_bad_pages);
- 
- 	/*
- 	 * We need/can do nothing about count=0 pages.
-diff -urNp linux-2.6.32.13/mm/mempolicy.c linux-2.6.32.13/mm/mempolicy.c
---- linux-2.6.32.13/mm/mempolicy.c	2010-04-04 20:41:50.072525146 -0400
-+++ linux-2.6.32.13/mm/mempolicy.c	2010-05-15 13:21:18.411130134 -0400
-@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
- 	struct vm_area_struct *next;
- 	int err;
+diff --git a/mm/mempolicy.c b/mm/mempolicy.c
+index 407cda2..a40f5d1 100644
+--- a/mm/mempolicy.c
++++ b/mm/mempolicy.c
+@@ -642,6 +642,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
+ 	unsigned long vmstart;
+ 	unsigned long vmend;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	struct vm_area_struct *vma_m;
 +#endif
 +
- 	err = 0;
- 	for (; vma && vma->vm_start < end; vma = next) {
- 		next = vma->vm_next;
-@@ -584,6 +588,16 @@ static int mbind_range(struct vm_area_st
- 			err = policy_vma(vma, new);
+ 	vma = find_vma_prev(mm, start, &prev);
+ 	if (!vma || vma->vm_start > start)
+ 		return -EFAULT;
+@@ -672,6 +676,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
+ 		err = policy_vma(vma, new_pol);
  		if (err)
- 			break;
+ 			goto out;
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +		vma_m = pax_find_mirror_vma(vma);
 +		if (vma_m) {
-+			err = policy_vma(vma_m, new);
++			err = policy_vma(vma_m, new_pol);
 +			if (err)
-+				break;
++				goto out;
 +		}
 +#endif
 +
  	}
- 	return err;
- }
-@@ -1002,6 +1016,17 @@ static long do_mbind(unsigned long start
+ 
+  out:
+@@ -1098,6 +1112,17 @@ static long do_mbind(unsigned long start, unsigned long len,
  
  	if (end < start)
  		return -EINVAL;
@@ -51088,7 +52830,7 @@ diff -urNp linux-2.6.32.13/mm/mempolicy.c linux-2.6.32.13/mm/mempolicy.c
  	if (end == start)
  		return 0;
  
-@@ -1207,6 +1232,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
+@@ -1303,6 +1328,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
  	if (!mm)
  		return -EINVAL;
  
@@ -51103,7 +52845,7 @@ diff -urNp linux-2.6.32.13/mm/mempolicy.c linux-2.6.32.13/mm/mempolicy.c
  	/*
  	 * Check if this process has the right to modify the specified
  	 * process. The right exists if the process has administrative
-@@ -1216,8 +1249,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
+@@ -1312,8 +1345,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
  	rcu_read_lock();
  	tcred = __task_cred(task);
  	if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
@@ -51113,7 +52855,7 @@ diff -urNp linux-2.6.32.13/mm/mempolicy.c linux-2.6.32.13/mm/mempolicy.c
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-@@ -2396,7 +2428,7 @@ int show_numa_map(struct seq_file *m, vo
+@@ -2564,7 +2596,7 @@ int show_numa_map(struct seq_file *m, void *v)
  
  	if (file) {
  		seq_printf(m, " file=");
@@ -51122,10 +52864,11 @@ diff -urNp linux-2.6.32.13/mm/mempolicy.c linux-2.6.32.13/mm/mempolicy.c
  	} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
  		seq_printf(m, " heap");
  	} else if (vma->vm_start <= mm->start_stack &&
-diff -urNp linux-2.6.32.13/mm/migrate.c linux-2.6.32.13/mm/migrate.c
---- linux-2.6.32.13/mm/migrate.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/migrate.c	2010-05-15 13:21:18.411130134 -0400
-@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
+diff --git a/mm/migrate.c b/mm/migrate.c
+index 4205b1d..ebcf0e3 100644
+--- a/mm/migrate.c
++++ b/mm/migrate.c
+@@ -1102,6 +1102,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
  	if (!mm)
  		return -EINVAL;
  
@@ -51140,7 +52883,7 @@ diff -urNp linux-2.6.32.13/mm/migrate.c linux-2.6.32.13/mm/migrate.c
  	/*
  	 * Check if this process has the right to modify the specified
  	 * process. The right exists if the process has administrative
-@@ -1115,8 +1123,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
+@@ -1111,8 +1119,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
  	rcu_read_lock();
  	tcred = __task_cred(task);
  	if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
@@ -51150,9 +52893,10 @@ diff -urNp linux-2.6.32.13/mm/migrate.c linux-2.6.32.13/mm/migrate.c
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-diff -urNp linux-2.6.32.13/mm/mlock.c linux-2.6.32.13/mm/mlock.c
---- linux-2.6.32.13/mm/mlock.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/mlock.c	2010-05-15 13:21:18.411130134 -0400
+diff --git a/mm/mlock.c b/mm/mlock.c
+index b70919c..9935a98 100644
+--- a/mm/mlock.c
++++ b/mm/mlock.c
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -51161,25 +52905,56 @@ diff -urNp linux-2.6.32.13/mm/mlock.c linux-2.6.32.13/mm/mlock.c
  #include <linux/sched.h>
  #include <linux/module.h>
  #include <linux/rmap.h>
-@@ -435,6 +436,17 @@ static int do_mlock(unsigned long start,
+@@ -135,13 +136,6 @@ void munlock_vma_page(struct page *page)
+ 	}
+ }
+ 
+-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
+-{
+-	return (vma->vm_flags & VM_GROWSDOWN) &&
+-		(vma->vm_start == addr) &&
+-		!vma_stack_continue(vma->vm_prev, addr);
+-}
+-
+ /**
+  * __mlock_vma_pages_range() -  mlock a range of pages in the vma.
+  * @vma:   target vma
+@@ -174,12 +168,6 @@ static long __mlock_vma_pages_range(struct vm_area_struct *vma,
+ 	if (vma->vm_flags & VM_WRITE)
+ 		gup_flags |= FOLL_WRITE;
+ 
+-	/* We don't try to access the guard page of a stack vma */
+-	if (stack_guard_page(vma, start)) {
+-		addr += PAGE_SIZE;
+-		nr_pages--;
+-	}
+-
+ 	while (nr_pages > 0) {
+ 		int i;
+ 
+@@ -445,6 +433,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
  		return -EINVAL;
  	if (end == start)
  		return 0;
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+	if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
-+		if (end > SEGMEXEC_TASK_SIZE)
-+			return -EINVAL;
-+	} else
-+#endif
-+
 +	if (end > TASK_SIZE)
 +		return -EINVAL;
 +
  	vma = find_vma_prev(current->mm, start, &prev);
  	if (!vma || vma->vm_start > start)
  		return -ENOMEM;
-@@ -494,6 +506,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
+@@ -455,6 +446,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
+ 	for (nstart = start ; ; ) {
+ 		unsigned int newflags;
+ 
++#ifdef CONFIG_PAX_SEGMEXEC
++		if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
++			break;
++#endif
++
+ 		/* Here we know that  vma->vm_start <= nstart < vma->vm_end. */
+ 
+ 		newflags = vma->vm_flags | VM_LOCKED;
+@@ -504,6 +500,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
  	lock_limit >>= PAGE_SHIFT;
  
  	/* check against resource limits */
@@ -51187,44 +52962,47 @@ diff -urNp linux-2.6.32.13/mm/mlock.c linux-2.6.32.13/mm/mlock.c
  	if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
  		error = do_mlock(start, len, 1);
  	up_write(&current->mm->mmap_sem);
-@@ -515,10 +528,10 @@ SYSCALL_DEFINE2(munlock, unsigned long, 
+@@ -525,17 +522,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
  static int do_mlockall(int flags)
  {
  	struct vm_area_struct * vma, * prev = NULL;
 -	unsigned int def_flags = 0;
-+	unsigned int def_flags = current->mm->def_flags & ~VM_LOCKED;
  
  	if (flags & MCL_FUTURE)
 -		def_flags = VM_LOCKED;
-+		def_flags |= VM_LOCKED;
- 	current->mm->def_flags = def_flags;
+-	current->mm->def_flags = def_flags;
++		current->mm->def_flags |= VM_LOCKED;
++	else
++		current->mm->def_flags &= ~VM_LOCKED;
  	if (flags == MCL_FUTURE)
  		goto out;
-@@ -526,6 +539,12 @@ static int do_mlockall(int flags)
- 	for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
- 		unsigned int newflags;
  
+ 	for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
+-		unsigned int newflags;
++		unsigned long newflags;
++
 +#ifdef CONFIG_PAX_SEGMEXEC
 +		if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
 +			break;
 +#endif
-+
+ 
 +		BUG_ON(vma->vm_end > TASK_SIZE);
  		newflags = vma->vm_flags | VM_LOCKED;
  		if (!(flags & MCL_CURRENT))
  			newflags &= ~VM_LOCKED;
-@@ -557,6 +576,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
+@@ -567,6 +570,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
  	lock_limit >>= PAGE_SHIFT;
  
  	ret = -ENOMEM;
-+	gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm, 1);
++	gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
  	if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
  	    capable(CAP_IPC_LOCK))
  		ret = do_mlockall(flags);
-diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
---- linux-2.6.32.13/mm/mmap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/mmap.c	2010-05-15 13:21:18.411130134 -0400
-@@ -45,6 +45,16 @@
+diff --git a/mm/mmap.c b/mm/mmap.c
+index 3a94362..b34ead4 100644
+--- a/mm/mmap.c
++++ b/mm/mmap.c
+@@ -44,6 +44,16 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
  
@@ -51241,7 +53019,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  static void unmap_region(struct mm_struct *mm,
  		struct vm_area_struct *vma, struct vm_area_struct *prev,
  		unsigned long start, unsigned long end);
-@@ -70,16 +80,25 @@ static void unmap_region(struct mm_struc
+@@ -69,22 +79,32 @@ static void unmap_region(struct mm_struct *mm,
   *		x: (no) no	x: (no) yes	x: (no) yes	x: (yes) yes
   *
   */
@@ -51259,7 +53037,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  			pgprot_val(arch_vm_get_page_prot(vm_flags)));
 +
 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
-+	if (!nx_enabled &&
++	if (!(__supported_pte_mask & _PAGE_NX) &&
 +	    (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
 +	    (vm_flags & (VM_READ | VM_WRITE)))
 +		prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
@@ -51269,7 +53047,14 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  }
  EXPORT_SYMBOL(vm_get_page_prot);
  
-@@ -231,6 +250,7 @@ static struct vm_area_struct *remove_vma
+ int sysctl_overcommit_memory = OVERCOMMIT_GUESS;  /* heuristic overcommit */
+ int sysctl_overcommit_ratio = 50;	/* default is 50% */
+ int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
++unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
+ struct percpu_counter vm_committed_as;
+ 
+ /*
+@@ -230,6 +250,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
  	struct vm_area_struct *next = vma->vm_next;
  
  	might_sleep();
@@ -51277,15 +53062,15 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file) {
-@@ -267,6 +287,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
+@@ -266,6 +287,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
  	 * not page aligned -Ram Gupta
  	 */
- 	rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
+ 	rlim = rlimit(RLIMIT_DATA);
 +	gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
  	if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
  			(mm->end_data - mm->start_data) > rlim)
  		goto out;
-@@ -694,6 +715,12 @@ static int
+@@ -695,6 +717,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)
  {
@@ -51298,7 +53083,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	if (is_mergeable_vma(vma, file, vm_flags) &&
  	    is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
  		if (vma->vm_pgoff == vm_pgoff)
-@@ -713,6 +740,12 @@ static int
+@@ -714,6 +742,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)
  {
@@ -51311,7 +53096,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	if (is_mergeable_vma(vma, file, vm_flags) &&
  	    is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
  		pgoff_t vm_pglen;
-@@ -755,12 +788,19 @@ can_vma_merge_after(struct vm_area_struc
+@@ -756,13 +790,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
  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,
@@ -51321,6 +53106,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  {
  	pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
  	struct vm_area_struct *area, *next;
+ 	int err;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
@@ -51332,7 +53118,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	/*
  	 * We later require that vma->vm_flags == vm_flags,
  	 * so this tests vma->vm_flags & VM_SPECIAL, too.
-@@ -776,6 +816,15 @@ struct vm_area_struct *vma_merge(struct 
+@@ -778,6 +819,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  	if (next && next->vm_end == end)		/* cases 6, 7, 8 */
  		next = next->vm_next;
  
@@ -51348,63 +53134,63 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	/*
  	 * Can it merge with the predecessor?
  	 */
-@@ -795,9 +844,24 @@ struct vm_area_struct *vma_merge(struct 
+@@ -797,9 +847,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  							/* cases 1, 6 */
- 			vma_adjust(prev, prev->vm_start,
+ 			err = vma_adjust(prev, prev->vm_start,
  				next->vm_end, prev->vm_pgoff, NULL);
 -		} else					/* cases 2, 5, 7 */
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
-+			if (prev_m)
-+				vma_adjust(prev_m, prev_m->vm_start,
++			if (!err && prev_m)
++				err = vma_adjust(prev_m, prev_m->vm_start,
 +					next_m->vm_end, prev_m->vm_pgoff, NULL);
 +#endif
 +
 +		} else {				/* cases 2, 5, 7 */
- 			vma_adjust(prev, prev->vm_start,
+ 			err = vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
-+			if (prev_m)
-+				vma_adjust(prev_m, prev_m->vm_start,
-+					end_m, prev_m->vm_pgoff, NULL);
++			if (!err && prev_m)
++				err = vma_adjust(prev_m, prev_m->vm_start,
++						end_m, prev_m->vm_pgoff, NULL);
 +#endif
 +
 +		}
+ 		if (err)
+ 			return NULL;
  		return prev;
- 	}
- 
-@@ -808,12 +872,27 @@ struct vm_area_struct *vma_merge(struct 
+@@ -812,12 +877,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
   			mpol_equal(policy, vma_policy(next)) &&
  			can_vma_merge_before(next, vm_flags,
  					anon_vma, file, pgoff+pglen)) {
 -		if (prev && addr < prev->vm_end)	/* case 4 */
 +		if (prev && addr < prev->vm_end) {	/* case 4 */
- 			vma_adjust(prev, prev->vm_start,
+ 			err = vma_adjust(prev, prev->vm_start,
  				addr, prev->vm_pgoff, NULL);
 -		else					/* cases 3, 8 */
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
-+			if (prev_m)
-+				vma_adjust(prev_m, prev_m->vm_start,
-+					addr_m, prev_m->vm_pgoff, NULL);
++			if (!err && prev_m)
++				err = vma_adjust(prev_m, prev_m->vm_start,
++						addr_m, prev_m->vm_pgoff, NULL);
 +#endif
 +
 +		} else {				/* cases 3, 8 */
- 			vma_adjust(area, addr, next->vm_end,
+ 			err = vma_adjust(area, addr, next->vm_end,
  				next->vm_pgoff - pglen, NULL);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
-+			if (area_m)
-+				vma_adjust(area_m, addr_m, next_m->vm_end,
-+					next_m->vm_pgoff - pglen, NULL);
++			if (!err && area_m)
++				err = vma_adjust(area_m, addr_m, next_m->vm_end,
++						next_m->vm_pgoff - pglen, NULL);
 +#endif
 +
 +		}
+ 		if (err)
+ 			return NULL;
  		return area;
- 	}
- 
-@@ -888,14 +967,11 @@ none:
+@@ -932,14 +1012,11 @@ none:
  void vm_stat_account(struct mm_struct *mm, unsigned long flags,
  						struct file *file, long pages)
  {
@@ -51420,7 +53206,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  		mm->stack_vm += pages;
  	if (flags & (VM_RESERVED|VM_IO))
  		mm->reserved_vm += pages;
-@@ -922,7 +998,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -966,7 +1043,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	 * (the exception is when the underlying filesystem is noexec
  	 *  mounted, in which case we dont add PROT_EXEC.)
  	 */
@@ -51429,7 +53215,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  		if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
  			prot |= PROT_EXEC;
  
-@@ -948,7 +1024,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -992,7 +1069,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -51438,22 +53224,27 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -959,6 +1035,26 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1003,6 +1080,31 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
  			mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
  
-+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
-+	if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
-+
 +#ifdef CONFIG_PAX_MPROTECT
-+		if (mm->pax_flags & MF_PAX_MPROTECT) {
-+			if ((prot & (PROT_WRITE | PROT_EXEC)) != PROT_EXEC)
-+				vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
-+			else
-+				vm_flags &= ~(VM_WRITE | VM_MAYWRITE);
-+		}
++	if (mm->pax_flags & MF_PAX_MPROTECT) {
++		if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
++			gr_log_rwxmmap(file);
++
++#ifdef CONFIG_PAX_EMUPLT
++			vm_flags &= ~VM_EXEC;
++#else
++			return -EPERM;
 +#endif
 +
++		}
++
++		if (!(vm_flags & VM_EXEC))
++			vm_flags &= ~VM_MAYEXEC;
++		else
++			vm_flags &= ~VM_MAYWRITE;
 +	}
 +#endif
 +
@@ -51465,15 +53256,15 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	if (flags & MAP_LOCKED)
  		if (!can_do_mlock())
  			return -EPERM;
-@@ -970,6 +1066,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1014,6 +1116,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  		locked += mm->locked_vm;
- 		lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+ 		lock_limit = rlimit(RLIMIT_MEMLOCK);
  		lock_limit >>= PAGE_SHIFT;
 +		gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
  		if (locked > lock_limit && !capable(CAP_IPC_LOCK))
  			return -EAGAIN;
  	}
-@@ -1043,6 +1140,9 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1084,6 +1187,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	if (error)
  		return error;
  
@@ -51483,7 +53274,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	return mmap_region(file, addr, len, flags, vm_flags, pgoff);
  }
  EXPORT_SYMBOL(do_mmap_pgoff);
-@@ -1055,10 +1155,10 @@ EXPORT_SYMBOL(do_mmap_pgoff);
+@@ -1160,10 +1266,10 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg)
   */
  int vma_wants_writenotify(struct vm_area_struct *vma)
  {
@@ -51496,7 +53287,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  		return 0;
  
  	/* The backer wishes to know when pages are first written to? */
-@@ -1107,14 +1207,24 @@ unsigned long mmap_region(struct file *f
+@@ -1212,14 +1318,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  	unsigned long charged = 0;
  	struct inode *inode =  file ? file->f_path.dentry->d_inode : NULL;
  
@@ -51523,7 +53314,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	}
  
  	/* Check against address space limit. */
-@@ -1163,6 +1273,16 @@ munmap_back:
+@@ -1268,6 +1384,16 @@ munmap_back:
  		goto unacct_error;
  	}
  
@@ -51540,7 +53331,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	vma->vm_mm = mm;
  	vma->vm_start = addr;
  	vma->vm_end = addr + len;
-@@ -1185,6 +1305,19 @@ munmap_back:
+@@ -1291,6 +1417,19 @@ munmap_back:
  		error = file->f_op->mmap(file, vma);
  		if (error)
  			goto unmap_and_free_vma;
@@ -51560,27 +53351,27 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  		if (vm_flags & VM_EXECUTABLE)
  			added_exe_file_vma(mm);
  
-@@ -1208,6 +1341,11 @@ munmap_back:
+@@ -1326,6 +1465,11 @@ munmap_back:
  	vma_link(mm, vma, prev, rb_link, rb_parent);
  	file = vma->vm_file;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	if (vma_m)
-+		pax_mirror_vma(vma_m, vma);
++		BUG_ON(pax_mirror_vma(vma_m, vma));
 +#endif
 +
  	/* Once vma denies write, undo our temporary denial count */
  	if (correct_wcount)
  		atomic_inc(&inode->i_writecount);
-@@ -1216,6 +1354,7 @@ out:
+@@ -1334,6 +1478,7 @@ out:
  
  	mm->total_vm += len >> PAGE_SHIFT;
  	vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
 +	track_exec_limit(mm, addr, addr + len, vm_flags);
  	if (vm_flags & VM_LOCKED) {
- 		/*
- 		 * makes pages present; downgrades, drops, reacquires mmap_sem
-@@ -1238,6 +1377,12 @@ unmap_and_free_vma:
+ 		if (!mlock_vma_pages_range(vma, addr, addr + len))
+ 			mm->locked_vm += (len >> PAGE_SHIFT);
+@@ -1351,6 +1496,12 @@ unmap_and_free_vma:
  	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
  	charged = 0;
  free_vma:
@@ -51593,7 +53384,41 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	kmem_cache_free(vm_area_cachep, vma);
  unacct_error:
  	if (charged)
-@@ -1271,6 +1416,10 @@ arch_get_unmapped_area(struct file *filp
+@@ -1358,6 +1509,33 @@ unacct_error:
+ 	return error;
+ }
+ 
++bool check_heap_stack_gap(struct vm_area_struct *vma, unsigned long addr, unsigned long len)
++{
++	if (!vma) {
++#ifdef CONFIG_STACK_GROWSUP
++		if (addr > sysctl_heap_stack_gap)
++			vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
++		else
++			vma = find_vma(current->mm, 0);
++		if (vma && (vma->vm_flags & VM_GROWSUP))
++			return false;
++#endif
++		return true;
++	}
++
++	if (addr + len > vma->vm_start)
++		return false;
++
++	if (vma->vm_flags & VM_GROWSDOWN)
++		return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
++#ifdef CONFIG_STACK_GROWSUP
++	else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
++		return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
++#endif
++
++	return true;
++}
++
+ /* Get an address range which is currently unmapped.
+  * For shmat() with addr=0.
+  *
+@@ -1384,18 +1562,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
  	if (flags & MAP_FIXED)
  		return addr;
  
@@ -51603,9 +53428,15 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
 +
  	if (addr) {
  		addr = PAGE_ALIGN(addr);
- 		vma = find_vma(mm, addr);
-@@ -1279,10 +1428,10 @@ arch_get_unmapped_area(struct file *filp
- 			return addr;
+-		vma = find_vma(mm, addr);
+-		if (TASK_SIZE - len >= addr &&
+-		    (!vma || addr + len <= vma->vm_start))
+-			return addr;
++		if (TASK_SIZE - len >= addr) {
++			vma = find_vma(mm, addr);
++			if (check_heap_stack_gap(vma, addr, len))
++				return addr;
++		}
  	}
  	if (len > mm->cached_hole_size) {
 -	        start_addr = addr = mm->free_area_cache;
@@ -51618,7 +53449,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	}
  
  full_search:
-@@ -1293,9 +1442,8 @@ full_search:
+@@ -1406,34 +1589,40 @@ full_search:
  			 * Start a new search - just in case we missed
  			 * some holes.
  			 */
@@ -51630,7 +53461,29 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  				mm->cached_hole_size = 0;
  				goto full_search;
  			}
-@@ -1317,10 +1465,16 @@ full_search:
+ 			return -ENOMEM;
+ 		}
+-		if (!vma || addr + len <= vma->vm_start) {
+-			/*
+-			 * Remember the place where we stopped the search:
+-			 */
+-			mm->free_area_cache = addr + len;
+-			return addr;
+-		}
++		if (check_heap_stack_gap(vma, addr, len))
++			break;
+ 		if (addr + mm->cached_hole_size < vma->vm_start)
+ 		        mm->cached_hole_size = vma->vm_start - addr;
+ 		addr = vma->vm_end;
+ 	}
++
++	/*
++	 * Remember the place where we stopped the search:
++	 */
++	mm->free_area_cache = addr + len;
++	return addr;
+ }
+ #endif	
  
  void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
  {
@@ -51648,7 +53501,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  		mm->free_area_cache = addr;
  		mm->cached_hole_size = ~0UL;
  	}
-@@ -1338,7 +1492,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1451,7 +1640,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
  {
  	struct vm_area_struct *vma;
  	struct mm_struct *mm = current->mm;
@@ -51657,7 +53510,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  
  	/* requested length too big for entire address space */
  	if (len > TASK_SIZE)
-@@ -1347,6 +1501,10 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1460,13 +1649,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
  	if (flags & MAP_FIXED)
  		return addr;
  
@@ -51668,7 +53521,37 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	/* requesting a specific address */
  	if (addr) {
  		addr = PAGE_ALIGN(addr);
-@@ -1404,13 +1562,21 @@ bottomup:
+-		vma = find_vma(mm, addr);
+-		if (TASK_SIZE - len >= addr &&
+-				(!vma || addr + len <= vma->vm_start))
+-			return addr;
++		if (TASK_SIZE - len >= addr) {
++			vma = find_vma(mm, addr);
++			if (check_heap_stack_gap(vma, addr, len))
++				return addr;
++		}
+ 	}
+ 
+ 	/* check if free_area_cache is useful for us */
+@@ -1481,7 +1675,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ 	/* make sure it can fit in the remaining address space */
+ 	if (addr > len) {
+ 		vma = find_vma(mm, addr-len);
+-		if (!vma || addr <= vma->vm_start)
++		if (check_heap_stack_gap(vma, addr - len, len))
+ 			/* remember the address as a hint for next time */
+ 			return (mm->free_area_cache = addr-len);
+ 	}
+@@ -1498,7 +1692,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ 		 * return with success:
+ 		 */
+ 		vma = find_vma(mm, addr);
+-		if (!vma || addr+len <= vma->vm_start)
++		if (check_heap_stack_gap(vma, addr, len))
+ 			/* remember the address as a hint for next time */
+ 			return (mm->free_area_cache = addr);
+ 
+@@ -1517,13 +1711,21 @@ bottomup:
  	 * can happen with large stack limits and large mmap()
  	 * allocations.
  	 */
@@ -51692,7 +53575,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
-@@ -1419,6 +1585,12 @@ bottomup:
+@@ -1532,6 +1734,12 @@ bottomup:
  
  void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  {
@@ -51705,7 +53588,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	/*
  	 * Is this a new hole at the highest possible address?
  	 */
-@@ -1426,8 +1598,10 @@ void arch_unmap_area_topdown(struct mm_s
+@@ -1539,8 +1747,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  		mm->free_area_cache = addr;
  
  	/* dont allow allocations above current base */
@@ -51717,7 +53600,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  }
  
  unsigned long
-@@ -1535,6 +1709,27 @@ out:
+@@ -1648,6 +1858,34 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -51736,8 +53619,15 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
 +	BUG_ON(!vma_m || vma_m->vm_mirror != vma);
 +	BUG_ON(vma->vm_file != vma_m->vm_file);
 +	BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
-+	BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff || vma->anon_vma != vma_m->anon_vma);
-+	BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
++	BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
++	if (vma->anon_vma != vma_m->anon_vma) {
++		struct anon_vma_chain *avc, *avc_m;
++
++		avc = list_entry(vma->anon_vma_chain.prev, struct anon_vma_chain, same_vma);
++		avc_m = list_entry(vma_m->anon_vma_chain.prev, struct anon_vma_chain, same_vma);
++		BUG_ON(avc->anon_vma != avc_m->anon_vma);
++	}
++	BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
 +	return vma_m;
 +}
 +#endif
@@ -51745,24 +53635,29 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1551,6 +1746,7 @@ static int acct_stack_growth(struct vm_a
+@@ -1664,6 +1902,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		return -ENOMEM;
  
  	/* Stack limit test */
 +	gr_learn_resource(current, RLIMIT_STACK, size, 1);
- 	if (size > rlim[RLIMIT_STACK].rlim_cur)
+ 	if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
  		return -ENOMEM;
  
-@@ -1560,6 +1756,7 @@ static int acct_stack_growth(struct vm_a
- 		unsigned long limit;
+@@ -1674,6 +1913,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		locked = mm->locked_vm + grow;
- 		limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
+ 		limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
+ 		limit >>= PAGE_SHIFT;
 +		gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
  		if (locked > limit && !capable(CAP_IPC_LOCK))
  			return -ENOMEM;
  	}
-@@ -1595,35 +1792,40 @@ static
- #endif
+@@ -1704,37 +1944,47 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+  * 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.
+  */
++#ifndef CONFIG_IA64
++static
++#endif
  int expand_upwards(struct vm_area_struct *vma, unsigned long address)
  {
 -	int error;
@@ -51784,7 +53679,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	if (unlikely(anon_vma_prepare(vma)))
  		return -ENOMEM;
 +	locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
-+	if (locknext && unlikely(anon_vma_prepare(vma->vm_next)))
++	if (locknext && anon_vma_prepare(vma->vm_next))
 +		return -ENOMEM;
  	anon_vma_lock(vma);
 +	if (locknext)
@@ -51808,11 +53703,13 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  
  	/* Somebody else might have raced and expanded it already */
 -	if (address > vma->vm_end) {
-+	if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
++	if (vma->vm_next && (vma->vm_next->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && vma->vm_next->vm_start - address < sysctl_heap_stack_gap)
++		error = -ENOMEM;
++	else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
  		unsigned long size, grow;
  
  		size = address - vma->vm_start;
-@@ -1633,6 +1835,8 @@ int expand_upwards(struct vm_area_struct
+@@ -1744,6 +1994,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
  		if (!error)
  			vma->vm_end = address;
  	}
@@ -51821,25 +53718,25 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	anon_vma_unlock(vma);
  	return error;
  }
-@@ -1644,7 +1848,8 @@ int expand_upwards(struct vm_area_struct
+@@ -1755,7 +2007,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
  static int expand_downwards(struct vm_area_struct *vma,
  				   unsigned long address)
  {
 -	int error;
 +	int error, lockprev = 0;
-+	struct vm_area_struct *prev = NULL;
++	struct vm_area_struct *prev;
  
  	/*
  	 * We must make sure the anon_vma is allocated
-@@ -1658,6 +1863,15 @@ static int expand_downwards(struct vm_ar
+@@ -1769,6 +2022,15 @@ static int expand_downwards(struct vm_area_struct *vma,
  	if (error)
  		return error;
  
++	prev = vma->vm_prev;
 +#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
-+	find_vma_prev(vma->vm_mm, address, &prev);
 +	lockprev = prev && (prev->vm_flags & VM_GROWSUP);
 +#endif
-+	if (lockprev && unlikely(anon_vma_prepare(prev)))
++	if (lockprev && anon_vma_prepare(prev))
 +		return -ENOMEM;
 +	if (lockprev)
 +		anon_vma_lock(prev);
@@ -51847,12 +53744,14 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	anon_vma_lock(vma);
  
  	/*
-@@ -1667,9 +1881,15 @@ static int expand_downwards(struct vm_ar
+@@ -1778,9 +2040,17 @@ static int expand_downwards(struct vm_area_struct *vma,
  	 */
  
  	/* Somebody else might have raced and expanded it already */
 -	if (address < vma->vm_start) {
-+	if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
++	if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
++		error = -ENOMEM;
++	else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
  		unsigned long size, grow;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
@@ -51864,7 +53763,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  		size = vma->vm_end - address;
  		grow = (vma->vm_start - address) >> PAGE_SHIFT;
  
-@@ -1677,9 +1897,20 @@ static int expand_downwards(struct vm_ar
+@@ -1788,9 +2058,20 @@ static int expand_downwards(struct vm_area_struct *vma,
  		if (!error) {
  			vma->vm_start = address;
  			vma->vm_pgoff -= grow;
@@ -51885,7 +53784,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	return error;
  }
  
-@@ -1755,6 +1986,13 @@ static void remove_vma_list(struct mm_st
+@@ -1864,6 +2145,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
  	do {
  		long nrpages = vma_pages(vma);
  
@@ -51899,9 +53798,9 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  		mm->total_vm -= nrpages;
  		vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
  		vma = remove_vma(vma);
-@@ -1799,6 +2037,16 @@ detach_vmas_to_be_unmapped(struct mm_str
- 
+@@ -1909,6 +2197,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
  	insertion_point = (prev ? &prev->vm_next : &mm->mmap);
+ 	vma->vm_prev = NULL;
  	do {
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
@@ -51916,9 +53815,9 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  		rb_erase(&vma->vm_rb, &mm->mm_rb);
  		mm->map_count--;
  		tail_vma = vma;
-@@ -1824,10 +2072,25 @@ int split_vma(struct mm_struct * mm, str
- 	struct mempolicy *pol;
+@@ -1937,14 +2235,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	struct vm_area_struct *new;
+ 	int err = -ENOMEM;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	struct vm_area_struct *vma_m, *new_m = NULL;
@@ -51931,27 +53830,18 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	vma_m = pax_find_mirror_vma(vma);
-+
-+	if (mm->pax_flags & MF_PAX_SEGMEXEC) {
-+		BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
-+		if (mm->map_count >= sysctl_max_map_count-1)
-+			return -ENOMEM;
-+	} else
 +#endif
 +
- 	if (mm->map_count >= sysctl_max_map_count)
- 		return -ENOMEM;
- 
-@@ -1835,6 +2098,16 @@ int split_vma(struct mm_struct * mm, str
+ 	new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
  	if (!new)
- 		return -ENOMEM;
+ 		goto out_err;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	if (vma_m) {
 +		new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
 +		if (!new_m) {
 +			kmem_cache_free(vm_area_cachep, new);
-+			return -ENOMEM;
++			goto out_err;
 +		}
 +	}
 +#endif
@@ -51959,13 +53849,14 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	/* most fields are the same, copy all, and then fixup */
  	*new = *vma;
  
-@@ -1845,8 +2118,29 @@ int split_vma(struct mm_struct * mm, str
+@@ -1957,6 +2274,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  		new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
  	}
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	if (vma_m) {
 +		*new_m = *vma_m;
++		INIT_LIST_HEAD(&new_m->anon_vma_chain);
 +		new_m->vm_mirror = new;
 +		new->vm_mirror = new_m;
 +
@@ -51980,21 +53871,16 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
 +
  	pol = mpol_dup(vma_policy(vma));
  	if (IS_ERR(pol)) {
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+		if (new_m)
-+			kmem_cache_free(vm_area_cachep, new_m);
-+#endif
-+
- 		kmem_cache_free(vm_area_cachep, new);
- 		return PTR_ERR(pol);
- 	}
-@@ -1867,6 +2161,28 @@ int split_vma(struct mm_struct * mm, str
+ 		err = PTR_ERR(pol);
+@@ -1982,6 +2315,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	else
- 		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
+ 		err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
 +#ifdef CONFIG_PAX_SEGMEXEC
-+	if (vma_m) {
++	if (!err && vma_m) {
++		if (anon_vma_clone(new_m, vma_m))
++			goto out_free_mpol;
++
 +		mpol_get(pol);
 +		vma_set_policy(new_m, pol);
 +
@@ -52008,23 +53894,70 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
 +			new_m->vm_ops->open(new_m);
 +
 +		if (new_below)
-+			vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
++			err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
 +				((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
 +		else
-+			vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
++			err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
++
++		if (err) {
++			if (new_m->vm_ops && new_m->vm_ops->close)
++				new_m->vm_ops->close(new_m);
++			if (new_m->vm_file) {
++				if (vma_m->vm_flags & VM_EXECUTABLE)
++					removed_exe_file_vma(mm);
++				fput(new_m->vm_file);
++			}
++			mpol_put(pol);
++		}
 +	}
 +#endif
 +
- 	return 0;
- }
+ 	/* Success. */
+ 	if (!err)
+ 		return 0;
+@@ -1994,10 +2363,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+ 			removed_exe_file_vma(mm);
+ 		fput(new->vm_file);
+ 	}
+-	unlink_anon_vmas(new);
+  out_free_mpol:
+ 	mpol_put(pol);
+  out_free_vma:
++
++#ifdef CONFIG_PAX_SEGMEXEC
++	if (new_m) {
++		unlink_anon_vmas(new_m);
++		kmem_cache_free(vm_area_cachep, new_m);
++	}
++#endif
++
++	unlink_anon_vmas(new);
+ 	kmem_cache_free(vm_area_cachep, new);
+  out_err:
+ 	return err;
+@@ -2010,6 +2387,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+ 	      unsigned long addr, int new_below)
+ {
++
++#ifdef CONFIG_PAX_SEGMEXEC
++	if (mm->pax_flags & MF_PAX_SEGMEXEC) {
++		BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
++		if (mm->map_count >= sysctl_max_map_count-1)
++			return -ENOMEM;
++	} else
++#endif
++
+ 	if (mm->map_count >= sysctl_max_map_count)
+ 		return -ENOMEM;
  
-@@ -1875,11 +2191,30 @@ int split_vma(struct mm_struct * mm, str
+@@ -2021,11 +2407,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
   * work.  This now handles partial unmappings.
   * Jeremy Fitzhardinge <jeremy@goop.org>
   */
 +#ifdef CONFIG_PAX_SEGMEXEC
- int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
- {
++int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
++{
 +	int ret = __do_munmap(mm, start, len);
 +	if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
 +		return ret;
@@ -52034,9 +53967,9 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
 +
 +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
 +#else
-+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
+ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
 +#endif
-+{
+ {
  	unsigned long end;
  	struct vm_area_struct *vma, *prev, *last;
  
@@ -52049,7 +53982,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
  		return -EINVAL;
  
-@@ -1943,6 +2278,8 @@ int do_munmap(struct mm_struct *mm, unsi
+@@ -2099,6 +2504,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
  	/* Fix up all other VM information */
  	remove_vma_list(mm, vma);
  
@@ -52058,7 +53991,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	return 0;
  }
  
-@@ -1955,22 +2292,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
+@@ -2111,22 +2518,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
  
  	profile_munmap(addr);
  
@@ -52087,19 +54020,15 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  /*
   *  this is really a simplified "do_mmap".  it only handles
   *  anonymous maps.  eventually we may be able to do some
-@@ -1984,6 +2317,11 @@ unsigned long do_brk(unsigned long addr,
+@@ -2140,6 +2543,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
  	struct rb_node ** rb_link, * rb_parent;
  	pgoff_t pgoff = addr >> PAGE_SHIFT;
  	int error;
 +	unsigned long charged;
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+	struct vm_area_struct *vma_m = NULL;
-+#endif
  
  	len = PAGE_ALIGN(len);
  	if (!len)
-@@ -1995,16 +2333,30 @@ unsigned long do_brk(unsigned long addr,
+@@ -2151,16 +2555,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
  
  	flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
  
@@ -52129,9 +54058,9 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
 -		locked = len >> PAGE_SHIFT;
 +		locked = charged;
  		locked += mm->locked_vm;
- 		lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+ 		lock_limit = rlimit(RLIMIT_MEMLOCK);
  		lock_limit >>= PAGE_SHIFT;
-@@ -2021,22 +2373,22 @@ unsigned long do_brk(unsigned long addr,
+@@ -2177,22 +2595,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
  	/*
  	 * Clear old maps.  this also does some error checking for us
  	 */
@@ -52158,7 +54087,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  		return -ENOMEM;
  
  	/* Can we just expand an old private anonymous mapping? */
-@@ -2050,10 +2402,21 @@ unsigned long do_brk(unsigned long addr,
+@@ -2206,7 +2624,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
  	 */
  	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
  	if (!vma) {
@@ -52167,21 +54096,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  		return -ENOMEM;
  	}
  
-+#ifdef CONFIG_PAX_SEGMEXEC
-+	if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (flags & VM_EXEC)) {
-+		vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
-+		if (!vma_m) {
-+			kmem_cache_free(vm_area_cachep, vma);
-+			vm_unacct_memory(charged);
-+			return -ENOMEM;
-+		}
-+	}
-+#endif
-+
- 	vma->vm_mm = mm;
- 	vma->vm_start = addr;
- 	vma->vm_end = addr + len;
-@@ -2062,11 +2425,12 @@ unsigned long do_brk(unsigned long addr,
+@@ -2219,11 +2637,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
  	vma->vm_page_prot = vm_get_page_prot(flags);
  	vma_link(mm, vma, prev, rb_link, rb_parent);
  out:
@@ -52196,7 +54111,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	return addr;
  }
  
-@@ -2113,8 +2477,10 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2270,8 +2689,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.
  	 */
@@ -52208,7 +54123,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  
  	BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
  }
-@@ -2128,6 +2494,10 @@ int insert_vm_struct(struct mm_struct * 
+@@ -2285,6 +2706,10 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
  	struct vm_area_struct * __vma, * prev;
  	struct rb_node ** rb_link, * rb_parent;
  
@@ -52219,7 +54134,7 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/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
-@@ -2150,7 +2520,22 @@ int insert_vm_struct(struct mm_struct * 
+@@ -2307,7 +2732,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
  	if ((vma->vm_flags & VM_ACCOUNT) &&
  	     security_vm_enough_memory_mm(mm, vma_pages(vma)))
  		return -ENOMEM;
@@ -52236,13 +54151,13 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	if (vma_m)
-+		pax_mirror_vma(vma_m, vma);
++		BUG_ON(pax_mirror_vma(vma_m, vma));
 +#endif
 +
  	return 0;
  }
  
-@@ -2168,6 +2553,8 @@ struct vm_area_struct *copy_vma(struct v
+@@ -2325,6 +2765,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
  	struct rb_node **rb_link, *rb_parent;
  	struct mempolicy *pol;
  
@@ -52251,12 +54166,13 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
  	/*
  	 * If anonymous vma has not yet been faulted, update new pgoff
  	 * to match new location, to increase its chance of merging.
-@@ -2211,6 +2598,35 @@ struct vm_area_struct *copy_vma(struct v
- 	return new_vma;
+@@ -2374,6 +2816,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+ 	kmem_cache_free(vm_area_cachep, new_vma);
+ 	return NULL;
  }
- 
++ 
 +#ifdef CONFIG_PAX_SEGMEXEC
-+void pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
++long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
 +{
 +	struct vm_area_struct *prev_m;
 +	struct rb_node **rb_link_m, *rb_parent_m;
@@ -52266,6 +54182,9 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
 +	BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
 +	BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
 +	*vma_m = *vma;
++	INIT_LIST_HEAD(&vma_m->anon_vma_chain);
++	if (anon_vma_clone(vma_m, vma))
++		return -ENOMEM;
 +	pol_m = vma_policy(vma_m);
 +	mpol_get(pol_m);
 +	vma_set_policy(vma_m, pol_m);
@@ -52281,41 +54200,44 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
 +	vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
 +	vma_m->vm_mirror = vma;
 +	vma->vm_mirror = vma_m;
++	return 0;
 +}
 +#endif
-+
+ 
  /*
   * Return true if the calling process may expand its vm space by the passed
-  * number of pages
-@@ -2221,7 +2637,7 @@ int may_expand_vm(struct mm_struct *mm, 
+@@ -2385,7 +2860,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
  	unsigned long lim;
  
- 	lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
+ 	lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
 -
 +	gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
  	if (cur + npages > lim)
  		return 0;
  	return 1;
-@@ -2290,6 +2706,15 @@ int install_special_mapping(struct mm_st
+@@ -2455,6 +2930,17 @@ int install_special_mapping(struct mm_struct *mm,
  	vma->vm_start = addr;
  	vma->vm_end = addr + len;
  
 +#ifdef CONFIG_PAX_MPROTECT
 +	if (mm->pax_flags & MF_PAX_MPROTECT) {
-+		if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
-+			vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
++		if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
++			return -EPERM;
++		if (!(vm_flags & VM_EXEC))
++			vm_flags &= ~VM_MAYEXEC;
 +		else
-+			vm_flags &= ~(VM_WRITE | VM_MAYWRITE);
++			vm_flags &= ~VM_MAYWRITE;
 +	}
 +#endif
 +
  	vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  
-diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c
---- linux-2.6.32.13/mm/mprotect.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/mprotect.c	2010-05-15 13:21:18.411130134 -0400
-@@ -24,10 +24,16 @@
+diff --git a/mm/mprotect.c b/mm/mprotect.c
+index 4c51338..90cc8c4 100644
+--- a/mm/mprotect.c
++++ b/mm/mprotect.c
+@@ -23,10 +23,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
  #include <linux/perf_event.h>
@@ -52332,7 +54254,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c
  
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -132,6 +138,48 @@ static void change_protection(struct vm_
+@@ -131,6 +137,48 @@ static void change_protection(struct vm_area_struct *vma,
  	flush_tlb_range(vma, start, end);
  }
  
@@ -52342,7 +54264,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c
 +{
 +	unsigned long oldlimit, newlimit = 0UL;
 +
-+	if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || nx_enabled)
++	if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
 +		return;
 +
 +	spin_lock(&mm->page_table_lock);
@@ -52381,7 +54303,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c
  int
  mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	unsigned long start, unsigned long end, unsigned long newflags)
-@@ -144,6 +192,14 @@ mprotect_fixup(struct vm_area_struct *vm
+@@ -143,11 +191,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	int error;
  	int dirty_accountable = 0;
  
@@ -52396,7 +54318,22 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c
  	if (newflags == oldflags) {
  		*pprev = vma;
  		return 0;
-@@ -165,6 +221,38 @@ mprotect_fixup(struct vm_area_struct *vm
+ 	}
+ 
++	if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
++		struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
++
++		if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
++			return -ENOMEM;
++
++		if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
++			return -ENOMEM;
++	}
++
+ 	/*
+ 	 * If we make a private mapping writable we increase our commit;
+ 	 * but (without finer accounting) cannot reduce our commit if we
+@@ -164,6 +230,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  		}
  	}
  
@@ -52427,7 +54364,11 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c
 +				goto fail;
 +			}
 +			vma->vm_flags = newflags;
-+			pax_mirror_vma(vma_m, vma);
++			error = pax_mirror_vma(vma_m, vma);
++			if (error) {
++				vma->vm_flags = oldflags;
++				goto fail;
++			}
 +		}
 +	}
 +#endif
@@ -52435,9 +54376,16 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c
  	/*
  	 * First try to merge with previous and/or next vma.
  	 */
-@@ -196,8 +284,14 @@ success:
+@@ -194,9 +296,21 @@ success:
+ 	 * vm_flags and vm_page_prot are protected by the mmap_sem
  	 * held in write mode.
  	 */
++
++#ifdef CONFIG_PAX_SEGMEXEC
++	if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
++		pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
++#endif
++
  	vma->vm_flags = newflags;
 +
 +#ifdef CONFIG_PAX_MPROTECT
@@ -52451,7 +54399,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c
  
  	if (vma_wants_writenotify(vma)) {
  		vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
-@@ -238,6 +332,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -238,6 +352,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
  	end = start + len;
  	if (end <= start)
  		return -ENOMEM;
@@ -52469,7 +54417,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c
  	if (!arch_validate_prot(prot))
  		return -EINVAL;
  
-@@ -245,7 +350,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -245,7 +370,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
  	/*
  	 * Does the application expect PROT_READ to imply PROT_EXEC:
  	 */
@@ -52478,15 +54426,10 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c
  		prot |= PROT_EXEC;
  
  	vm_flags = calc_vm_prot_bits(prot);
-@@ -277,6 +382,16 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -277,6 +402,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
  	if (start > vma->vm_start)
  		prev = vma;
  
-+	if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
-+		error = -EACCES;
-+		goto out;
-+	}
-+
 +#ifdef CONFIG_PAX_MPROTECT
 +	if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
 +		current->mm->binfmt->handle_mprotect(vma, vm_flags);
@@ -52495,33 +54438,49 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c
  	for (nstart = start ; ; ) {
  		unsigned long newflags;
  
-@@ -301,6 +416,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -286,6 +416,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+ 
+ 		/* newflags >> 4 shift VM_MAY% in place of VM_% */
+ 		if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
++			if (prot & (PROT_WRITE | PROT_EXEC))
++				gr_log_rwxmprotect(vma->vm_file);
++
++			error = -EACCES;
++			goto out;
++		}
++
++		if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
+ 			error = -EACCES;
+ 			goto out;
+ 		}
+@@ -300,6 +438,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+ 		error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
  		if (error)
  			goto out;
- 		perf_event_mmap(vma);
 +
 +		track_exec_limit(current->mm, nstart, tmp, vm_flags);
 +
  		nstart = tmp;
  
  		if (nstart < prev->vm_end)
-diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c
---- linux-2.6.32.13/mm/mremap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/mremap.c	2010-05-15 13:21:18.411130134 -0400
-@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
+diff --git a/mm/mremap.c b/mm/mremap.c
+index cde56ee..a090e6d 100644
+--- a/mm/mremap.c
++++ b/mm/mremap.c
+@@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
  			continue;
  		pte = ptep_clear_flush(vma, old_addr, old_pte);
  		pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
 +
 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
-+		if (!nx_enabled && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
++		if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
 +			pte = pte_exprotect(pte);
 +#endif
 +
  		set_pte_at(mm, new_addr, new_pte, pte);
  	}
  
-@@ -273,6 +279,11 @@ static struct vm_area_struct *vma_to_res
+@@ -272,6 +278,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
  	if (is_vm_hugetlb_page(vma))
  		goto Einval;
  
@@ -52533,7 +54492,7 @@ diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c
  	/* We can't remap across vm area boundaries */
  	if (old_len > vma->vm_end - addr)
  		goto Efault;
-@@ -322,20 +333,23 @@ static unsigned long mremap_to(unsigned 
+@@ -321,20 +332,25 @@ static unsigned long mremap_to(unsigned long addr,
  	unsigned long ret = -EINVAL;
  	unsigned long charged = 0;
  	unsigned long map_flags;
@@ -52548,6 +54507,8 @@ diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c
 +		pax_task_size = SEGMEXEC_TASK_SIZE;
 +#endif
 +
++	pax_task_size -= PAGE_SIZE;
++
 +	if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
  		goto out;
  
@@ -52562,7 +54523,7 @@ diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c
  		goto out;
  
  	ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
-@@ -407,6 +421,7 @@ unsigned long do_mremap(unsigned long ad
+@@ -406,6 +422,7 @@ unsigned long do_mremap(unsigned long addr,
  	struct vm_area_struct *vma;
  	unsigned long ret = -EINVAL;
  	unsigned long charged = 0;
@@ -52570,7 +54531,7 @@ diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c
  
  	if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
  		goto out;
-@@ -425,6 +440,15 @@ unsigned long do_mremap(unsigned long ad
+@@ -424,6 +441,17 @@ unsigned long do_mremap(unsigned long addr,
  	if (!new_len)
  		goto out;
  
@@ -52579,6 +54540,8 @@ diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c
 +		pax_task_size = SEGMEXEC_TASK_SIZE;
 +#endif
 +
++	pax_task_size -= PAGE_SIZE;
++
 +	if (new_len > pax_task_size || addr > pax_task_size-new_len ||
 +	    old_len > pax_task_size || addr > pax_task_size-old_len)
 +		goto out;
@@ -52586,7 +54549,7 @@ diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c
  	if (flags & MREMAP_FIXED) {
  		if (flags & MREMAP_MAYMOVE)
  			ret = mremap_to(addr, old_len, new_addr, new_len);
-@@ -471,6 +495,7 @@ unsigned long do_mremap(unsigned long ad
+@@ -473,6 +501,7 @@ unsigned long do_mremap(unsigned long addr,
  						   addr + new_len);
  			}
  			ret = addr;
@@ -52594,7 +54557,7 @@ diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c
  			goto out;
  		}
  	}
-@@ -497,7 +522,13 @@ unsigned long do_mremap(unsigned long ad
+@@ -499,7 +528,13 @@ unsigned long do_mremap(unsigned long addr,
  		ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
  		if (ret)
  			goto out;
@@ -52608,10 +54571,19 @@ diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c
  	}
  out:
  	if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.32.13/mm/nommu.c linux-2.6.32.13/mm/nommu.c
---- linux-2.6.32.13/mm/nommu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/nommu.c	2010-05-15 13:21:18.414629737 -0400
-@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m
+diff --git a/mm/nommu.c b/mm/nommu.c
+index 3e18548..93b623d 100644
+--- a/mm/nommu.c
++++ b/mm/nommu.c
+@@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
+ 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;
+-int heap_stack_gap = 0;
+ 
+ atomic_long_t mmap_pages_allocated;
+ 
+@@ -762,15 +761,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
  EXPORT_SYMBOL(find_vma);
  
  /*
@@ -52627,21 +54599,30 @@ diff -urNp linux-2.6.32.13/mm/nommu.c linux-2.6.32.13/mm/nommu.c
   * expand a stack to a given address
   * - not supported under NOMMU conditions
   */
-diff -urNp linux-2.6.32.13/mm/page_alloc.c linux-2.6.32.13/mm/page_alloc.c
---- linux-2.6.32.13/mm/page_alloc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/page_alloc.c	2010-05-15 13:21:18.414629737 -0400
-@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page 
+@@ -1491,6 +1481,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+ 
+ 	/* most fields are the same, copy all, and then fixup */
+ 	*new = *vma;
++	INIT_LIST_HEAD(&new->anon_vma_chain);
+ 	*region = *vma->vm_region;
+ 	new->vm_region = region;
+ 
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index 2b085d5..22d53f5 100644
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -647,6 +647,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+ 	int i;
  	int bad = 0;
- 	int wasMlocked = __TestClearPageMlocked(page);
  
 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
 +	unsigned long index = 1UL << order;
 +#endif
 +
+ 	trace_mm_page_free_direct(page, order);
  	kmemcheck_free_shadow(page, order);
  
- 	for (i = 0 ; i < (1 << order) ; ++i)
-@@ -598,6 +602,12 @@ static void __free_pages_ok(struct page 
+@@ -665,6 +669,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
  		debug_check_no_obj_freed(page_address(page),
  					   PAGE_SIZE << order);
  	}
@@ -52654,7 +54635,7 @@ diff -urNp linux-2.6.32.13/mm/page_alloc.c linux-2.6.32.13/mm/page_alloc.c
  	arch_free_page(page, order);
  	kernel_map_pages(page, 1 << order, 0);
  
-@@ -701,8 +711,10 @@ static int prep_new_page(struct page *pa
+@@ -779,8 +789,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
  	arch_alloc_page(page, order);
  	kernel_map_pages(page, 1 << order, 1);
  
@@ -52665,19 +54646,7 @@ diff -urNp linux-2.6.32.13/mm/page_alloc.c linux-2.6.32.13/mm/page_alloc.c
  
  	if (order && (gfp_flags & __GFP_COMP))
  		prep_compound_page(page, order);
-@@ -1096,6 +1108,11 @@ static void free_hot_cold_page(struct pa
- 		debug_check_no_locks_freed(page_address(page), PAGE_SIZE);
- 		debug_check_no_obj_freed(page_address(page), PAGE_SIZE);
- 	}
-+
-+#ifdef CONFIG_PAX_MEMORY_SANITIZE
-+	sanitize_highpage(page);
-+#endif
-+
- 	arch_free_page(page, 0);
- 	kernel_map_pages(page, 1, 0);
- 
-@@ -3723,7 +3740,7 @@ static void __init setup_usemap(struct p
+@@ -3991,7 +4003,7 @@ static void __init setup_usemap(struct pglist_data *pgdat,
  		zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize);
  }
  #else
@@ -52686,10 +54655,11 @@ diff -urNp linux-2.6.32.13/mm/page_alloc.c linux-2.6.32.13/mm/page_alloc.c
  				struct zone *zone, unsigned long zonesize) {}
  #endif /* CONFIG_SPARSEMEM */
  
-diff -urNp linux-2.6.32.13/mm/percpu.c linux-2.6.32.13/mm/percpu.c
---- linux-2.6.32.13/mm/percpu.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/percpu.c	2010-05-15 13:21:18.450640661 -0400
-@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 
+diff --git a/mm/percpu.c b/mm/percpu.c
+index 0a09fff..98a8684 100644
+--- a/mm/percpu.c
++++ b/mm/percpu.c
+@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu __read_mostly;
  static unsigned int pcpu_last_unit_cpu __read_mostly;
  
  /* the address of the first chunk which starts with the kernel static area */
@@ -52698,52 +54668,117 @@ diff -urNp linux-2.6.32.13/mm/percpu.c linux-2.6.32.13/mm/percpu.c
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;		/* cpu -> unit */
-diff -urNp linux-2.6.32.13/mm/rmap.c linux-2.6.32.13/mm/rmap.c
---- linux-2.6.32.13/mm/rmap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/rmap.c	2010-05-15 13:21:18.454622314 -0400
-@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru
+diff --git a/mm/rmap.c b/mm/rmap.c
+index 38a336e..c6ecdb3 100644
+--- a/mm/rmap.c
++++ b/mm/rmap.c
+@@ -116,6 +116,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+ 	struct anon_vma *anon_vma = vma->anon_vma;
+ 	struct anon_vma_chain *avc;
+ 
++#ifdef CONFIG_PAX_SEGMEXEC
++	struct anon_vma_chain *avc_m = NULL;
++#endif
++
+ 	might_sleep();
+ 	if (unlikely(!anon_vma)) {
  		struct mm_struct *mm = vma->vm_mm;
- 		struct anon_vma *allocated;
+@@ -125,6 +129,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+ 		if (!avc)
+ 			goto out_enomem;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
-+		struct vm_area_struct *vma_m;
++		avc_m = anon_vma_chain_alloc();
++		if (!avc_m)
++			goto out_enomem_free_avc;
 +#endif
 +
  		anon_vma = find_mergeable_anon_vma(vma);
  		allocated = NULL;
  		if (!anon_vma) {
-@@ -121,6 +125,15 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -138,6 +148,21 @@ int anon_vma_prepare(struct vm_area_struct *vma)
  		/* page_table_lock to protect against threads */
  		spin_lock(&mm->page_table_lock);
  		if (likely(!vma->anon_vma)) {
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
-+			vma_m = pax_find_mirror_vma(vma);
++			struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
++
 +			if (vma_m) {
++				BUG_ON(vma_m->anon_vma);
 +				vma_m->anon_vma = anon_vma;
-+				__anon_vma_link(vma_m);
++				avc_m->anon_vma = anon_vma;
++				avc_m->vma = vma;
++				list_add(&avc_m->same_vma, &vma_m->anon_vma_chain);
++				list_add(&avc_m->same_anon_vma, &anon_vma->head);
++				avc_m = NULL;
 +			}
 +#endif
 +
  			vma->anon_vma = anon_vma;
- 			list_add_tail(&vma->anon_vma_node, &anon_vma->head);
- 			allocated = NULL;
-diff -urNp linux-2.6.32.13/mm/shmem.c linux-2.6.32.13/mm/shmem.c
---- linux-2.6.32.13/mm/shmem.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/shmem.c	2010-05-15 13:21:18.454622314 -0400
-@@ -31,7 +31,7 @@
+ 			avc->anon_vma = anon_vma;
+ 			avc->vma = vma;
+@@ -151,12 +176,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+ 
+ 		if (unlikely(allocated))
+ 			anon_vma_free(allocated);
++
++#ifdef CONFIG_PAX_SEGMEXEC
++		if (unlikely(avc_m))
++			anon_vma_chain_free(avc_m);
++#endif
++
+ 		if (unlikely(avc))
+ 			anon_vma_chain_free(avc);
+ 	}
+ 	return 0;
+ 
+  out_enomem_free_avc:
++
++#ifdef CONFIG_PAX_SEGMEXEC
++	if (avc_m)
++		anon_vma_chain_free(avc_m);
++#endif
++
+ 	anon_vma_chain_free(avc);
+  out_enomem:
+ 	return -ENOMEM;
+@@ -179,7 +216,7 @@ static void anon_vma_chain_link(struct vm_area_struct *vma,
+  * Attach the anon_vmas from src to dst.
+  * Returns 0 on success, -ENOMEM on failure.
+  */
+-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
++int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
+ {
+ 	struct anon_vma_chain *avc, *pavc;
+ 
+@@ -201,7 +238,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
+  * the corresponding VMA in the parent process is attached to.
+  * Returns 0 on success, non-zero on failure.
+  */
+-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
++int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
+ {
+ 	struct anon_vma_chain *avc;
+ 	struct anon_vma *anon_vma;
+diff --git a/mm/shmem.c b/mm/shmem.c
+index f65f840..1d5b784 100644
+--- a/mm/shmem.c
++++ b/mm/shmem.c
+@@ -30,7 +30,7 @@
+ #include <linux/module.h>
  #include <linux/swap.h>
- #include <linux/ima.h>
  
 -static struct vfsmount *shm_mnt;
 +struct vfsmount *shm_mnt;
  
  #ifdef CONFIG_SHMEM
  /*
-diff -urNp linux-2.6.32.13/mm/slab.c linux-2.6.32.13/mm/slab.c
---- linux-2.6.32.13/mm/slab.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/slab.c	2010-05-15 13:21:18.454622314 -0400
-@@ -308,7 +308,7 @@ struct kmem_list3 {
+diff --git a/mm/slab.c b/mm/slab.c
+index e4f747f..0e2a302 100644
+--- a/mm/slab.c
++++ b/mm/slab.c
+@@ -285,7 +285,7 @@ struct kmem_list3 {
   * Need this for bootstrapping a per node allocator.
   */
  #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
@@ -52752,7 +54787,7 @@ diff -urNp linux-2.6.32.13/mm/slab.c linux-2.6.32.13/mm/slab.c
  #define	CACHE_CACHE 0
  #define	SIZE_AC MAX_NUMNODES
  #define	SIZE_L3 (2 * MAX_NUMNODES)
-@@ -558,7 +558,7 @@ static inline void *index_to_obj(struct 
+@@ -535,7 +535,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
   *   reciprocal_divide(offset, cache->reciprocal_buffer_size)
   */
  static inline unsigned int obj_to_index(const struct kmem_cache *cache,
@@ -52761,7 +54796,7 @@ diff -urNp linux-2.6.32.13/mm/slab.c linux-2.6.32.13/mm/slab.c
  {
  	u32 offset = (obj - slab->s_mem);
  	return reciprocal_divide(offset, cache->reciprocal_buffer_size);
-@@ -584,14 +584,14 @@ struct cache_names {
+@@ -561,14 +561,14 @@ struct cache_names {
  static struct cache_names __initdata cache_names[] = {
  #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
  #include <linux/kmalloc_sizes.h>
@@ -52779,16 +54814,24 @@ diff -urNp linux-2.6.32.13/mm/slab.c linux-2.6.32.13/mm/slab.c
  
  /* internal cache of cache description objs */
  static struct kmem_cache cache_cache = {
-@@ -4082,7 +4082,7 @@ out:
- 	schedule_delayed_work(work, round_jiffies_relative(REAPTIMEOUT_CPUC));
- }
+@@ -4558,15 +4558,66 @@ static const struct file_operations proc_slabstats_operations = {
  
--#ifdef CONFIG_SLABINFO
-+#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
- 
- static void print_slabinfo_header(struct seq_file *m)
+ static int __init slab_proc_init(void)
  {
-@@ -4480,6 +4480,51 @@ static int __init slab_proc_init(void)
+-	proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
++	mode_t gr_mode = S_IRUGO;
++
++#ifdef CONFIG_GRKERNSEC_PROC_ADD
++	gr_mode = S_IRUSR;
++#endif
++
++	proc_create("slabinfo",S_IWUSR|gr_mode,NULL,&proc_slabinfo_operations);
+ #ifdef CONFIG_DEBUG_SLAB_LEAK
+-	proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
++	proc_create("slab_allocators", gr_mode, NULL, &proc_slabstats_operations);
+ #endif
+ 	return 0;
+ }
  module_init(slab_proc_init);
  #endif
  
@@ -52840,9 +54883,10 @@ diff -urNp linux-2.6.32.13/mm/slab.c linux-2.6.32.13/mm/slab.c
  /**
   * ksize - get the actual amount of memory allocated for a given object
   * @objp: Pointer to the object
-diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
---- linux-2.6.32.13/mm/slob.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/slob.c	2010-05-15 13:21:18.454622314 -0400
+diff --git a/mm/slob.c b/mm/slob.c
+index 23631e2..b0b3a91 100644
+--- a/mm/slob.c
++++ b/mm/slob.c
 @@ -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
@@ -52879,7 +54923,7 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  }
  
  static inline void set_slob_page(struct slob_page *sp)
-@@ -148,7 +150,7 @@ static inline void clear_slob_page(struc
+@@ -148,7 +150,7 @@ static inline void clear_slob_page(struct slob_page *sp)
  
  static inline struct slob_page *slob_page(const void *addr)
  {
@@ -52888,7 +54932,7 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  }
  
  /*
-@@ -208,7 +210,7 @@ static void set_slob(slob_t *s, slobidx_
+@@ -208,7 +210,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
  /*
   * Return the size of a slob block.
   */
@@ -52915,7 +54959,7 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  {
  	return !((unsigned long)slob_next(s) & ~PAGE_MASK);
  }
-@@ -252,6 +254,7 @@ static void *slob_new_pages(gfp_t gfp, i
+@@ -252,6 +254,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
  	if (!page)
  		return NULL;
  
@@ -52923,7 +54967,7 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  	return page_address(page);
  }
  
-@@ -368,11 +371,11 @@ static void *slob_alloc(size_t size, gfp
+@@ -368,11 +371,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
  		if (!b)
  			return NULL;
  		sp = slob_page(b);
@@ -52936,9 +54980,9 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  		INIT_LIST_HEAD(&sp->list);
  		set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
  		set_slob_page_free(sp, slob_list);
-@@ -475,10 +478,9 @@ out:
- #define ARCH_SLAB_MINALIGN __alignof__(unsigned long)
- #endif
+@@ -467,10 +470,9 @@ out:
+  * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
+  */
  
 -void *__kmalloc_node(size_t size, gfp_t gfp, int node)
 +static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
@@ -52949,7 +54993,7 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  	void *ret;
  
  	lockdep_trace_alloc(gfp);
-@@ -491,7 +493,10 @@ void *__kmalloc_node(size_t size, gfp_t 
+@@ -483,7 +485,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
  
  		if (!m)
  			return NULL;
@@ -52961,7 +55005,7 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  		ret = (void *)m + align;
  
  		trace_kmalloc_node(_RET_IP_, ret,
-@@ -501,9 +506,9 @@ void *__kmalloc_node(size_t size, gfp_t 
+@@ -493,9 +498,9 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
  
  		ret = slob_new_pages(gfp | __GFP_COMP, get_order(size), node);
  		if (ret) {
@@ -52974,7 +55018,7 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  		}
  
  		trace_kmalloc_node(_RET_IP_, ret,
-@@ -513,6 +518,13 @@ void *__kmalloc_node(size_t size, gfp_t 
+@@ -505,6 +510,13 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
  	kmemleak_alloc(ret, size, 1, gfp);
  	return ret;
  }
@@ -52988,7 +55032,7 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  EXPORT_SYMBOL(__kmalloc_node);
  
  void kfree(const void *block)
-@@ -528,13 +540,84 @@ void kfree(const void *block)
+@@ -520,13 +532,84 @@ void kfree(const void *block)
  	sp = slob_page(block);
  	if (is_slob_page(sp)) {
  		int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
@@ -53076,7 +55120,7 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
  size_t ksize(const void *block)
  {
-@@ -547,10 +630,10 @@ size_t ksize(const void *block)
+@@ -539,10 +622,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);
@@ -53090,7 +55134,7 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  }
  EXPORT_SYMBOL(ksize);
  
-@@ -605,17 +688,25 @@ void *kmem_cache_alloc_node(struct kmem_
+@@ -597,17 +680,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
  {
  	void *b;
  
@@ -53116,7 +55160,7 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  
  	if (c->ctor)
  		c->ctor(b);
-@@ -627,10 +718,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
+@@ -619,10 +710,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
  
  static void __kmem_cache_free(void *b, int size)
  {
@@ -53135,7 +55179,7 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  }
  
  static void kmem_rcu_free(struct rcu_head *head)
-@@ -643,15 +740,24 @@ static void kmem_rcu_free(struct rcu_hea
+@@ -635,15 +732,24 @@ static void kmem_rcu_free(struct rcu_head *head)
  
  void kmem_cache_free(struct kmem_cache *c, void *b)
  {
@@ -53163,10 +55207,11 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
  	}
  
  	trace_kmem_cache_free(_RET_IP_, b);
-diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c
---- linux-2.6.32.13/mm/slub.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/slub.c	2010-05-15 13:21:18.454622314 -0400
-@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
+diff --git a/mm/slub.c b/mm/slub.c
+index 578f68f..89a658c 100644
+--- a/mm/slub.c
++++ b/mm/slub.c
+@@ -1873,6 +1873,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
  
  	page = virt_to_head_page(x);
  
@@ -53175,7 +55220,7 @@ diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c
  	slab_free(s, page, x, _RET_IP_);
  
  	trace_kmem_cache_free(_RET_IP_, x);
-@@ -1937,7 +1939,7 @@ static int slub_min_objects;
+@@ -1917,7 +1919,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.)
   */
@@ -53184,7 +55229,7 @@ diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c
  
  /*
   * Calculate the order of allocation given an slab object size.
-@@ -2493,7 +2495,7 @@ static int kmem_cache_open(struct kmem_c
+@@ -2344,7 +2346,7 @@ static int kmem_cache_open(struct kmem_cache *s, gfp_t gfpflags,
  	 * list to avoid pounding the page allocator excessively.
  	 */
  	set_min_partial(s, ilog2(s->size));
@@ -53193,7 +55238,7 @@ diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c
  #ifdef CONFIG_NUMA
  	s->remote_node_defrag_ratio = 1000;
  #endif
-@@ -2630,8 +2632,7 @@ static inline int kmem_cache_close(struc
+@@ -2487,8 +2489,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
  void kmem_cache_destroy(struct kmem_cache *s)
  {
  	down_write(&slub_lock);
@@ -53203,7 +55248,7 @@ diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c
  		list_del(&s->list);
  		up_write(&slub_lock);
  		if (kmem_cache_close(s)) {
-@@ -2915,6 +2916,46 @@ void *__kmalloc_node(size_t size, gfp_t 
+@@ -2780,6 +2781,46 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
  EXPORT_SYMBOL(__kmalloc_node);
  #endif
  
@@ -53250,7 +55295,7 @@ diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c
  size_t ksize(const void *object)
  {
  	struct page *page;
-@@ -3186,7 +3227,7 @@ void __init kmem_cache_init(void)
+@@ -3049,7 +3090,7 @@ void __init kmem_cache_init(void)
  	 */
  	create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node",
  		sizeof(struct kmem_cache_node), GFP_NOWAIT);
@@ -53259,7 +55304,7 @@ diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c
  	caches++;
  
  	hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
-@@ -3293,7 +3334,7 @@ static int slab_unmergeable(struct kmem_
+@@ -3158,7 +3199,7 @@ static int slab_unmergeable(struct kmem_cache *s)
  	/*
  	 * We may have set a slab to be unmergeable during bootstrap.
  	 */
@@ -53268,16 +55313,16 @@ diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c
  		return 1;
  
  	return 0;
-@@ -3353,7 +3394,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3216,7 +3257,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
+ 	down_write(&slub_lock);
+ 	s = find_mergeable(size, align, flags, name, ctor);
  	if (s) {
- 		int cpu;
- 
 -		s->refcount++;
 +		atomic_inc(&s->refcount);
  		/*
  		 * Adjust the object sizes so that we clear
  		 * the complete object on kzalloc.
-@@ -3372,7 +3413,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3227,7 +3268,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
  
  		if (sysfs_slab_alias(s, name)) {
  			down_write(&slub_lock);
@@ -53286,7 +55331,7 @@ diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c
  			up_write(&slub_lock);
  			goto err;
  		}
-@@ -4101,7 +4142,7 @@ SLAB_ATTR_RO(ctor);
+@@ -3953,7 +3994,7 @@ SLAB_ATTR_RO(ctor);
  
  static ssize_t aliases_show(struct kmem_cache *s, char *buf)
  {
@@ -53295,37 +55340,26 @@ diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c
  }
  SLAB_ATTR_RO(aliases);
  
-@@ -4503,7 +4544,7 @@ static void kmem_cache_release(struct ko
- 	kfree(s);
- }
+@@ -4674,7 +4715,13 @@ static const struct file_operations proc_slabinfo_operations = {
  
--static struct sysfs_ops slab_sysfs_ops = {
-+static const struct sysfs_ops slab_sysfs_ops = {
- 	.show = slab_attr_show,
- 	.store = slab_attr_store,
- };
-@@ -4522,7 +4563,7 @@ static int uevent_filter(struct kset *ks
+ static int __init slab_proc_init(void)
+ {
+-	proc_create("slabinfo", S_IRUGO, NULL, &proc_slabinfo_operations);
++	mode_t gr_mode = S_IRUGO;
++
++#ifdef CONFIG_GRKERNSEC_PROC_ADD
++	gr_mode = S_IRUSR;
++#endif
++
++	proc_create("slabinfo", gr_mode, NULL, &proc_slabinfo_operations);
  	return 0;
  }
- 
--static struct kset_uevent_ops slab_uevent_ops = {
-+static const struct kset_uevent_ops slab_uevent_ops = {
- 	.filter = uevent_filter,
- };
- 
-@@ -4696,7 +4737,7 @@ __initcall(slab_sysfs_init);
- /*
-  * The /proc/slabinfo ABI
-  */
--#ifdef CONFIG_SLABINFO
-+#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
- static void print_slabinfo_header(struct seq_file *m)
- {
- 	seq_puts(m, "slabinfo - version: 2.1\n");
-diff -urNp linux-2.6.32.13/mm/util.c linux-2.6.32.13/mm/util.c
---- linux-2.6.32.13/mm/util.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/util.c	2010-05-15 13:21:18.454622314 -0400
-@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
+ module_init(slab_proc_init);
+diff --git a/mm/util.c b/mm/util.c
+index f5712e8..4b40b53 100644
+--- a/mm/util.c
++++ b/mm/util.c
+@@ -245,6 +245,12 @@ EXPORT_SYMBOL(strndup_user);
  void arch_pick_mmap_layout(struct mm_struct *mm)
  {
  	mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -53338,10 +55372,11 @@ diff -urNp linux-2.6.32.13/mm/util.c linux-2.6.32.13/mm/util.c
  	mm->get_unmapped_area = arch_get_unmapped_area;
  	mm->unmap_area = arch_unmap_area;
  }
-diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
---- linux-2.6.32.13/mm/vmalloc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/mm/vmalloc.c	2010-05-15 13:23:38.946686210 -0400
-@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
+diff --git a/mm/vmalloc.c b/mm/vmalloc.c
+index 20a402c..8c0eed6 100644
+--- a/mm/vmalloc.c
++++ b/mm/vmalloc.c
+@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
  
  	pte = pte_offset_kernel(pmd, addr);
  	do {
@@ -53363,7 +55398,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  	} while (pte++, addr += PAGE_SIZE, addr != end);
  }
  
-@@ -92,6 +103,7 @@ static int vmap_pte_range(pmd_t *pmd, un
+@@ -92,6 +103,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
  		unsigned long end, pgprot_t prot, struct page **pages, int *nr)
  {
  	pte_t *pte;
@@ -53371,7 +55406,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  
  	/*
  	 * nr is a running index into the array which helps higher level
-@@ -101,17 +113,30 @@ static int vmap_pte_range(pmd_t *pmd, un
+@@ -101,17 +113,30 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
  	pte = pte_alloc_kernel(pmd, addr);
  	if (!pte)
  		return -ENOMEM;
@@ -53407,7 +55442,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  }
  
  static int vmap_pmd_range(pud_t *pud, unsigned long addr,
-@@ -192,11 +217,20 @@ int is_vmalloc_or_module_addr(const void
+@@ -192,11 +217,20 @@ int is_vmalloc_or_module_addr(const void *x)
  	 * and fall back on vmalloc() if that fails. Others
  	 * just put it in the vmalloc space.
  	 */
@@ -53429,7 +55464,22 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  	return is_vmalloc_addr(x);
  }
  
-@@ -292,13 +326,13 @@ static void __insert_vmap_area(struct vm
+@@ -217,8 +251,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
+ 
+ 	if (!pgd_none(*pgd)) {
+ 		pud_t *pud = pud_offset(pgd, addr);
++#ifdef CONFIG_X86
++		if (!pud_large(*pud))
++#endif
+ 		if (!pud_none(*pud)) {
+ 			pmd_t *pmd = pmd_offset(pud, addr);
++#ifdef CONFIG_X86
++			if (!pmd_large(*pmd))
++#endif
+ 			if (!pmd_none(*pmd)) {
+ 				pte_t *ptep, pte;
+ 
+@@ -292,13 +332,13 @@ static void __insert_vmap_area(struct vmap_area *va)
  	struct rb_node *tmp;
  
  	while (*p) {
@@ -53447,7 +55497,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  			p = &(*p)->rb_right;
  		else
  			BUG();
-@@ -1223,6 +1257,16 @@ static struct vm_struct *__get_vm_area_n
+@@ -1233,6 +1273,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
  	struct vm_struct *area;
  
  	BUG_ON(in_interrupt());
@@ -53464,7 +55514,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  	if (flags & VM_IOREMAP) {
  		int bit = fls(size);
  
-@@ -1448,6 +1492,11 @@ void *vmap(struct page **pages, unsigned
+@@ -1458,6 +1508,11 @@ void *vmap(struct page **pages, unsigned int count,
  	if (count > totalram_pages)
  		return NULL;
  
@@ -53476,7 +55526,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  	area = get_vm_area_caller((count << PAGE_SHIFT), flags,
  					__builtin_return_address(0));
  	if (!area)
-@@ -1558,6 +1607,13 @@ static void *__vmalloc_node(unsigned lon
+@@ -1567,6 +1622,13 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
  	if (!size || (size >> PAGE_SHIFT) > totalram_pages)
  		return NULL;
  
@@ -53490,7 +55540,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  	area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START,
  				  VMALLOC_END, node, gfp_mask, caller);
  
-@@ -1576,6 +1632,7 @@ static void *__vmalloc_node(unsigned lon
+@@ -1585,6 +1647,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
  	return addr;
  }
  
@@ -53498,7 +55548,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
  {
  	return __vmalloc_node(size, 1, gfp_mask, prot, -1,
-@@ -1592,6 +1649,7 @@ EXPORT_SYMBOL(__vmalloc);
+@@ -1601,6 +1664,7 @@ EXPORT_SYMBOL(__vmalloc);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -53506,7 +55556,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  void *vmalloc(unsigned long size)
  {
  	return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1606,6 +1664,7 @@ EXPORT_SYMBOL(vmalloc);
+@@ -1615,6 +1679,7 @@ EXPORT_SYMBOL(vmalloc);
   * The resulting memory area is zeroed so it can be mapped to userspace
   * without leaking data.
   */
@@ -53514,7 +55564,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  void *vmalloc_user(unsigned long size)
  {
  	struct vm_struct *area;
-@@ -1633,6 +1692,7 @@ EXPORT_SYMBOL(vmalloc_user);
+@@ -1642,6 +1707,7 @@ EXPORT_SYMBOL(vmalloc_user);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -53522,7 +55572,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  void *vmalloc_node(unsigned long size, int node)
  {
  	return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1655,10 +1715,10 @@ EXPORT_SYMBOL(vmalloc_node);
+@@ -1664,10 +1730,10 @@ EXPORT_SYMBOL(vmalloc_node);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -53535,7 +55585,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  			      -1, __builtin_return_address(0));
  }
  
-@@ -1677,6 +1737,7 @@ void *vmalloc_exec(unsigned long size)
+@@ -1686,6 +1752,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.
   */
@@ -53543,7 +55593,7 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  void *vmalloc_32(unsigned long size)
  {
  	return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
-@@ -1691,6 +1752,7 @@ EXPORT_SYMBOL(vmalloc_32);
+@@ -1700,6 +1767,7 @@ EXPORT_SYMBOL(vmalloc_32);
   * The resulting memory area is 32bit addressable and zeroed so it can be
   * mapped to userspace without leaking data.
   */
@@ -53551,10 +55601,72 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
  void *vmalloc_32_user(unsigned long size)
  {
  	struct vm_struct *area;
-diff -urNp linux-2.6.32.13/net/8021q/vlan.c linux-2.6.32.13/net/8021q/vlan.c
---- linux-2.6.32.13/net/8021q/vlan.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/8021q/vlan.c	2010-05-15 13:21:18.454622314 -0400
-@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
+@@ -1964,6 +2032,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
+ 	unsigned long uaddr = vma->vm_start;
+ 	unsigned long usize = vma->vm_end - vma->vm_start;
+ 
++	BUG_ON(vma->vm_mirror);
++
+ 	if ((PAGE_SIZE-1) & (unsigned long)addr)
+ 		return -EINVAL;
+ 
+diff --git a/mm/vmstat.c b/mm/vmstat.c
+index 26d5716..49c2de1 100644
+--- a/mm/vmstat.c
++++ b/mm/vmstat.c
+@@ -76,7 +76,7 @@ void vm_events_fold_cpu(int cpu)
+  *
+  * vm_stat contains the global counters
+  */
+-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
++atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
+ EXPORT_SYMBOL(vm_stat);
+ 
+ #ifdef CONFIG_SMP
+@@ -328,7 +328,7 @@ void refresh_cpu_vm_stats(int cpu)
+ 				v = p->vm_stat_diff[i];
+ 				p->vm_stat_diff[i] = 0;
+ 				local_irq_restore(flags);
+-				atomic_long_add(v, &zone->vm_stat[i]);
++				atomic_long_add_unchecked(v, &zone->vm_stat[i]);
+ 				global_diff[i] += v;
+ #ifdef CONFIG_NUMA
+ 				/* 3 seconds idle till flush */
+@@ -366,7 +366,7 @@ void refresh_cpu_vm_stats(int cpu)
+ 
+ 	for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
+ 		if (global_diff[i])
+-			atomic_long_add(global_diff[i], &vm_stat[i]);
++			atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
+ }
+ 
+ #endif
+@@ -1051,10 +1051,16 @@ static int __init setup_vmstat(void)
+ 		start_cpu_timer(cpu);
+ #endif
+ #ifdef CONFIG_PROC_FS
+-	proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
+-	proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
+-	proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
+-	proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
++	{
++		mode_t gr_mode = S_IRUGO;
++#ifdef CONFIG_GRKERNSEC_PROC_ADD
++		gr_mode = S_IRUSR;
++#endif
++		proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
++		proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
++		proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
++		proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
++	}
+ #endif
+ 	return 0;
+ }
+diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
+index 3c1c8c1..d1dd2da 100644
+--- a/net/8021q/vlan.c
++++ b/net/8021q/vlan.c
+@@ -618,8 +618,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
  		err = -EPERM;
  		if (!capable(CAP_NET_ADMIN))
  			break;
@@ -53564,65 +55676,81 @@ diff -urNp linux-2.6.32.13/net/8021q/vlan.c linux-2.6.32.13/net/8021q/vlan.c
  			struct vlan_net *vn;
  
  			vn = net_generic(net, vlan_net_id);
-diff -urNp linux-2.6.32.13/net/atm/atm_misc.c linux-2.6.32.13/net/atm/atm_misc.c
---- linux-2.6.32.13/net/atm/atm_misc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/atm/atm_misc.c	2010-05-15 13:21:18.454622314 -0400
-@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
+diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
+index fc63526..7777a58 100644
+--- a/net/atm/atm_misc.c
++++ b/net/atm/atm_misc.c
+@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
  	if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
  		return 1;
- 	atm_return(vcc,truesize);
+ 	atm_return(vcc, truesize);
 -	atomic_inc(&vcc->stats->rx_drop);
 +	atomic_inc_unchecked(&vcc->stats->rx_drop);
  	return 0;
  }
- 
-@@ -41,7 +41,7 @@ struct sk_buff *atm_alloc_charge(struct 
+ EXPORT_SYMBOL(atm_charge);
+@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
  		}
  	}
- 	atm_return(vcc,guess);
+ 	atm_return(vcc, guess);
 -	atomic_inc(&vcc->stats->rx_drop);
 +	atomic_inc_unchecked(&vcc->stats->rx_drop);
  	return NULL;
  }
+ EXPORT_SYMBOL(atm_alloc_charge);
+@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
  
-@@ -88,7 +88,7 @@ int atm_pcr_goal(const struct atm_trafpr
- 
- void sonet_copy_stats(struct k_sonet_stats *from,struct sonet_stats *to)
+ void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
  {
 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-@@ -96,7 +96,7 @@ void sonet_copy_stats(struct k_sonet_sta
+@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
  
- void sonet_subtract_stats(struct k_sonet_stats *from,struct sonet_stats *to)
+ void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
  {
--#define __HANDLE_ITEM(i) atomic_sub(to->i,&from->i)
+-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.32.13/net/atm/proc.c linux-2.6.32.13/net/atm/proc.c
---- linux-2.6.32.13/net/atm/proc.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/atm/proc.c	2010-05-15 13:21:18.466625554 -0400
-@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
+diff --git a/net/atm/proc.c b/net/atm/proc.c
+index 6262aea..fc38858 100644
+--- a/net/atm/proc.c
++++ b/net/atm/proc.c
+@@ -44,9 +44,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
    const struct k_atm_aal_stats *stats)
  {
  	seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
--	    atomic_read(&stats->tx),atomic_read(&stats->tx_err),
--	    atomic_read(&stats->rx),atomic_read(&stats->rx_err),
--	    atomic_read(&stats->rx_drop));
-+	    atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
-+	    atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
-+	    atomic_read_unchecked(&stats->rx_drop));
+-		   atomic_read(&stats->tx), atomic_read(&stats->tx_err),
+-		   atomic_read(&stats->rx), atomic_read(&stats->rx_err),
+-		   atomic_read(&stats->rx_drop));
++		   atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
++		   atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
++		   atomic_read_unchecked(&stats->rx_drop));
  }
  
  static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-diff -urNp linux-2.6.32.13/net/atm/resources.c linux-2.6.32.13/net/atm/resources.c
---- linux-2.6.32.13/net/atm/resources.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/atm/resources.c	2010-05-15 13:21:18.466625554 -0400
-@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
+@@ -190,7 +190,12 @@ static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc)
+ {
+ 	struct sock *sk = sk_atm(vcc);
+ 
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++	seq_printf(seq, "%p ", NULL);
++#else
+ 	seq_printf(seq, "%p ", vcc);
++#endif
++
+ 	if (!vcc->dev)
+ 		seq_printf(seq, "Unassigned    ");
+ 	else
+diff --git a/net/atm/resources.c b/net/atm/resources.c
+index d29e582..028a383 100644
+--- a/net/atm/resources.c
++++ b/net/atm/resources.c
+@@ -159,7 +159,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
  static void copy_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
  {
@@ -53631,7 +55759,7 @@ diff -urNp linux-2.6.32.13/net/atm/resources.c linux-2.6.32.13/net/atm/resources
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-@@ -170,7 +170,7 @@ static void copy_aal_stats(struct k_atm_
+@@ -167,7 +167,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
  static void subtract_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
  {
@@ -53640,46 +55768,70 @@ diff -urNp linux-2.6.32.13/net/atm/resources.c linux-2.6.32.13/net/atm/resources
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.32.13/net/bridge/br_private.h linux-2.6.32.13/net/bridge/br_private.h
---- linux-2.6.32.13/net/bridge/br_private.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/bridge/br_private.h	2010-05-15 13:21:18.499638693 -0400
-@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, 
- 
- #ifdef CONFIG_SYSFS
- /* br_sysfs_if.c */
--extern struct sysfs_ops brport_sysfs_ops;
-+extern const struct sysfs_ops brport_sysfs_ops;
- extern int br_sysfs_addif(struct net_bridge_port *p);
- 
- /* br_sysfs_br.c */
-diff -urNp linux-2.6.32.13/net/bridge/br_stp_if.c linux-2.6.32.13/net/bridge/br_stp_if.c
---- linux-2.6.32.13/net/bridge/br_stp_if.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/bridge/br_stp_if.c	2010-05-15 13:21:18.499638693 -0400
-@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
+diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
+index cfdfd7e..763fd0b 100644
+--- a/net/ax25/af_ax25.c
++++ b/net/ax25/af_ax25.c
+@@ -1392,6 +1392,7 @@ static int ax25_getname(struct socket *sock, struct sockaddr *uaddr,
+ 	ax25_cb *ax25;
+ 	int err = 0;
+ 
++	memset(fsa, 0, sizeof(*fsa));
+ 	lock_sock(sk);
+ 	ax25 = ax25_sk(sk);
+ 
+@@ -1403,7 +1404,6 @@ static int ax25_getname(struct socket *sock, struct sockaddr *uaddr,
+ 
+ 		fsa->fsa_ax25.sax25_family = AF_AX25;
+ 		fsa->fsa_ax25.sax25_call   = ax25->dest_addr;
+-		fsa->fsa_ax25.sax25_ndigis = 0;
+ 
+ 		if (ax25->digipeat != NULL) {
+ 			ndigi = ax25->digipeat->ndigi;
+diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
+index 27ae946..cfb0d8f 100644
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -1461,7 +1461,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
+ 	nexthdr = ip6h->nexthdr;
+ 	offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
+ 
+-	if (offset < 0 || nexthdr != IPPROTO_ICMPV6)
++	if (nexthdr != IPPROTO_ICMPV6)
+ 		return 0;
+ 
+ 	/* Okay, we found ICMPv6 header */
+diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
+index 1d88269..79372d4 100644
+--- a/net/bridge/br_stp_if.c
++++ b/net/bridge/br_stp_if.c
+@@ -145,7 +145,7 @@ static void br_stp_stop(struct net_bridge *br)
  	char *envp[] = { NULL };
  
  	if (br->stp_enabled == BR_USER_STP) {
 -		r = call_usermodehelper(BR_STP_PROG, argv, envp, 1);
 +		r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC);
- 		printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
- 			br->dev->name, r);
- 
-diff -urNp linux-2.6.32.13/net/bridge/br_sysfs_if.c linux-2.6.32.13/net/bridge/br_sysfs_if.c
---- linux-2.6.32.13/net/bridge/br_sysfs_if.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/bridge/br_sysfs_if.c	2010-05-15 13:21:18.499638693 -0400
-@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
- 	return ret;
- }
- 
--struct sysfs_ops brport_sysfs_ops = {
-+const struct sysfs_ops brport_sysfs_ops = {
- 	.show = brport_show,
- 	.store = brport_store,
- };
-diff -urNp linux-2.6.32.13/net/core/dev.c linux-2.6.32.13/net/core/dev.c
---- linux-2.6.32.13/net/core/dev.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/core/dev.c	2010-05-15 13:21:18.499638693 -0400
-@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb)
+ 		br_info(br, "userspace STP stopped, return code %d\n", r);
+ 
+ 		/* To start timers on any ports left in blocking */
+diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
+index 59ca00e..8a19dea 100644
+--- a/net/bridge/netfilter/ebtables.c
++++ b/net/bridge/netfilter/ebtables.c
+@@ -1501,7 +1501,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
+ 			tmp.valid_hooks = t->table->valid_hooks;
+ 		}
+ 		mutex_unlock(&ebt_mutex);
+-		if (copy_to_user(user, &tmp, *len) != 0){
++		if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
+ 			BUGPRINT("c2u Didn't work\n");
+ 			ret = -EFAULT;
+ 			break;
+diff --git a/net/core/dev.c b/net/core/dev.c
+index d7d352b..ddef323 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2551,7 +2551,7 @@ int netif_rx_ni(struct sk_buff *skb)
  }
  EXPORT_SYMBOL(netif_rx_ni);
  
@@ -53688,48 +55840,67 @@ diff -urNp linux-2.6.32.13/net/core/dev.c linux-2.6.32.13/net/core/dev.c
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  
-@@ -2808,7 +2808,7 @@ void netif_napi_del(struct napi_struct *
+@@ -3484,7 +3484,7 @@ void netif_napi_del(struct napi_struct *napi)
+ }
  EXPORT_SYMBOL(netif_napi_del);
  
- 
 -static void net_rx_action(struct softirq_action *h)
 +static void net_rx_action(void)
  {
- 	struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
+ 	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  	unsigned long time_limit = jiffies + 2;
-diff -urNp linux-2.6.32.13/net/core/flow.c linux-2.6.32.13/net/core/flow.c
---- linux-2.6.32.13/net/core/flow.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/core/flow.c	2010-05-15 13:21:18.499638693 -0400
-@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
- 
- static u32 flow_hash_shift;
- #define flow_hash_size	(1 << flow_hash_shift)
--static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables) = { NULL };
-+static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables);
- 
- #define flow_table(cpu) (per_cpu(flow_tables, cpu))
- 
-@@ -52,7 +52,7 @@ struct flow_percpu_info {
- 	u32 hash_rnd;
- 	int count;
- };
--static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info) = { 0 };
-+static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info);
- 
- #define flow_hash_rnd_recalc(cpu) \
- 	(per_cpu(flow_hash_info, cpu).hash_rnd_recalc)
-@@ -69,7 +69,7 @@ struct flow_flush_info {
- 	atomic_t cpuleft;
- 	struct completion completion;
- };
--static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets) = { NULL };
-+static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets);
- 
- #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
+diff --git a/net/core/ethtool.c b/net/core/ethtool.c
+index f5e3856..f047cac 100644
+--- a/net/core/ethtool.c
++++ b/net/core/ethtool.c
+@@ -366,7 +366,7 @@ static noinline_for_stack int ethtool_get_rxnfc(struct net_device *dev,
+ 	if (info.cmd == ETHTOOL_GRXCLSRLALL) {
+ 		if (info.rule_cnt > 0) {
+ 			if (info.rule_cnt <= KMALLOC_MAX_SIZE / sizeof(u32))
+-				rule_buf = kmalloc(info.rule_cnt * sizeof(u32),
++				rule_buf = kzalloc(info.rule_cnt * sizeof(u32),
+ 						   GFP_USER);
+ 			if (!rule_buf)
+ 				return -ENOMEM;
+diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
+index 99e7052..1fddc80 100644
+--- a/net/core/net-sysfs.c
++++ b/net/core/net-sysfs.c
+@@ -511,7 +511,7 @@ static ssize_t rx_queue_attr_store(struct kobject *kobj, struct attribute *attr,
+ 	return attribute->store(queue, attribute, buf, count);
+ }
+ 
+-static struct sysfs_ops rx_queue_sysfs_ops = {
++static const struct sysfs_ops rx_queue_sysfs_ops = {
+ 	.show = rx_queue_attr_show,
+ 	.store = rx_queue_attr_store,
+ };
+diff --git a/net/core/sock.c b/net/core/sock.c
+index 2cf7f9f..3d9bb13 100644
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -915,7 +915,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+ 			return -ENOTCONN;
+ 		if (lv < len)
+ 			return -EINVAL;
+-		if (copy_to_user(optval, address, len))
++		if (len > sizeof(address) || copy_to_user(optval, address, len))
+ 			return -EFAULT;
+ 		goto lenout;
+ 	}
+@@ -948,7 +948,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
  
-diff -urNp linux-2.6.32.13/net/dccp/ccids/ccid3.c linux-2.6.32.13/net/dccp/ccids/ccid3.c
---- linux-2.6.32.13/net/dccp/ccids/ccid3.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/dccp/ccids/ccid3.c	2010-05-15 13:21:18.502580406 -0400
+ 	if (len > lv)
+ 		len = lv;
+-	if (copy_to_user(optval, &v, len))
++	if (len > sizeof(v) || copy_to_user(optval, &v, len))
+ 		return -EFAULT;
+ lenout:
+ 	if (put_user(len, optlen))
+diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
+index d323589..a221b45 100644
+--- a/net/dccp/ccids/ccid3.c
++++ b/net/dccp/ccids/ccid3.c
 @@ -41,7 +41,7 @@
  static int ccid3_debug;
  #define ccid3_pr_debug(format, a...)	DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -53739,9 +55910,10 @@ diff -urNp linux-2.6.32.13/net/dccp/ccids/ccid3.c linux-2.6.32.13/net/dccp/ccids
  #endif
  
  /*
-diff -urNp linux-2.6.32.13/net/dccp/dccp.h linux-2.6.32.13/net/dccp/dccp.h
---- linux-2.6.32.13/net/dccp/dccp.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/dccp/dccp.h	2010-05-15 13:21:18.502580406 -0400
+diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
+index a10a61a..af9db75 100644
+--- a/net/dccp/dccp.h
++++ b/net/dccp/dccp.h
 @@ -44,9 +44,9 @@ extern int dccp_debug;
  #define dccp_pr_debug_cat(format, a...)   DCCP_PRINTK(dccp_debug, format, ##a)
  #define dccp_debug(fmt, a...)		  dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -53755,30 +55927,32 @@ diff -urNp linux-2.6.32.13/net/dccp/dccp.h linux-2.6.32.13/net/dccp/dccp.h
  #endif
  
  extern struct inet_hashinfo dccp_hashinfo;
-diff -urNp linux-2.6.32.13/net/decnet/sysctl_net_decnet.c linux-2.6.32.13/net/decnet/sysctl_net_decnet.c
---- linux-2.6.32.13/net/decnet/sysctl_net_decnet.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/decnet/sysctl_net_decnet.c	2010-05-15 13:21:18.502580406 -0400
-@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
+diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
+index be3eb8e..30a9ce5 100644
+--- a/net/decnet/sysctl_net_decnet.c
++++ b/net/decnet/sysctl_net_decnet.c
+@@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
  
  	if (len > *lenp) len = *lenp;
  
 -	if (copy_to_user(buffer, addr, len))
-+	if (len > sizeof addr || copy_to_user(buffer, addr, len))
++	if (len > sizeof(addr) || copy_to_user(buffer, addr, len))
  		return -EFAULT;
  
  	*lenp = len;
-@@ -327,7 +327,7 @@ static int dn_def_dev_handler(ctl_table 
+@@ -236,7 +236,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
  
  	if (len > *lenp) len = *lenp;
  
 -	if (copy_to_user(buffer, devname, len))
-+	if (len > sizeof devname || copy_to_user(buffer, devname, len))
++	if (len > sizeof(devname) || copy_to_user(buffer, devname, len))
  		return -EFAULT;
  
  	*lenp = len;
-diff -urNp linux-2.6.32.13/net/ipv4/inet_hashtables.c linux-2.6.32.13/net/ipv4/inet_hashtables.c
---- linux-2.6.32.13/net/ipv4/inet_hashtables.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/ipv4/inet_hashtables.c	2010-05-15 13:21:18.502580406 -0400
+diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
+index d3e160a..94d5bd8 100644
+--- a/net/ipv4/inet_hashtables.c
++++ b/net/ipv4/inet_hashtables.c
 @@ -18,11 +18,14 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
@@ -53794,19 +55968,72 @@ diff -urNp linux-2.6.32.13/net/ipv4/inet_hashtables.c linux-2.6.32.13/net/ipv4/i
  /*
   * Allocate and initialize a new local port bind bucket.
   * The bindhash mutex for snum's hash chain must be held here.
-@@ -490,6 +493,8 @@ ok:
- 		}
+@@ -508,6 +511,8 @@ ok:
+ 			twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
  		spin_unlock(&head->lock);
  
 +		gr_update_task_in_ip_table(current, inet_sk(sk));
 +
  		if (tw) {
  			inet_twsk_deschedule(tw, death_row);
- 			inet_twsk_put(tw);
-diff -urNp linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c	2010-05-15 13:21:18.502580406 -0400
-@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
+ 			while (twrefcnt) {
+diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
+index 6bcfe52..31597d5 100644
+--- a/net/ipv4/inetpeer.c
++++ b/net/ipv4/inetpeer.c
+@@ -386,8 +386,8 @@ struct inet_peer *inet_getpeer(__be32 daddr, int create)
+ 		return NULL;
+ 	n->v4daddr = daddr;
+ 	atomic_set(&n->refcnt, 1);
+-	atomic_set(&n->rid, 0);
+-	atomic_set(&n->ip_id_count, secure_ip_id(daddr));
++	atomic_set_unchecked(&n->rid, 0);
++	atomic_set_unchecked(&n->ip_id_count, secure_ip_id(daddr));
+ 	n->tcp_ts_stamp = 0;
+ 
+ 	write_lock_bh(&peer_pool_lock);
+diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
+index 75347ea..c0e19ec 100644
+--- a/net/ipv4/ip_fragment.c
++++ b/net/ipv4/ip_fragment.c
+@@ -282,7 +282,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
+ 		return 0;
+ 
+ 	start = qp->rid;
+-	end = atomic_inc_return(&peer->rid);
++	end = atomic_inc_return_unchecked(&peer->rid);
+ 	qp->rid = end;
+ 
+ 	rc = qp->q.fragments && (end - start) > max;
+diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
+index aaab5aa..42344c6 100644
+--- a/net/ipv4/netfilter/arp_tables.c
++++ b/net/ipv4/netfilter/arp_tables.c
+@@ -926,6 +926,7 @@ static int get_info(struct net *net, void __user *user,
+ 			private = &tmp;
+ 		}
+ #endif
++		memset(&info, 0, sizeof(info));
+ 		info.valid_hooks = t->valid_hooks;
+ 		memcpy(info.hook_entry, private->hook_entry,
+ 		       sizeof(info.hook_entry));
+diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
+index 402ce75..717650a 100644
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -1120,6 +1120,7 @@ static int get_info(struct net *net, void __user *user,
+ 			private = &tmp;
+ 		}
+ #endif
++		memset(&info, 0, sizeof(info));
+ 		info.valid_hooks = t->valid_hooks;
+ 		memcpy(info.hook_entry, private->hook_entry,
+ 		       sizeof(info.hook_entry));
+diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
+index 1679e2c..c50066e 100644
+--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
++++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
+@@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode(struct asn1_ctx *ctx,
  
  	*len = 0;
  
@@ -53814,11 +56041,25 @@ diff -urNp linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.1
 +	*octets = kmalloc((eoc - ctx->pointer), GFP_ATOMIC);
  	if (*octets == NULL) {
  		if (net_ratelimit())
- 			printk("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.32.13/net/ipv4/tcp_ipv4.c linux-2.6.32.13/net/ipv4/tcp_ipv4.c
---- linux-2.6.32.13/net/ipv4/tcp_ipv4.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/ipv4/tcp_ipv4.c	2010-05-15 13:21:18.502580406 -0400
-@@ -84,6 +84,9 @@
+ 			pr_notice("OOM in bsalg (%d)\n", __LINE__);
+diff --git a/net/ipv4/route.c b/net/ipv4/route.c
+index 0189deb..f463d6bad 100644
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -2889,7 +2889,7 @@ static int rt_fill_info(struct net *net,
+ 	error = rt->u.dst.error;
+ 	expires = rt->u.dst.expires ? rt->u.dst.expires - jiffies : 0;
+ 	if (rt->peer) {
+-		id = atomic_read(&rt->peer->ip_id_count) & 0xffff;
++		id = atomic_read_unchecked(&rt->peer->ip_id_count) & 0xffff;
+ 		if (rt->peer->tcp_ts_stamp) {
+ 			ts = rt->peer->tcp_ts;
+ 			tsage = get_seconds() - rt->peer->tcp_ts_stamp;
+diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
+index fe193e5..d764db2 100644
+--- a/net/ipv4/tcp_ipv4.c
++++ b/net/ipv4/tcp_ipv4.c
+@@ -85,6 +85,9 @@
  int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
  
@@ -53828,7 +56069,17 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_ipv4.c linux-2.6.32.13/net/ipv4/tcp_ipv4
  
  #ifdef CONFIG_TCP_MD5SIG
  static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
-@@ -1603,12 +1606,20 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1593,6 +1596,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
+ 	return 0;
+ 
+ reset:
++#ifdef CONFIG_GRKERNSEC_BLACKHOLE
++	if (!grsec_enable_blackhole)
++#endif
+ 	tcp_v4_send_reset(rsk, skb);
+ discard:
+ 	kfree_skb(skb);
+@@ -1654,12 +1660,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);
@@ -53838,8 +56089,8 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_ipv4.c linux-2.6.32.13/net/ipv4/tcp_ipv4
 +		ret = 1;
 +#endif
  		goto no_tcp_socket;
+-
 +	}
- 
  process:
 -	if (sk->sk_state == TCP_TIME_WAIT)
 +	if (sk->sk_state == TCP_TIME_WAIT) {
@@ -53849,9 +56100,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_ipv4.c linux-2.6.32.13/net/ipv4/tcp_ipv4
  		goto do_time_wait;
 +	}
  
- 	if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
- 		goto discard_and_relse;
-@@ -1650,6 +1661,10 @@ no_tcp_socket:
+ 	if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
+ 		NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
+@@ -1709,6 +1722,10 @@ no_tcp_socket:
  bad_packet:
  		TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
  	} else {
@@ -53862,10 +56113,52 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_ipv4.c linux-2.6.32.13/net/ipv4/tcp_ipv4
  		tcp_v4_send_reset(NULL, skb);
  	}
  
-diff -urNp linux-2.6.32.13/net/ipv4/tcp_minisocks.c linux-2.6.32.13/net/ipv4/tcp_minisocks.c
---- linux-2.6.32.13/net/ipv4/tcp_minisocks.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/ipv4/tcp_minisocks.c	2010-05-15 13:21:18.502580406 -0400
-@@ -26,6 +26,10 @@
+@@ -2316,7 +2333,11 @@ static void get_openreq4(struct sock *sk, struct request_sock *req,
+ 		0,  /* non standard timer */
+ 		0, /* open_requests have no inode */
+ 		atomic_read(&sk->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++		NULL,
++#else
+ 		req,
++#endif
+ 		len);
+ }
+ 
+@@ -2366,7 +2387,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
+ 		sock_i_uid(sk),
+ 		icsk->icsk_probes_out,
+ 		sock_i_ino(sk),
+-		atomic_read(&sk->sk_refcnt), sk,
++		atomic_read(&sk->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++		NULL,
++#else
++		sk,
++#endif
+ 		jiffies_to_clock_t(icsk->icsk_rto),
+ 		jiffies_to_clock_t(icsk->icsk_ack.ato),
+ 		(icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
+@@ -2394,7 +2420,13 @@ static void get_timewait4_sock(struct inet_timewait_sock *tw,
+ 		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %p%n",
+ 		i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
+ 		3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
+-		atomic_read(&tw->tw_refcnt), tw, len);
++		atomic_read(&tw->tw_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++		NULL,
++#else
++		tw,
++#endif
++		len);
+ }
+ 
+ #define TMPSZ 150
+diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
+index 794c2e1..adf948c 100644
+--- a/net/ipv4/tcp_minisocks.c
++++ b/net/ipv4/tcp_minisocks.c
+@@ -27,6 +27,10 @@
  #include <net/inet_common.h>
  #include <net/xfrm.h>
  
@@ -53873,10 +56166,10 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_minisocks.c linux-2.6.32.13/net/ipv4/tcp
 +extern int grsec_enable_blackhole;
 +#endif
 +
- #ifdef CONFIG_SYSCTL
- #define SYNC_INIT 0 /* let the user enable it */
- #else
-@@ -672,6 +676,10 @@ listen_overflow:
+ int sysctl_tcp_syncookies __read_mostly = 1;
+ EXPORT_SYMBOL(sysctl_tcp_syncookies);
+ 
+@@ -700,6 +704,10 @@ listen_overflow:
  
  embryonic_reset:
  	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
@@ -53887,23 +56180,25 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_minisocks.c linux-2.6.32.13/net/ipv4/tcp
  	if (!(flg & TCP_FLAG_RST))
  		req->rsk_ops->send_reset(sk, skb);
  
-diff -urNp linux-2.6.32.13/net/ipv4/tcp_probe.c linux-2.6.32.13/net/ipv4/tcp_probe.c
---- linux-2.6.32.13/net/ipv4/tcp_probe.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/ipv4/tcp_probe.c	2010-05-15 13:21:18.502580406 -0400
-@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
+diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
+index f8efada..78f84b0 100644
+--- a/net/ipv4/tcp_probe.c
++++ b/net/ipv4/tcp_probe.c
+@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
  		if (cnt + width >= len)
  			break;
  
 -		if (copy_to_user(buf + cnt, tbuf, width))
-+		if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
++		if (width > sizeof(tbuf) || copy_to_user(buf + cnt, tbuf, width))
  			return -EFAULT;
  		cnt += width;
  	}
-diff -urNp linux-2.6.32.13/net/ipv4/tcp_timer.c linux-2.6.32.13/net/ipv4/tcp_timer.c
---- linux-2.6.32.13/net/ipv4/tcp_timer.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/ipv4/tcp_timer.c	2010-05-15 13:21:18.502580406 -0400
-@@ -21,6 +21,10 @@
- #include <linux/module.h>
+diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
+index ebb3dbb..34ff10d 100644
+--- a/net/ipv4/tcp_timer.c
++++ b/net/ipv4/tcp_timer.c
+@@ -22,6 +22,10 @@
+ #include <linux/gfp.h>
  #include <net/tcp.h>
  
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
@@ -53913,7 +56208,7 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_timer.c linux-2.6.32.13/net/ipv4/tcp_tim
  int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
  int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
  int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
-@@ -164,6 +168,13 @@ static int tcp_write_timeout(struct sock
+@@ -199,6 +203,13 @@ static int tcp_write_timeout(struct sock *sk)
  		}
  	}
  
@@ -53924,12 +56219,13 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_timer.c linux-2.6.32.13/net/ipv4/tcp_tim
 +		retry_until = grsec_lastack_retries;
 +#endif
 +
- 	if (retransmits_timed_out(sk, retry_until)) {
+ 	if (retransmits_timed_out(sk, retry_until, syn_set)) {
  		/* Has it gone just too far? */
  		tcp_write_err(sk);
-diff -urNp linux-2.6.32.13/net/ipv4/udp.c linux-2.6.32.13/net/ipv4/udp.c
---- linux-2.6.32.13/net/ipv4/udp.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/ipv4/udp.c	2010-05-15 13:21:18.502580406 -0400
+diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
+index f0fbbba..ab9f8e7 100644
+--- a/net/ipv4/udp.c
++++ b/net/ipv4/udp.c
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -53938,7 +56234,7 @@ diff -urNp linux-2.6.32.13/net/ipv4/udp.c linux-2.6.32.13/net/ipv4/udp.c
  #include <linux/socket.h>
  #include <linux/sockios.h>
  #include <linux/igmp.h>
-@@ -106,6 +107,10 @@
+@@ -107,6 +108,10 @@
  #include <net/xfrm.h>
  #include "udp_impl.h"
  
@@ -53946,10 +56242,10 @@ diff -urNp linux-2.6.32.13/net/ipv4/udp.c linux-2.6.32.13/net/ipv4/udp.c
 +extern int grsec_enable_blackhole;
 +#endif
 +
- struct udp_table udp_table;
+ struct udp_table udp_table __read_mostly;
  EXPORT_SYMBOL(udp_table);
  
-@@ -371,6 +376,9 @@ found:
+@@ -564,6 +569,9 @@ found:
  	return s;
  }
  
@@ -53959,7 +56255,7 @@ diff -urNp linux-2.6.32.13/net/ipv4/udp.c linux-2.6.32.13/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
-@@ -639,9 +647,18 @@ int udp_sendmsg(struct kiocb *iocb, stru
+@@ -832,9 +840,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
  		dport = usin->sin_port;
  		if (dport == 0)
  			return -EINVAL;
@@ -53975,10 +56271,10 @@ diff -urNp linux-2.6.32.13/net/ipv4/udp.c linux-2.6.32.13/net/ipv4/udp.c
 +		if (err)
 +			return err;
 +
- 		daddr = inet->daddr;
- 		dport = inet->dport;
+ 		daddr = inet->inet_daddr;
+ 		dport = inet->inet_dport;
  		/* Open fast path for connected socket.
-@@ -945,6 +962,10 @@ try_again:
+@@ -1141,6 +1158,10 @@ try_again:
  	if (!skb)
  		goto out;
  
@@ -53987,9 +56283,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/udp.c linux-2.6.32.13/net/ipv4/udp.c
 +		goto out_free;
 +
  	ulen = skb->len - sizeof(struct udphdr);
- 	copied = len;
- 	if (copied > ulen)
-@@ -1335,6 +1356,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, 
+ 	if (len > ulen)
+ 		len = ulen;
+@@ -1625,6 +1646,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
  		goto csum_error;
  
  	UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
@@ -53999,10 +56295,25 @@ diff -urNp linux-2.6.32.13/net/ipv4/udp.c linux-2.6.32.13/net/ipv4/udp.c
  	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
  
  	/*
-diff -urNp linux-2.6.32.13/net/ipv6/exthdrs.c linux-2.6.32.13/net/ipv6/exthdrs.c
---- linux-2.6.32.13/net/ipv6/exthdrs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/ipv6/exthdrs.c	2010-05-15 13:21:18.502580406 -0400
-@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
+@@ -2051,7 +2075,12 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
+ 		sk_wmem_alloc_get(sp),
+ 		sk_rmem_alloc_get(sp),
+ 		0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
+-		atomic_read(&sp->sk_refcnt), sp,
++		atomic_read(&sp->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++		NULL,
++#else
++		sp,
++#endif
+ 		atomic_read(&sp->sk_drops), len);
+ }
+ 
+diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
+index 8a659f9..9138fb7 100644
+--- a/net/ipv6/exthdrs.c
++++ b/net/ipv6/exthdrs.c
+@@ -636,7 +636,7 @@ static struct tlvtype_proc tlvprochopopt_lst[] = {
  		.type	= IPV6_TLV_JUMBO,
  		.func	= ipv6_hop_jumbo,
  	},
@@ -54011,10 +56322,23 @@ diff -urNp linux-2.6.32.13/net/ipv6/exthdrs.c linux-2.6.32.13/net/ipv6/exthdrs.c
  };
  
  int ipv6_parse_hopopts(struct sk_buff *skb)
-diff -urNp linux-2.6.32.13/net/ipv6/raw.c linux-2.6.32.13/net/ipv6/raw.c
---- linux-2.6.32.13/net/ipv6/raw.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/ipv6/raw.c	2010-05-15 13:21:18.523941597 -0400
-@@ -600,7 +600,7 @@ out:
+diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
+index 2112298..e915d57 100644
+--- a/net/ipv6/netfilter/ip6_tables.c
++++ b/net/ipv6/netfilter/ip6_tables.c
+@@ -1135,6 +1135,7 @@ static int get_info(struct net *net, void __user *user,
+ 			private = &tmp;
+ 		}
+ #endif
++		memset(&info, 0, sizeof(info));
+ 		info.valid_hooks = t->valid_hooks;
+ 		memcpy(info.hook_entry, private->hook_entry,
+ 		       sizeof(info.hook_entry));
+diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
+index 4a4dcbe..c0a42c0 100644
+--- a/net/ipv6/raw.c
++++ b/net/ipv6/raw.c
+@@ -601,7 +601,7 @@ out:
  	return err;
  }
  
@@ -54023,46 +56347,168 @@ diff -urNp linux-2.6.32.13/net/ipv6/raw.c linux-2.6.32.13/net/ipv6/raw.c
  			struct flowi *fl, struct rt6_info *rt,
  			unsigned int flags)
  {
-diff -urNp linux-2.6.32.13/net/ipv6/tcp_ipv6.c linux-2.6.32.13/net/ipv6/tcp_ipv6.c
---- linux-2.6.32.13/net/ipv6/tcp_ipv6.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/ipv6/tcp_ipv6.c	2010-05-15 13:21:18.734776060 -0400
-@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk
+@@ -1247,7 +1247,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
+ 		   0, 0L, 0,
+ 		   sock_i_uid(sp), 0,
+ 		   sock_i_ino(sp),
+-		   atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
++		   atomic_read(&sp->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++		   NULL,
++#else
++		   sp,
++#endif
++		   atomic_read(&sp->sk_drops));
+ }
+ 
+ static int raw6_seq_show(struct seq_file *seq, void *v)
+diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
+index 2b7c3a1..ddbcd4e 100644
+--- a/net/ipv6/tcp_ipv6.c
++++ b/net/ipv6/tcp_ipv6.c
+@@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
+ }
+ #endif
+ 
++#ifdef CONFIG_GRKERNSEC_BLACKHOLE
++extern int grsec_enable_blackhole;
++#endif
++
+ static void tcp_v6_hash(struct sock *sk)
+ {
+ 	if (sk->sk_state != TCP_CLOSE) {
+@@ -1641,6 +1645,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
  	return 0;
  
  reset:
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
-+	if (!skb->dev || (skb->dev->flags & IFF_LOOPBACK))
++	if (!grsec_enable_blackhole)
 +#endif
  	tcp_v6_send_reset(sk, skb);
  discard:
  	if (opt_skb)
-@@ -1700,6 +1703,9 @@ no_tcp_socket:
+@@ -1720,12 +1727,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
+ 	TCP_SKB_CB(skb)->sacked = 0;
+ 
+ 	sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
+-	if (!sk)
++	if (!sk) {
++#ifdef CONFIG_GRKERNSEC_BLACKHOLE
++		ret = 1;
++#endif
+ 		goto no_tcp_socket;
++	}
+ 
+ process:
+-	if (sk->sk_state == TCP_TIME_WAIT)
++	if (sk->sk_state == TCP_TIME_WAIT) {
++#ifdef CONFIG_GRKERNSEC_BLACKHOLE
++		ret = 2;
++#endif
+ 		goto do_time_wait;
++	}
+ 
+ 	if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
+ 		NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
+@@ -1773,6 +1788,10 @@ no_tcp_socket:
  bad_packet:
  		TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
  	} else {
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
-+		if (skb->dev->flags & IFF_LOOPBACK)
++		if (!grsec_enable_blackhole || (ret == 1 &&
++		    (skb->dev->flags & IFF_LOOPBACK)))
 +#endif
  		tcp_v6_send_reset(NULL, skb);
  	}
  
-diff -urNp linux-2.6.32.13/net/ipv6/udp.c linux-2.6.32.13/net/ipv6/udp.c
---- linux-2.6.32.13/net/ipv6/udp.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/ipv6/udp.c	2010-05-15 13:21:18.734776060 -0400
-@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 
+@@ -2001,7 +2020,13 @@ static void get_openreq6(struct seq_file *seq,
+ 		   uid,
+ 		   0,  /* non standard timer */
+ 		   0, /* open_requests have no inode */
+-		   0, req);
++		   0,
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++		   NULL
++#else
++		   req
++#endif
++		   );
+ }
+ 
+ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
+@@ -2051,7 +2076,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
+ 		   sock_i_uid(sp),
+ 		   icsk->icsk_probes_out,
+ 		   sock_i_ino(sp),
+-		   atomic_read(&sp->sk_refcnt), sp,
++		   atomic_read(&sp->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++		   NULL,
++#else
++		   sp,
++#endif
+ 		   jiffies_to_clock_t(icsk->icsk_rto),
+ 		   jiffies_to_clock_t(icsk->icsk_ack.ato),
+ 		   (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
+@@ -2086,7 +2116,13 @@ static void get_timewait6_sock(struct seq_file *seq,
+ 		   dest->s6_addr32[2], dest->s6_addr32[3], destp,
+ 		   tw->tw_substate, 0, 0,
+ 		   3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
+-		   atomic_read(&tw->tw_refcnt), tw);
++		   atomic_read(&tw->tw_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++		   NULL
++#else
++		   tw
++#endif
++		   );
+ }
+ 
+ static int tcp6_seq_show(struct seq_file *seq, void *v)
+diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
+index 97e1214..156b0c2 100644
+--- a/net/ipv6/udp.c
++++ b/net/ipv6/udp.c
+@@ -50,6 +50,10 @@
+ #include <linux/seq_file.h>
+ #include "udp_impl.h"
+ 
++#ifdef CONFIG_GRKERNSEC_BLACKHOLE
++extern int grsec_enable_blackhole;
++#endif
++
+ int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
+ {
+ 	const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
+@@ -765,6 +769,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
  		UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
  				proto == IPPROTO_UDPLITE);
  
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
-+		if (skb->dev->flags & IFF_LOOPBACK)
++		if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
 +#endif
- 		icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
+ 		icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
  
  		kfree_skb(skb);
-diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c	2010-05-15 13:21:18.734776060 -0400
-@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
+@@ -1404,7 +1411,12 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
+ 		   0, 0L, 0,
+ 		   sock_i_uid(sp), 0,
+ 		   sock_i_ino(sp),
+-		   atomic_read(&sp->sk_refcnt), sp,
++		   atomic_read(&sp->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++		   NULL,
++#else
++		   sp,
++#endif
+ 		   atomic_read(&sp->sk_drops));
+ }
+ 
+diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
+index faa82ca..723dc80 100644
+--- a/net/irda/ircomm/ircomm_tty.c
++++ b/net/irda/ircomm/ircomm_tty.c
+@@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
  	add_wait_queue(&self->open_wait, &wait);
  
  	IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
@@ -54082,7 +56528,7 @@ diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda
  
  	while (1) {
  		if (tty->termios->c_cflag & CBAUD) {
-@@ -329,7 +329,7 @@ static int ircomm_tty_block_til_ready(st
+@@ -330,7 +330,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
  		}
  
  		IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
@@ -54091,7 +56537,7 @@ diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda
  
  		schedule();
  	}
-@@ -340,13 +340,13 @@ static int ircomm_tty_block_til_ready(st
+@@ -341,13 +341,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
  	if (extra_count) {
  		/* ++ is not atomic, so this should be protected - Jean II */
  		spin_lock_irqsave(&self->spinlock, flags);
@@ -54108,7 +56554,7 @@ diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda
  
  	if (!retval)
  		self->flags |= ASYNC_NORMAL_ACTIVE;
-@@ -415,14 +415,14 @@ static int ircomm_tty_open(struct tty_st
+@@ -416,14 +416,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
  	}
  	/* ++ is not atomic, so this should be protected - Jean II */
  	spin_lock_irqsave(&self->spinlock, flags);
@@ -54125,7 +56571,7 @@ diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda
  
  	/* Not really used by us, but lets do it anyway */
  	self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-@@ -511,7 +511,7 @@ static void ircomm_tty_close(struct tty_
+@@ -509,7 +509,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
  		return;
  	}
  
@@ -54134,7 +56580,7 @@ diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda
  		/*
  		 * Uh, oh.  tty->count is 1, which means that the tty
  		 * structure will be freed.  state->count should always
-@@ -521,16 +521,16 @@ static void ircomm_tty_close(struct tty_
+@@ -519,16 +519,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
  		 */
  		IRDA_DEBUG(0, "%s(), bad serial port count; "
  			   "tty->count is 1, state->count is %d\n", __func__ ,
@@ -54157,7 +56603,7 @@ diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda
  		spin_unlock_irqrestore(&self->spinlock, flags);
  
  		IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
-@@ -562,7 +562,7 @@ static void ircomm_tty_close(struct tty_
+@@ -560,7 +560,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
  	tty->closing = 0;
  	self->tty = NULL;
  
@@ -54166,7 +56612,7 @@ diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda
  		if (self->close_delay)
  			schedule_timeout_interruptible(self->close_delay);
  		wake_up_interruptible(&self->open_wait);
-@@ -1017,7 +1017,7 @@ static void ircomm_tty_hangup(struct tty
+@@ -1012,7 +1012,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
  	spin_lock_irqsave(&self->spinlock, flags);
  	self->flags &= ~ASYNC_NORMAL_ACTIVE;
  	self->tty = NULL;
@@ -54175,7 +56621,7 @@ diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda
  	spin_unlock_irqrestore(&self->spinlock, flags);
  
  	wake_up_interruptible(&self->open_wait);
-@@ -1369,7 +1369,7 @@ static void ircomm_tty_line_info(struct 
+@@ -1364,7 +1364,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
  	seq_putc(m, '\n');
  
  	seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
@@ -54184,10 +56630,27 @@ diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda
  	seq_printf(m, "Max data size: %d\n", self->max_data_size);
  	seq_printf(m, "Max header size: %d\n", self->max_header_size);
  
-diff -urNp linux-2.6.32.13/net/mac80211/ieee80211_i.h linux-2.6.32.13/net/mac80211/ieee80211_i.h
---- linux-2.6.32.13/net/mac80211/ieee80211_i.h	2010-04-04 20:41:50.080541354 -0400
-+++ linux-2.6.32.13/net/mac80211/ieee80211_i.h	2010-05-15 13:21:18.734776060 -0400
-@@ -635,7 +635,7 @@ struct ieee80211_local {
+diff --git a/net/key/af_key.c b/net/key/af_key.c
+index 43040e9..3f64a40 100644
+--- a/net/key/af_key.c
++++ b/net/key/af_key.c
+@@ -3644,7 +3644,11 @@ static int pfkey_seq_show(struct seq_file *f, void *v)
+ 		seq_printf(f ,"sk       RefCnt Rmem   Wmem   User   Inode\n");
+ 	else
+ 		seq_printf(f ,"%p %-6d %-6u %-6u %-6u %-6lu\n",
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++			       NULL,
++#else
+ 			       s,
++#endif
+ 			       atomic_read(&s->sk_refcnt),
+ 			       sk_rmem_alloc_get(s),
+ 			       sk_wmem_alloc_get(s),
+diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
+index a9f8947..6cbca3e 100644
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -649,7 +649,7 @@ struct ieee80211_local {
  	/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
  	spinlock_t queue_stop_reason_lock;
  
@@ -54196,10 +56659,11 @@ diff -urNp linux-2.6.32.13/net/mac80211/ieee80211_i.h linux-2.6.32.13/net/mac802
  	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-2.6.32.13/net/mac80211/iface.c linux-2.6.32.13/net/mac80211/iface.c
---- linux-2.6.32.13/net/mac80211/iface.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/mac80211/iface.c	2010-05-15 13:21:18.734776060 -0400
-@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
+diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
+index 50deb01..d2f72d6 100644
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -183,7 +183,7 @@ static int ieee80211_open(struct net_device *dev)
  		break;
  	}
  
@@ -54208,7 +56672,7 @@ diff -urNp linux-2.6.32.13/net/mac80211/iface.c linux-2.6.32.13/net/mac80211/ifa
  		res = drv_start(local);
  		if (res)
  			goto err_del_bss;
-@@ -196,7 +196,7 @@ static int ieee80211_open(struct net_dev
+@@ -215,7 +215,7 @@ static int ieee80211_open(struct net_device *dev)
  	 * Validate the MAC address for this device.
  	 */
  	if (!is_valid_ether_addr(dev->dev_addr)) {
@@ -54217,7 +56681,7 @@ diff -urNp linux-2.6.32.13/net/mac80211/iface.c linux-2.6.32.13/net/mac80211/ifa
  			drv_stop(local);
  		return -EADDRNOTAVAIL;
  	}
-@@ -292,7 +292,7 @@ static int ieee80211_open(struct net_dev
+@@ -308,7 +308,7 @@ static int ieee80211_open(struct net_device *dev)
  
  	hw_reconf_flags |= __ieee80211_recalc_idle(local);
  
@@ -54226,16 +56690,16 @@ diff -urNp linux-2.6.32.13/net/mac80211/iface.c linux-2.6.32.13/net/mac80211/ifa
  	if (hw_reconf_flags) {
  		ieee80211_hw_config(local, hw_reconf_flags);
  		/*
-@@ -320,7 +320,7 @@ static int ieee80211_open(struct net_dev
+@@ -336,7 +336,7 @@ static int ieee80211_open(struct net_device *dev)
   err_del_interface:
- 	drv_remove_interface(local, &conf);
+ 	drv_remove_interface(local, &sdata->vif);
   err_stop:
 -	if (!local->open_count)
 +	if (!atomic_read(&local->open_count))
  		drv_stop(local);
   err_del_bss:
  	sdata->bss = NULL;
-@@ -420,7 +420,7 @@ static int ieee80211_stop(struct net_dev
+@@ -439,7 +439,7 @@ static int ieee80211_stop(struct net_device *dev)
  		WARN_ON(!list_empty(&sdata->u.ap.vlans));
  	}
  
@@ -54244,7 +56708,7 @@ diff -urNp linux-2.6.32.13/net/mac80211/iface.c linux-2.6.32.13/net/mac80211/ifa
  
  	switch (sdata->vif.type) {
  	case NL80211_IFTYPE_AP_VLAN:
-@@ -526,7 +526,7 @@ static int ieee80211_stop(struct net_dev
+@@ -542,7 +542,7 @@ static int ieee80211_stop(struct net_device *dev)
  
  	ieee80211_recalc_ps(local, -1);
  
@@ -54253,10 +56717,11 @@ diff -urNp linux-2.6.32.13/net/mac80211/iface.c linux-2.6.32.13/net/mac80211/ifa
  		ieee80211_clear_tx_pending(local);
  		ieee80211_stop_device(local);
  
-diff -urNp linux-2.6.32.13/net/mac80211/main.c linux-2.6.32.13/net/mac80211/main.c
---- linux-2.6.32.13/net/mac80211/main.c	2010-04-04 20:41:50.080541354 -0400
-+++ linux-2.6.32.13/net/mac80211/main.c	2010-05-15 13:21:18.734776060 -0400
-@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
+diff --git a/net/mac80211/main.c b/net/mac80211/main.c
+index cd36d49..e40db43 100644
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -149,7 +149,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
  		local->hw.conf.power_level = power;
  	}
  
@@ -54265,10 +56730,11 @@ diff -urNp linux-2.6.32.13/net/mac80211/main.c linux-2.6.32.13/net/mac80211/main
  		ret = drv_config(local, changed);
  		/*
  		 * Goal:
-diff -urNp linux-2.6.32.13/net/mac80211/pm.c linux-2.6.32.13/net/mac80211/pm.c
---- linux-2.6.32.13/net/mac80211/pm.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/mac80211/pm.c	2010-05-15 13:21:18.734776060 -0400
-@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
+diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
+index 75202b2..67b822c 100644
+--- a/net/mac80211/pm.c
++++ b/net/mac80211/pm.c
+@@ -101,7 +101,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
  	}
  
  	/* stop hardware - this must stop RX */
@@ -54277,22 +56743,37 @@ diff -urNp linux-2.6.32.13/net/mac80211/pm.c linux-2.6.32.13/net/mac80211/pm.c
  		ieee80211_stop_device(local);
  
  	local->suspended = true;
-diff -urNp linux-2.6.32.13/net/mac80211/rate.c linux-2.6.32.13/net/mac80211/rate.c
---- linux-2.6.32.13/net/mac80211/rate.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/mac80211/rate.c	2010-05-15 13:21:18.734776060 -0400
-@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
- 	struct rate_control_ref *ref, *old;
+diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
+index 68fc9c4..39b6583 100644
+--- a/net/mac80211/rate.c
++++ b/net/mac80211/rate.c
+@@ -358,7 +358,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
  
  	ASSERT_RTNL();
+ 
 -	if (local->open_count)
 +	if (atomic_read(&local->open_count))
  		return -EBUSY;
  
- 	ref = rate_control_alloc(name, local);
-diff -urNp linux-2.6.32.13/net/mac80211/tx.c linux-2.6.32.13/net/mac80211/tx.c
---- linux-2.6.32.13/net/mac80211/tx.c	2010-04-29 17:49:38.690617032 -0400
-+++ linux-2.6.32.13/net/mac80211/tx.c	2010-05-15 13:21:18.734776060 -0400
-@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct 
+ 	if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
+diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
+index 47438b4..bee0611 100644
+--- a/net/mac80211/rc80211_pid_debugfs.c
++++ b/net/mac80211/rc80211_pid_debugfs.c
+@@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
+ 
+ 	spin_unlock_irqrestore(&events->lock, status);
+ 
+-	if (copy_to_user(buf, pb, p))
++	if (p > sizeof(pb) || copy_to_user(buf, pb, p))
+ 		return -EFAULT;
+ 
+ 	return p;
+diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
+index 680bcb7..bd3d669 100644
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr,
  	return cpu_to_le16(dur);
  }
  
@@ -54301,10 +56782,11 @@ diff -urNp linux-2.6.32.13/net/mac80211/tx.c linux-2.6.32.13/net/mac80211/tx.c
  				      struct net_device *dev)
  {
  	return local == wdev_priv(dev->ieee80211_ptr);
-diff -urNp linux-2.6.32.13/net/mac80211/util.c linux-2.6.32.13/net/mac80211/util.c
---- linux-2.6.32.13/net/mac80211/util.c	2010-04-29 17:49:38.690617032 -0400
-+++ linux-2.6.32.13/net/mac80211/util.c	2010-05-15 13:21:18.734776060 -0400
-@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_
+diff --git a/net/mac80211/util.c b/net/mac80211/util.c
+index 5b79d55..03c34c9 100644
+--- a/net/mac80211/util.c
++++ b/net/mac80211/util.c
+@@ -1097,7 +1097,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
  		local->resuming = true;
  
  	/* restart hardware */
@@ -54313,18 +56795,258 @@ diff -urNp linux-2.6.32.13/net/mac80211/util.c linux-2.6.32.13/net/mac80211/util
  		/*
  		 * Upon resume hardware can sometimes be goofy due to
  		 * various platform / driver / bus issues, so restarting
- 		 * the device may at times not work immediately. Propagate
- 		 * the error.
+diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
+index 8593a77..de89e59 100644
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -693,6 +693,16 @@ config NETFILTER_XT_MATCH_ESP
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_GRADM
++	tristate '"gradm" match support'
++	depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
++	depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
++	---help---
++	  The gradm match allows to match on grsecurity RBAC being enabled.
++	  It is useful when iptables rules are applied early on bootup to
++	  prevent connections to the machine (except from a trusted host)
++	  while the RBAC system is disabled.
++
+ config NETFILTER_XT_MATCH_HASHLIMIT
+ 	tristate '"hashlimit" match support'
+ 	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
+diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
+index 14e3a8f..6890aa7 100644
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -71,6 +71,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRACK) += xt_conntrack.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
+diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
+new file mode 100644
+index 0000000..6905327
+--- /dev/null
++++ b/net/netfilter/xt_gradm.c
+@@ -0,0 +1,51 @@
++/*
++ *	gradm match for netfilter
++ *	Copyright © Zbigniew Krzystolik, 2010
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License; either version
++ *	2 or 3 as published by the Free Software Foundation.
++ */
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/grsecurity.h>
++#include <linux/netfilter/xt_gradm.h>
++
++static bool
++gradm_mt(const struct sk_buff *skb, struct xt_action_param *par)
++{
++	const struct xt_gradm_mtinfo *info = par->matchinfo;
++	bool retval = false;
++	if (gr_acl_is_enabled())
++		retval = true;
++	return retval ^ info->invflags;
++}
++
++static struct xt_match gradm_mt_reg __read_mostly = {
++		.name       = "gradm",
++		.revision   = 0,
++		.family     = NFPROTO_UNSPEC,
++		.match      = gradm_mt,
++		.matchsize  = XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
++		.me         = THIS_MODULE,
++};
++
++static int __init gradm_mt_init(void)
++{       
++	        return xt_register_match(&gradm_mt_reg);
++}
++
++static void __exit gradm_mt_exit(void)
++{       
++	        xt_unregister_match(&gradm_mt_reg);
++}
++
++module_init(gradm_mt_init);
++module_exit(gradm_mt_exit);
++MODULE_AUTHOR("Zbigniew Krzystolik <zbyniu@destrukcja.pl>");
++MODULE_DESCRIPTION("Xtables: Grsecurity RBAC match");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("ipt_gradm");
++MODULE_ALIAS("ip6t_gradm");
+diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
+index 54d7308..8d8ccd8 100644
+--- a/net/netlink/af_netlink.c
++++ b/net/netlink/af_netlink.c
+@@ -2001,13 +2001,21 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
+ 		struct netlink_sock *nlk = nlk_sk(s);
+ 
+ 		seq_printf(seq, "%p %-3d %-6d %08x %-8d %-8d %p %-8d %-8d %-8lu\n",
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++			   NULL,
++#else
+ 			   s,
++#endif
+ 			   s->sk_protocol,
+ 			   nlk->pid,
+ 			   nlk->groups ? (u32)nlk->groups[0] : 0,
+ 			   sk_rmem_alloc_get(s),
+ 			   sk_wmem_alloc_get(s),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++			   NULL,
++#else
+ 			   nlk->cb,
++#endif
+ 			   atomic_read(&s->sk_refcnt),
+ 			   atomic_read(&s->sk_drops),
+ 			   sock_i_ino(s)
+diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
+index 06cb027..6faef38 100644
+--- a/net/netrom/af_netrom.c
++++ b/net/netrom/af_netrom.c
+@@ -840,6 +840,7 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
+ 	struct sock *sk = sock->sk;
+ 	struct nr_sock *nr = nr_sk(sk);
+ 
++	memset(sax, 0, sizeof(*sax));
+ 	lock_sock(sk);
+ 	if (peer != 0) {
+ 		if (sk->sk_state != TCP_ESTABLISHED) {
+@@ -854,7 +855,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
+ 		*uaddr_len = sizeof(struct full_sockaddr_ax25);
+ 	} else {
+ 		sax->fsa_ax25.sax25_family = AF_NETROM;
+-		sax->fsa_ax25.sax25_ndigis = 0;
+ 		sax->fsa_ax25.sax25_call   = nr->source_addr;
+ 		*uaddr_len = sizeof(struct sockaddr_ax25);
+ 	}
+diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
+index 2078a27..3f1f205 100644
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -1595,8 +1595,9 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,
+ 
+ 		err = -EINVAL;
+ 		vnet_hdr_len = sizeof(vnet_hdr);
+-		if ((len -= vnet_hdr_len) < 0)
++		if (len < vnet_hdr_len)
+ 			goto out_free;
++		len -= vnet_hdr_len;
+ 
+ 		if (skb_is_gso(skb)) {
+ 			struct skb_shared_info *sinfo = skb_shinfo(skb);
+@@ -1704,7 +1705,7 @@ static int packet_getname_spkt(struct socket *sock, struct sockaddr *uaddr,
+ 	rcu_read_lock();
+ 	dev = dev_get_by_index_rcu(sock_net(sk), pkt_sk(sk)->ifindex);
+ 	if (dev)
+-		strlcpy(uaddr->sa_data, dev->name, 15);
++		strncpy(uaddr->sa_data, dev->name, 14);
+ 	else
+ 		memset(uaddr->sa_data, 0, 14);
+ 	rcu_read_unlock();
+@@ -1727,6 +1728,7 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr,
+ 	sll->sll_family = AF_PACKET;
+ 	sll->sll_ifindex = po->ifindex;
+ 	sll->sll_protocol = po->num;
++	sll->sll_pkttype = 0;
+ 	rcu_read_lock();
+ 	dev = dev_get_by_index_rcu(sock_net(sk), po->ifindex);
+ 	if (dev) {
+@@ -2093,7 +2095,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+ 	case PACKET_HDRLEN:
+ 		if (len > sizeof(int))
+ 			len = sizeof(int);
+-		if (copy_from_user(&val, optval, len))
++		if (len > sizeof(val) || copy_from_user(&val, optval, len))
+ 			return -EFAULT;
+ 		switch (val) {
+ 		case TPACKET_V1:
+@@ -2125,7 +2127,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+ 
+ 	if (put_user(len, optlen))
+ 		return -EFAULT;
+-	if (copy_to_user(optval, data, len))
++	if (len > sizeof(st) || copy_to_user(optval, data, len))
+ 		return -EFAULT;
+ 	return 0;
+ }
+@@ -2604,7 +2606,11 @@ static int packet_seq_show(struct seq_file *seq, void *v)
+ 
+ 		seq_printf(seq,
+ 			   "%p %-6d %-4d %04x   %-5d %1d %-6u %-6u %-6lu\n",
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++			   NULL,
++#else
+ 			   s,
++#endif
+ 			   atomic_read(&s->sk_refcnt),
+ 			   s->sk_type,
+ 			   ntohs(po->num),
+diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
+index 73aee7f..0290a0e 100644
+--- a/net/phonet/af_phonet.c
++++ b/net/phonet/af_phonet.c
+@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_proto_get(int protocol)
+ {
+ 	struct phonet_protocol *pp;
+ 
+-	if (protocol >= PHONET_NPROTO)
++	if (protocol < 0 || protocol >= PHONET_NPROTO)
+ 		return NULL;
+ 
+ 	rcu_read_lock();
+@@ -446,7 +446,7 @@ int __init_or_module phonet_proto_register(int protocol,
+ {
+ 	int err = 0;
+ 
+-	if (protocol >= PHONET_NPROTO)
++	if (protocol < 0 || protocol >= PHONET_NPROTO)
+ 		return -EINVAL;
+ 
+ 	err = proto_register(pp->prot, 1);
+diff --git a/net/sctp/auth.c b/net/sctp/auth.c
+index 8636639..ddbbf7c 100644
+--- a/net/sctp/auth.c
++++ b/net/sctp/auth.c
+@@ -543,16 +543,20 @@ struct sctp_hmac *sctp_auth_asoc_get_hmac(const struct sctp_association *asoc)
+ 		id = ntohs(hmacs->hmac_ids[i]);
+ 
+ 		/* Check the id is in the supported range */
+-		if (id > SCTP_AUTH_HMAC_ID_MAX)
++		if (id > SCTP_AUTH_HMAC_ID_MAX) {
++			id = 0;
+ 			continue;
++		}
+ 
+ 		/* See is we support the id.  Supported IDs have name and
+ 		 * length fields set, so that we can allocated and use
+ 		 * them.  We can safely just check for name, for without the
+ 		 * name, we can't allocate the TFM.
  		 */
--		res = drv_start(local);
-+                res = drv_start(local);
- 		if (res) {
- 			WARN(local->suspended, "Harware became unavailable "
- 			     "upon resume. This is could be a software issue"
-diff -urNp linux-2.6.32.13/net/sctp/socket.c linux-2.6.32.13/net/sctp/socket.c
---- linux-2.6.32.13/net/sctp/socket.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/sctp/socket.c	2010-05-15 13:21:18.788974801 -0400
-@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
+-		if (!sctp_hmac_list[id].hmac_name)
++		if (!sctp_hmac_list[id].hmac_name) {
++			id = 0;
+ 			continue;
++		}
+ 
+ 		break;
+ 	}
+diff --git a/net/sctp/socket.c b/net/sctp/socket.c
+index ca44917..0c26949 100644
+--- a/net/sctp/socket.c
++++ b/net/sctp/socket.c
+@@ -1483,7 +1483,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
  	struct sctp_sndrcvinfo *sinfo;
  	struct sctp_initmsg *sinit;
  	sctp_assoc_t associd = 0;
@@ -54333,48 +57055,37 @@ diff -urNp linux-2.6.32.13/net/sctp/socket.c linux-2.6.32.13/net/sctp/socket.c
  	int err;
  	sctp_scope_t scope;
  	long timeo;
-@@ -5802,7 +5802,6 @@ pp_found:
- 		 */
- 		int reuse = sk->sk_reuse;
- 		struct sock *sk2;
--		struct hlist_node *node;
- 
- 		SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
- 		if (pp->fastreuse && sk->sk_reuse &&
-diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c
---- linux-2.6.32.13/net/socket.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/socket.c	2010-05-15 13:21:18.788974801 -0400
-@@ -87,6 +87,7 @@
- #include <linux/wireless.h>
+@@ -4387,7 +4387,7 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
+ 		addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
+ 		if (space_left < addrlen)
+ 			return -ENOMEM;
+-		if (copy_to_user(to, &temp, addrlen))
++		if (addrlen > sizeof(temp) || copy_to_user(to, &temp, addrlen))
+ 			return -EFAULT;
+ 		to += addrlen;
+ 		cnt++;
+diff --git a/net/socket.c b/net/socket.c
+index 166ad32..b12782a 100644
+--- a/net/socket.c
++++ b/net/socket.c
+@@ -88,6 +88,7 @@
  #include <linux/nsproxy.h>
  #include <linux/magic.h>
+ #include <linux/slab.h>
 +#include <linux/in.h>
  
  #include <asm/uaccess.h>
  #include <asm/unistd.h>
-@@ -97,6 +98,21 @@
- #include <net/sock.h>
- #include <linux/netfilter.h>
+@@ -105,6 +106,8 @@
+ #include <linux/sockios.h>
+ #include <linux/atalk.h>
  
-+extern void gr_attach_curr_ip(const struct sock *sk);
-+extern int gr_handle_sock_all(const int family, const int type,
-+			      const int protocol);
-+extern int gr_handle_sock_server(const struct sockaddr *sck);
-+extern int gr_handle_sock_server_other(const struct socket *sck);
-+extern int gr_handle_sock_client(const struct sockaddr *sck);
-+extern int gr_search_connect(struct socket * sock,
-+			     struct sockaddr_in * addr);
-+extern int gr_search_bind(struct socket * sock,
-+			  struct sockaddr_in * addr);
-+extern int gr_search_listen(struct socket * sock);
-+extern int gr_search_accept(struct socket * sock);
-+extern int gr_search_socket(const int domain, const int type,
-+			    const int protocol);
++#include <linux/grsock.h>
 +
  static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
  static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
  			 unsigned long nr_segs, loff_t pos);
-@@ -298,7 +314,7 @@ static int sockfs_get_sb(struct file_sys
+@@ -322,7 +325,7 @@ static int sockfs_get_sb(struct file_system_type *fs_type,
  			     mnt);
  }
  
@@ -54383,7 +57094,16 @@ diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c
  
  static struct file_system_type sock_fs_type = {
  	.name =		"sockfs",
-@@ -1283,6 +1299,16 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1162,6 +1165,8 @@ static int __sock_create(struct net *net, int family, int type, int protocol,
+ 		return -EAFNOSUPPORT;
+ 	if (type < 0 || type >= SOCK_MAX)
+ 		return -EINVAL;
++	if (protocol < 0)
++		return -EINVAL;
+ 
+ 	/* Compatibility.
+ 
+@@ -1291,6 +1296,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)
  	if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
  		flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
  
@@ -54400,7 +57120,7 @@ diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c
  	retval = sock_create(family, type, protocol, &sock);
  	if (retval < 0)
  		goto out;
-@@ -1415,6 +1441,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
+@@ -1403,6 +1418,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
  	if (sock) {
  		err = move_addr_to_kernel(umyaddr, addrlen, (struct sockaddr *)&address);
  		if (err >= 0) {
@@ -54415,7 +57135,7 @@ diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c
  			err = security_socket_bind(sock,
  						   (struct sockaddr *)&address,
  						   addrlen);
-@@ -1423,6 +1457,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
+@@ -1411,6 +1434,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
  						      (struct sockaddr *)
  						      &address, addrlen);
  		}
@@ -54423,11 +57143,11 @@ diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c
  		fput_light(sock->file, fput_needed);
  	}
  	return err;
-@@ -1446,10 +1481,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba
+@@ -1434,10 +1458,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
  		if ((unsigned)backlog > somaxconn)
  			backlog = somaxconn;
  
-+		if (gr_handle_sock_server_other(sock)) {
++		if (gr_handle_sock_server_other(sock->sk)) {
 +			err = -EPERM;
 +			goto error;
 +		}
@@ -54444,11 +57164,11 @@ diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c
  		fput_light(sock->file, fput_needed);
  	}
  	return err;
-@@ -1492,6 +1537,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
+@@ -1480,6 +1514,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
  	newsock->type = sock->type;
  	newsock->ops = sock->ops;
  
-+	if (gr_handle_sock_server_other(sock)) {
++	if (gr_handle_sock_server_other(sock->sk)) {
 +		err = -EPERM;
 +		sock_release(newsock);
 +		goto out_put;
@@ -54463,7 +57183,7 @@ diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c
  	/*
  	 * We don't need try_module_get here, as the listening socket (sock)
  	 * has the protocol module (sock->ops->owner) held.
-@@ -1534,6 +1591,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
+@@ -1518,6 +1564,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
  	fd_install(newfd, newfile);
  	err = newfd;
  
@@ -54472,7 +57192,7 @@ diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c
  out_put:
  	fput_light(sock->file, fput_needed);
  out:
-@@ -1571,6 +1630,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct
+@@ -1550,6 +1598,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
  		int, addrlen)
  {
  	struct socket *sock;
@@ -54480,7 +57200,7 @@ diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c
  	struct sockaddr_storage address;
  	int err, fput_needed;
  
-@@ -1581,6 +1641,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct
+@@ -1560,6 +1609,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
  	if (err < 0)
  		goto out_put;
  
@@ -54498,22 +57218,40 @@ diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c
  	err =
  	    security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
  	if (err)
-diff -urNp linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c	2010-05-15 13:21:18.790642809 -0400
-@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
+diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
+index 4a843b8..b476997 100644
+--- a/net/sunrpc/sched.c
++++ b/net/sunrpc/sched.c
+@@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *word)
+ #ifdef RPC_DEBUG
+ static void rpc_task_set_debuginfo(struct rpc_task *task)
+ {
+-	static atomic_t rpc_pid;
++	static atomic_unchecked_t rpc_pid;
+ 
+-	task->tk_pid = atomic_inc_return(&rpc_pid);
++	task->tk_pid = atomic_inc_return_unchecked(&rpc_pid);
+ }
+ #else
+ static inline void rpc_task_set_debuginfo(struct rpc_task *task)
+diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
+index d718b8f..791f9b1 100644
+--- a/net/sunrpc/xprtrdma/svc_rdma.c
++++ b/net/sunrpc/xprtrdma/svc_rdma.c
+@@ -106,7 +106,7 @@ static int read_reset_stat(ctl_table *table, int write,
  		len -= *ppos;
  		if (len > *lenp)
  			len = *lenp;
 -		if (len && copy_to_user(buffer, str_buf, len))
-+		if (len > sizeof str_buf || (len && copy_to_user(buffer, str_buf, len)))
++		if (len > sizeof(str_buf) || (len && copy_to_user(buffer, str_buf, len)))
  			return -EFAULT;
  		*lenp = len;
  		*ppos += len;
-diff -urNp linux-2.6.32.13/net/sysctl_net.c linux-2.6.32.13/net/sysctl_net.c
---- linux-2.6.32.13/net/sysctl_net.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/sysctl_net.c	2010-05-15 13:21:18.790642809 -0400
-@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
+diff --git a/net/sysctl_net.c b/net/sysctl_net.c
+index ca84212..3aa338f 100644
+--- a/net/sysctl_net.c
++++ b/net/sysctl_net.c
+@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ctl_table_root *root,
  			       struct ctl_table *table)
  {
  	/* Allow network administrator to have same access as root. */
@@ -54522,10 +57260,19 @@ diff -urNp linux-2.6.32.13/net/sysctl_net.c linux-2.6.32.13/net/sysctl_net.c
  		int mode = (table->mode >> 6) & 7;
  		return (mode << 6) | (mode << 3) | mode;
  	}
-diff -urNp linux-2.6.32.13/net/tipc/socket.c linux-2.6.32.13/net/tipc/socket.c
---- linux-2.6.32.13/net/tipc/socket.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/tipc/socket.c	2010-05-15 13:21:18.790642809 -0400
-@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, 
+diff --git a/net/tipc/socket.c b/net/tipc/socket.c
+index 66e889b..ce91238 100644
+--- a/net/tipc/socket.c
++++ b/net/tipc/socket.c
+@@ -395,6 +395,7 @@ static int get_name(struct socket *sock, struct sockaddr *uaddr,
+ 	struct sockaddr_tipc *addr = (struct sockaddr_tipc *)uaddr;
+ 	struct tipc_sock *tsock = tipc_sk(sock->sk);
+ 
++	memset(addr, 0, sizeof(*addr));
+ 	if (peer) {
+ 		if ((sock->state != SS_CONNECTED) &&
+ 			((peer != 2) || (sock->state != SS_DISCONNECTING)))
+@@ -1451,8 +1452,9 @@ static int connect(struct socket *sock, struct sockaddr *dest, int destlen,
  	} else {
  		if (res == 0)
  			res = -ETIMEDOUT;
@@ -54537,10 +57284,11 @@ diff -urNp linux-2.6.32.13/net/tipc/socket.c linux-2.6.32.13/net/tipc/socket.c
  		sock->state = SS_DISCONNECTING;
  	}
  
-diff -urNp linux-2.6.32.13/net/unix/af_unix.c linux-2.6.32.13/net/unix/af_unix.c
---- linux-2.6.32.13/net/unix/af_unix.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/unix/af_unix.c	2010-05-15 13:21:18.790642809 -0400
-@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru
+diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
+index 617bea4..dae3c79 100644
+--- a/net/unix/af_unix.c
++++ b/net/unix/af_unix.c
+@@ -745,6 +745,12 @@ static struct sock *unix_find_other(struct net *net,
  		err = -ECONNREFUSED;
  		if (!S_ISSOCK(inode->i_mode))
  			goto put_fail;
@@ -54553,7 +57301,7 @@ diff -urNp linux-2.6.32.13/net/unix/af_unix.c linux-2.6.32.13/net/unix/af_unix.c
  		u = unix_find_socket_byinode(net, inode);
  		if (!u)
  			goto put_fail;
-@@ -754,6 +760,13 @@ static struct sock *unix_find_other(stru
+@@ -765,6 +771,13 @@ static struct sock *unix_find_other(struct net *net,
  		if (u) {
  			struct dentry *dentry;
  			dentry = unix_sk(u)->dentry;
@@ -54567,7 +57315,7 @@ diff -urNp linux-2.6.32.13/net/unix/af_unix.c linux-2.6.32.13/net/unix/af_unix.c
  			if (dentry)
  				touch_atime(unix_sk(u)->mnt, dentry);
  		} else
-@@ -839,11 +852,18 @@ static int unix_bind(struct socket *sock
+@@ -850,11 +863,18 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
  		err = security_path_mknod(&nd.path, dentry, mode, 0);
  		if (err)
  			goto out_mknod_drop_write;
@@ -54586,7 +57334,7 @@ diff -urNp linux-2.6.32.13/net/unix/af_unix.c linux-2.6.32.13/net/unix/af_unix.c
  		mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
  		dput(nd.path.dentry);
  		nd.path.dentry = dentry;
-@@ -861,6 +881,10 @@ out_mknod_drop_write:
+@@ -872,6 +892,10 @@ out_mknod_drop_write:
  			goto out_unlock;
  		}
  
@@ -54597,10 +57345,73 @@ diff -urNp linux-2.6.32.13/net/unix/af_unix.c linux-2.6.32.13/net/unix/af_unix.c
  		list = &unix_socket_table[addr->hash];
  	} else {
  		list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
-diff -urNp linux-2.6.32.13/net/xfrm/xfrm_policy.c linux-2.6.32.13/net/xfrm/xfrm_policy.c
---- linux-2.6.32.13/net/xfrm/xfrm_policy.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/net/xfrm/xfrm_policy.c	2010-05-15 13:21:18.790642809 -0400
-@@ -1477,7 +1477,7 @@ free_dst:
+@@ -2170,7 +2194,11 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+ 		unix_state_lock(s);
+ 
+ 		seq_printf(seq, "%p: %08X %08X %08X %04X %02X %5lu",
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++			NULL,
++#else
+ 			s,
++#endif
+ 			atomic_read(&s->sk_refcnt),
+ 			0,
+ 			s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
+diff --git a/net/wireless/reg.c b/net/wireless/reg.c
+index 55b1101..c1868df 100644
+--- a/net/wireless/reg.c
++++ b/net/wireless/reg.c
+@@ -50,7 +50,7 @@
+ 		printk(KERN_DEBUG format , ## args); \
+ 	} while (0)
+ #else
+-#define REG_DBG_PRINT(args...)
++#define REG_DBG_PRINT(args...) do {} while (0)
+ #endif
+ 
+ /* Receipt of information from last regulatory request */
+diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
+index 8f5116f..7f7c76b 100644
+--- a/net/wireless/wext-core.c
++++ b/net/wireless/wext-core.c
+@@ -744,8 +744,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
+ 		 */
+ 
+ 		/* Support for very large requests */
+-		if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
+-		    (user_length > descr->max_tokens)) {
++		if (user_length > descr->max_tokens) {
+ 			/* Allow userspace to GET more than max so
+ 			 * we can support any size GET requests.
+ 			 * There is still a limit : -ENOMEM.
+@@ -782,22 +781,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
+ 		}
+ 	}
+ 
+-	if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
+-		/*
+-		 * If this is a GET, but not NOMAX, it means that the extra
+-		 * data is not bounded by userspace, but by max_tokens. Thus
+-		 * set the length to max_tokens. This matches the extra data
+-		 * allocation.
+-		 * The driver should fill it with the number of tokens it
+-		 * provided, and it may check iwp->length rather than having
+-		 * knowledge of max_tokens. If the driver doesn't change the
+-		 * iwp->length, this ioctl just copies back max_token tokens
+-		 * filled with zeroes. Hopefully the driver isn't claiming
+-		 * them to be valid data.
+-		 */
+-		iwp->length = descr->max_tokens;
+-	}
+-
+ 	err = handler(dev, info, (union iwreq_data *) iwp, extra);
+ 
+ 	iwp->length += essid_compat;
+diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
+index a7ec5a8..48e43e9 100644
+--- a/net/xfrm/xfrm_policy.c
++++ b/net/xfrm/xfrm_policy.c
+@@ -1502,7 +1502,7 @@ free_dst:
  	goto out;
  }
  
@@ -54609,7 +57420,7 @@ diff -urNp linux-2.6.32.13/net/xfrm/xfrm_policy.c linux-2.6.32.13/net/xfrm/xfrm_
  xfrm_dst_alloc_copy(void **target, void *src, int size)
  {
  	if (!*target) {
-@@ -1489,7 +1489,7 @@ xfrm_dst_alloc_copy(void **target, void 
+@@ -1514,7 +1514,7 @@ xfrm_dst_alloc_copy(void **target, void *src, int size)
  	return 0;
  }
  
@@ -54618,7 +57429,7 @@ diff -urNp linux-2.6.32.13/net/xfrm/xfrm_policy.c linux-2.6.32.13/net/xfrm/xfrm_
  xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1501,7 +1501,7 @@ xfrm_dst_update_parent(struct dst_entry 
+@@ -1526,7 +1526,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel)
  #endif
  }
  
@@ -54627,22 +57438,11 @@ diff -urNp linux-2.6.32.13/net/xfrm/xfrm_policy.c linux-2.6.32.13/net/xfrm/xfrm_
  xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-diff -urNp linux-2.6.32.13/samples/kobject/kset-example.c linux-2.6.32.13/samples/kobject/kset-example.c
---- linux-2.6.32.13/samples/kobject/kset-example.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/samples/kobject/kset-example.c	2010-05-15 13:21:18.790642809 -0400
-@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
- }
- 
- /* Our custom sysfs_ops that we will associate with our ktype later on */
--static struct sysfs_ops foo_sysfs_ops = {
-+static const struct sysfs_ops foo_sysfs_ops = {
- 	.show = foo_attr_show,
- 	.store = foo_attr_store,
- };
-diff -urNp linux-2.6.32.13/scripts/basic/fixdep.c linux-2.6.32.13/scripts/basic/fixdep.c
---- linux-2.6.32.13/scripts/basic/fixdep.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/scripts/basic/fixdep.c	2010-05-15 13:21:18.790642809 -0400
-@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
+diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
+index ea26b23..8c97bd9 100644
+--- a/scripts/basic/fixdep.c
++++ b/scripts/basic/fixdep.c
+@@ -222,9 +222,9 @@ static void use_config(char *m, int slen)
  
  static void parse_config_file(char *map, size_t len)
  {
@@ -54663,9 +57463,10 @@ diff -urNp linux-2.6.32.13/scripts/basic/fixdep.c linux-2.6.32.13/scripts/basic/
  
  	if (*p != INT_CONF) {
  		fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-2.6.32.13/scripts/kallsyms.c linux-2.6.32.13/scripts/kallsyms.c
---- linux-2.6.32.13/scripts/kallsyms.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/scripts/kallsyms.c	2010-05-15 13:21:18.790642809 -0400
+diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
+index e3902fb..3bba480 100644
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
 @@ -43,10 +43,10 @@ struct text_range {
  
  static unsigned long long _text;
@@ -54681,10 +57482,11 @@ diff -urNp linux-2.6.32.13/scripts/kallsyms.c linux-2.6.32.13/scripts/kallsyms.c
  };
  #define text_range_text     (&text_ranges[0])
  #define text_range_inittext (&text_ranges[1])
-diff -urNp linux-2.6.32.13/scripts/mod/file2alias.c linux-2.6.32.13/scripts/mod/file2alias.c
---- linux-2.6.32.13/scripts/mod/file2alias.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/scripts/mod/file2alias.c	2010-05-15 13:21:18.790642809 -0400
-@@ -72,7 +72,7 @@ static void device_id_check(const char *
+diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
+index 5758aab..f6521ca 100644
+--- a/scripts/mod/file2alias.c
++++ b/scripts/mod/file2alias.c
+@@ -72,7 +72,7 @@ static void device_id_check(const char *modname, const char *device_id,
  			    unsigned long size, unsigned long id_size,
  			    void *symval)
  {
@@ -54693,16 +57495,16 @@ diff -urNp linux-2.6.32.13/scripts/mod/file2alias.c linux-2.6.32.13/scripts/mod/
  
  	if (size % id_size || size < id_size) {
  		if (cross_build != 0)
-@@ -102,7 +102,7 @@ static void device_id_check(const char *
+@@ -102,7 +102,7 @@ static void device_id_check(const char *modname, const char *device_id,
  /* USB is special because the bcdDevice can be matched against a numeric range */
  /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipN" */
  static void do_usb_entry(struct usb_device_id *id,
 -			 unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
 +			 unsigned int bcdDevice_initial, unsigned int bcdDevice_initial_digits,
  			 unsigned char range_lo, unsigned char range_hi,
- 			 struct module *mod)
+ 			 unsigned char max, struct module *mod)
  {
-@@ -368,7 +368,7 @@ static void do_pnp_device_entry(void *sy
+@@ -437,7 +437,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
  	for (i = 0; i < count; i++) {
  		const char *id = (char *)devs[i].id;
  		char acpi_id[sizeof(devs[0].id)];
@@ -54711,7 +57513,7 @@ diff -urNp linux-2.6.32.13/scripts/mod/file2alias.c linux-2.6.32.13/scripts/mod/
  
  		buf_printf(&mod->dev_table_buf,
  			   "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
-@@ -398,7 +398,7 @@ static void do_pnp_card_entries(void *sy
+@@ -467,7 +467,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
  
  		for (j = 0; j < PNP_MAX_DEVICES; j++) {
  			const char *id = (char *)card->devs[j].id;
@@ -54720,7 +57522,7 @@ diff -urNp linux-2.6.32.13/scripts/mod/file2alias.c linux-2.6.32.13/scripts/mod/
  			int dup = 0;
  
  			if (!id[0])
-@@ -424,7 +424,7 @@ static void do_pnp_card_entries(void *sy
+@@ -493,7 +493,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
  			/* add an individual alias for every device entry */
  			if (!dup) {
  				char acpi_id[sizeof(card->devs[0].id)];
@@ -54729,7 +57531,7 @@ diff -urNp linux-2.6.32.13/scripts/mod/file2alias.c linux-2.6.32.13/scripts/mod/
  
  				buf_printf(&mod->dev_table_buf,
  					   "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
-@@ -699,7 +699,7 @@ static void dmi_ascii_filter(char *d, co
+@@ -768,7 +768,7 @@ static void dmi_ascii_filter(char *d, const char *s)
  static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
  			char *alias)
  {
@@ -54738,21 +57540,22 @@ diff -urNp linux-2.6.32.13/scripts/mod/file2alias.c linux-2.6.32.13/scripts/mod/
  
  	sprintf(alias, "dmi*");
  
-diff -urNp linux-2.6.32.13/scripts/mod/modpost.c linux-2.6.32.13/scripts/mod/modpost.c
---- linux-2.6.32.13/scripts/mod/modpost.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/scripts/mod/modpost.c	2010-05-15 13:21:18.814648703 -0400
-@@ -835,6 +835,7 @@ enum mismatch {
- 	INIT_TO_EXIT,
- 	EXIT_TO_INIT,
+diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
+index f6127b9..a5c50cb 100644
+--- a/scripts/mod/modpost.c
++++ b/scripts/mod/modpost.c
+@@ -846,6 +846,7 @@ enum mismatch {
+ 	ANY_INIT_TO_ANY_EXIT,
+ 	ANY_EXIT_TO_ANY_INIT,
  	EXPORT_TO_INIT_EXIT,
 +	DATA_TO_TEXT
  };
  
  struct sectioncheck {
-@@ -920,6 +921,12 @@ const struct sectioncheck sectioncheck[]
- 	.fromsec = { "__ksymtab*", NULL },
+@@ -954,6 +955,12 @@ const struct sectioncheck sectioncheck[] = {
  	.tosec   = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
- 	.mismatch = EXPORT_TO_INIT_EXIT
+ 	.mismatch = EXPORT_TO_INIT_EXIT,
+ 	.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 +},
 +/* Do not reference code from writable data */
 +{
@@ -54762,7 +57565,7 @@ diff -urNp linux-2.6.32.13/scripts/mod/modpost.c linux-2.6.32.13/scripts/mod/mod
  }
  };
  
-@@ -1024,10 +1031,10 @@ static Elf_Sym *find_elf_symbol(struct e
+@@ -1060,10 +1067,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
  			continue;
  		if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
  			continue;
@@ -54775,10 +57578,10 @@ diff -urNp linux-2.6.32.13/scripts/mod/modpost.c linux-2.6.32.13/scripts/mod/mod
  		if (d < 0)
  			d = addr - sym->st_value;
  		if (d < distance) {
-@@ -1268,6 +1275,14 @@ static void report_sec_mismatch(const ch
- 		"Fix this by removing the %sannotation of %s "
+@@ -1306,6 +1313,14 @@ static void report_sec_mismatch(const char *modname,
  		"or drop the export.\n",
  		tosym, sec2annotation(tosec), sec2annotation(tosec), tosym);
+ 		break;
 +	case DATA_TO_TEXT:
 +/*
 +		fprintf(stderr,
@@ -54787,10 +57590,10 @@ diff -urNp linux-2.6.32.13/scripts/mod/modpost.c linux-2.6.32.13/scripts/mod/mod
 +		fromsym, to, sec2annotation(tosec), tosym, to_p);
 +*/
 +		break;
- 	case NO_MISMATCH:
- 		/* To get warnings on missing members */
- 		break;
-@@ -1651,7 +1666,7 @@ void __attribute__((format(printf, 2, 3)
+ 	}
+ 	fprintf(stderr, "\n");
+ }
+@@ -1629,7 +1644,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
  	va_end(ap);
  }
  
@@ -54799,7 +57602,7 @@ diff -urNp linux-2.6.32.13/scripts/mod/modpost.c linux-2.6.32.13/scripts/mod/mod
  {
  	if (buf->size - buf->pos < len) {
  		buf->size += len + SZ;
-@@ -1863,7 +1878,7 @@ static void write_if_changed(struct buff
+@@ -1841,7 +1856,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
  	if (fstat(fileno(file), &st) < 0)
  		goto close_write;
  
@@ -54808,10 +57611,11 @@ diff -urNp linux-2.6.32.13/scripts/mod/modpost.c linux-2.6.32.13/scripts/mod/mod
  		goto close_write;
  
  	tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.32.13/scripts/mod/modpost.h linux-2.6.32.13/scripts/mod/modpost.h
---- linux-2.6.32.13/scripts/mod/modpost.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/scripts/mod/modpost.h	2010-05-15 13:21:18.814648703 -0400
-@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
+diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
+index be987a4..ba062e81 100644
+--- a/scripts/mod/modpost.h
++++ b/scripts/mod/modpost.h
+@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr);
  
  struct buffer {
  	char *p;
@@ -54830,10 +57634,11 @@ diff -urNp linux-2.6.32.13/scripts/mod/modpost.h linux-2.6.32.13/scripts/mod/mod
  
  struct module {
  	struct module *next;
-diff -urNp linux-2.6.32.13/scripts/mod/sumversion.c linux-2.6.32.13/scripts/mod/sumversion.c
---- linux-2.6.32.13/scripts/mod/sumversion.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/scripts/mod/sumversion.c	2010-05-15 13:21:18.814648703 -0400
-@@ -455,7 +455,7 @@ static void write_version(const char *fi
+diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
+index ecf9c7d..d52b38e 100644
+--- a/scripts/mod/sumversion.c
++++ b/scripts/mod/sumversion.c
+@@ -455,7 +455,7 @@ static void write_version(const char *filename, const char *sum,
  		goto out;
  	}
  
@@ -54842,9 +57647,10 @@ diff -urNp linux-2.6.32.13/scripts/mod/sumversion.c linux-2.6.32.13/scripts/mod/
  		warn("writing sum in %s failed: %s\n",
  			filename, strerror(errno));
  		goto out;
-diff -urNp linux-2.6.32.13/scripts/pnmtologo.c linux-2.6.32.13/scripts/pnmtologo.c
---- linux-2.6.32.13/scripts/pnmtologo.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/scripts/pnmtologo.c	2010-05-15 13:21:18.814648703 -0400
+diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
+index 5c11312..72742b5 100644
+--- a/scripts/pnmtologo.c
++++ b/scripts/pnmtologo.c
 @@ -237,14 +237,14 @@ static void write_header(void)
      fprintf(out, " *  Linux logo %s\n", logoname);
      fputs(" */\n\n", out);
@@ -54871,91 +57677,11 @@ diff -urNp linux-2.6.32.13/scripts/pnmtologo.c linux-2.6.32.13/scripts/pnmtologo
  	    logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.32.13/security/commoncap.c linux-2.6.32.13/security/commoncap.c
---- linux-2.6.32.13/security/commoncap.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/security/commoncap.c	2010-05-15 13:21:18.814648703 -0400
-@@ -27,7 +27,7 @@
- #include <linux/sched.h>
- #include <linux/prctl.h>
- #include <linux/securebits.h>
--
-+#include <net/sock.h>
- /*
-  * If a non-root user executes a setuid-root binary in
-  * !secure(SECURE_NOROOT) mode, then we raise capabilities.
-@@ -50,9 +50,11 @@ static void warn_setuid_and_fcaps_mixed(
- 	}
- }
- 
-+extern kernel_cap_t gr_cap_rtnetlink(struct sock *sk);
-+
- int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
- {
--	NETLINK_CB(skb).eff_cap = current_cap();
-+	NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
- 	return 0;
- }
- 
-diff -urNp linux-2.6.32.13/security/integrity/ima/ima_api.c linux-2.6.32.13/security/integrity/ima/ima_api.c
---- linux-2.6.32.13/security/integrity/ima/ima_api.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/security/integrity/ima/ima_api.c	2010-05-15 13:21:18.814648703 -0400
-@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
- 	int result;
- 
- 	/* can overflow, only indicator */
--	atomic_long_inc(&ima_htable.violations);
-+	atomic_long_inc_unchecked(&ima_htable.violations);
- 
- 	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
- 	if (!entry) {
-diff -urNp linux-2.6.32.13/security/integrity/ima/ima_fs.c linux-2.6.32.13/security/integrity/ima/ima_fs.c
---- linux-2.6.32.13/security/integrity/ima/ima_fs.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/security/integrity/ima/ima_fs.c	2010-05-15 13:21:18.814648703 -0400
-@@ -27,12 +27,12 @@
- static int valid_policy = 1;
- #define TMPBUFLEN 12
- static ssize_t ima_show_htable_value(char __user *buf, size_t count,
--				     loff_t *ppos, atomic_long_t *val)
-+				     loff_t *ppos, atomic_long_unchecked_t *val)
- {
- 	char tmpbuf[TMPBUFLEN];
- 	ssize_t len;
- 
--	len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
-+	len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
- 	return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
- }
- 
-diff -urNp linux-2.6.32.13/security/integrity/ima/ima.h linux-2.6.32.13/security/integrity/ima/ima.h
---- linux-2.6.32.13/security/integrity/ima/ima.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/security/integrity/ima/ima.h	2010-05-15 13:21:18.814648703 -0400
-@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
- extern spinlock_t ima_queue_lock;
- 
- struct ima_h_table {
--	atomic_long_t len;	/* number of stored measurements in the list */
--	atomic_long_t violations;
-+	atomic_long_unchecked_t len;	/* number of stored measurements in the list */
-+	atomic_long_unchecked_t violations;
- 	struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
- };
- extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.32.13/security/integrity/ima/ima_queue.c linux-2.6.32.13/security/integrity/ima/ima_queue.c
---- linux-2.6.32.13/security/integrity/ima/ima_queue.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/security/integrity/ima/ima_queue.c	2010-05-15 13:21:18.814648703 -0400
-@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
- 	INIT_LIST_HEAD(&qe->later);
- 	list_add_tail_rcu(&qe->later, &ima_measurements);
- 
--	atomic_long_inc(&ima_htable.len);
-+	atomic_long_inc_unchecked(&ima_htable.len);
- 	key = ima_hash_key(entry->digest);
- 	hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
- 	return 0;
-diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig
---- linux-2.6.32.13/security/Kconfig	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/security/Kconfig	2010-05-15 13:37:07.058702111 -0400
-@@ -4,6 +4,499 @@
+diff --git a/security/Kconfig b/security/Kconfig
+index 226b955..b0b0cb2 100644
+--- a/security/Kconfig
++++ b/security/Kconfig
+@@ -4,6 +4,505 @@
  
  menu "Security options"
  
@@ -54972,9 +57698,13 @@ diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig
 +	default 47 if !PAX_PER_CPU_PGD
 +	default 42 if PAX_PER_CPU_PGD
 +
++	config PAX_ENABLE_PAE
++	bool
++	default y if (X86_32 && (MPENTIUM4 || MK8 || MPSC || MCORE2 || MATOM))
++	
 +config PAX
 +	bool "Enable various PaX features"
-+	depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS32 || MIPS64 || PARISC || PPC || SPARC || X86)
++	depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS || PARISC || PPC || SPARC || X86)
 +	help
 +	  This allows you to enable various PaX features.  PaX adds
 +	  intrusion prevention mechanisms to the kernel that reduce
@@ -55091,7 +57821,7 @@ diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig
 +
 +config PAX_PAGEEXEC
 +	bool "Paging based non-executable pages"
-+	depends on PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7)
++	depends on PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MATOM || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7)
 +	select S390_SWITCH_AMODE if S390
 +	select S390_EXEC_PROTECT if S390
 +	help
@@ -55184,7 +57914,8 @@ diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig
 +	   - changing the executable status of memory pages that were
 +	     not originally created as executable,
 +	   - making read-only executable pages writable again,
-+	   - creating executable pages from anonymous memory.
++	   - creating executable pages from anonymous memory,
++	   - making read-only-after-relocations (RELRO) data pages writable again.
 +
 +	  You should say Y here to complete the protection provided by
 +	  the enforcement of non-executable pages.
@@ -55192,9 +57923,10 @@ diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig
 +	  NOTE: you can use the 'chpax' or 'paxctl' utilities to control
 +	  this feature on a per file basis.
 +
-+config PAX_NOELFRELOCS
-+	bool "Disallow ELF text relocations"
-+	depends on PAX_MPROTECT && !PAX_ETEXECRELOCS && (IA64 || PPC || X86)
++config PAX_ELFRELOCS
++	bool "Allow ELF text relocations (read help)"
++	depends on PAX_MPROTECT
++	default n
 +	help
 +	  Non-executable pages and mprotect() restrictions are effective
 +	  in preventing the introduction of new executable code into an
@@ -55208,18 +57940,13 @@ diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig
 +	  the former approach is beyond PaX, the latter can be prevented
 +	  by having only PIC ELF libraries on one's system (which do not
 +	  need to relocate their code).  If you are sure this is your case,
-+	  then enable this option otherwise be careful as you may not even
-+	  be able to boot or log on your system (for example, some PAM
-+	  modules are erroneously compiled as non-PIC by default).
-+
-+	  NOTE: if you are using dynamic ELF executables (as suggested
-+	  when using ASLR) then you must have made sure that you linked
-+	  your files using the PIC version of crt1 (the et_dyn.tar.gz package
-+	  referenced there has already been updated to support this).
++	  as is the case with all modern Linux distributions, then leave
++	  this option disabled.  You should say 'n' here.
 +
 +config PAX_ETEXECRELOCS
 +	bool "Allow ELF ET_EXEC text relocations"
 +	depends on PAX_MPROTECT && (ALPHA || IA64 || PARISC)
++	select PAX_ELFRELOCS
 +	default y
 +	help
 +	  On some architectures there are incorrectly created applications
@@ -55446,8 +58173,13 @@ diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig
 +	  Note that the current implementation provides the strictest checks
 +	  for the SLUB allocator.
 +
++	  If frame pointers are enabled on x86, this option will also
++	  restrict copies into and out of the kernel stack to local variables
++	  within a single frame.
++
 +	  Since this has a negligible performance impact, you should enable
 +	  this feature.
++
 +endmenu
 +
 +endmenu
@@ -55455,7 +58187,7 @@ diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig
  config KEYS
  	bool "Enable access key retention support"
  	help
-@@ -146,7 +639,7 @@ config INTEL_TXT
+@@ -124,7 +623,7 @@ config INTEL_TXT
  config LSM_MMAP_MIN_ADDR
  	int "Low address space for LSM to protect from user allocation"
  	depends on SECURITY && SECURITY_SELINUX
@@ -55464,10 +58196,96 @@ diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig
  	help
  	  This is the portion of low virtual memory which should be protected
  	  from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-2.6.32.13/security/min_addr.c linux-2.6.32.13/security/min_addr.c
---- linux-2.6.32.13/security/min_addr.c	2010-04-04 20:41:50.084493253 -0400
-+++ linux-2.6.32.13/security/min_addr.c	2010-05-15 13:21:18.814648703 -0400
-@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
+diff --git a/security/commoncap.c b/security/commoncap.c
+index 4e01599..aff73de 100644
+--- a/security/commoncap.c
++++ b/security/commoncap.c
+@@ -28,6 +28,7 @@
+ #include <linux/prctl.h>
+ #include <linux/securebits.h>
+ #include <linux/syslog.h>
++#include <net/sock.h>
+ 
+ /*
+  * If a non-root user executes a setuid-root binary in
+@@ -51,9 +52,11 @@ static void warn_setuid_and_fcaps_mixed(char *fname)
+ 	}
+ }
+ 
++extern kernel_cap_t gr_cap_rtnetlink(struct sock *sk);
++
+ int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
+ {
+-	NETLINK_CB(skb).eff_cap = current_cap();
++	NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
+ 	return 0;
+ }
+ 
+diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
+index 3fbcd1d..85ad481 100644
+--- a/security/integrity/ima/ima.h
++++ b/security/integrity/ima/ima.h
+@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
+ extern spinlock_t ima_queue_lock;
+ 
+ struct ima_h_table {
+-	atomic_long_t len;	/* number of stored measurements in the list */
+-	atomic_long_t violations;
++	atomic_long_unchecked_t len;	/* number of stored measurements in the list */
++	atomic_long_unchecked_t violations;
+ 	struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
+ };
+ extern struct ima_h_table ima_htable;
+diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
+index 52015d0..ce79dde 100644
+--- a/security/integrity/ima/ima_api.c
++++ b/security/integrity/ima/ima_api.c
+@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
+ 	int result;
+ 
+ 	/* can overflow, only indicator */
+-	atomic_long_inc(&ima_htable.violations);
++	atomic_long_inc_unchecked(&ima_htable.violations);
+ 
+ 	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+ 	if (!entry) {
+diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
+index 8fe736a..e7f8bd0 100644
+--- a/security/integrity/ima/ima_fs.c
++++ b/security/integrity/ima/ima_fs.c
+@@ -28,12 +28,12 @@
+ static int valid_policy = 1;
+ #define TMPBUFLEN 12
+ static ssize_t ima_show_htable_value(char __user *buf, size_t count,
+-				     loff_t *ppos, atomic_long_t *val)
++				     loff_t *ppos, atomic_long_unchecked_t *val)
+ {
+ 	char tmpbuf[TMPBUFLEN];
+ 	ssize_t len;
+ 
+-	len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
++	len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
+ 	return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
+ }
+ 
+diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
+index 8e28f04..d5951b1 100644
+--- a/security/integrity/ima/ima_queue.c
++++ b/security/integrity/ima/ima_queue.c
+@@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
+ 	INIT_LIST_HEAD(&qe->later);
+ 	list_add_tail_rcu(&qe->later, &ima_measurements);
+ 
+-	atomic_long_inc(&ima_htable.len);
++	atomic_long_inc_unchecked(&ima_htable.len);
+ 	key = ima_hash_key(entry->digest);
+ 	hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
+ 	return 0;
+diff --git a/security/min_addr.c b/security/min_addr.c
+index f728728..6457a0c 100644
+--- a/security/min_addr.c
++++ b/security/min_addr.c
+@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
   */
  static void update_mmap_min_addr(void)
  {
@@ -55483,10 +58301,83 @@ diff -urNp linux-2.6.32.13/security/min_addr.c linux-2.6.32.13/security/min_addr
  }
  
  /*
-diff -urNp linux-2.6.32.13/sound/aoa/codecs/onyx.c linux-2.6.32.13/sound/aoa/codecs/onyx.c
---- linux-2.6.32.13/sound/aoa/codecs/onyx.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/sound/aoa/codecs/onyx.c	2010-05-15 13:21:18.814648703 -0400
-@@ -53,7 +53,7 @@ struct onyx {
+diff --git a/security/security.c b/security/security.c
+index 351942a..4b6be6e 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
+ /* things that live in capability.c */
+ extern void __init security_fixup_ops(struct security_operations *ops);
+ 
+-static struct security_operations *security_ops;
+-static struct security_operations default_security_ops = {
++static struct security_operations *security_ops __read_only;
++static struct security_operations default_security_ops __read_only = {
+ 	.name	= "default",
+ };
+ 
+@@ -67,7 +67,9 @@ int __init security_init(void)
+ 
+ void reset_security_ops(void)
+ {
++	pax_open_kernel();
+ 	security_ops = &default_security_ops;
++	pax_close_kernel();
+ }
+ 
+ /* Save user chosen LSM */
+diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
+index 5c9f25b..0a171c0 100644
+--- a/security/selinux/hooks.c
++++ b/security/selinux/hooks.c
+@@ -93,7 +93,6 @@
+ #define NUM_SEL_MNT_OPTS 5
+ 
+ extern int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm);
+-extern struct security_operations *security_ops;
+ 
+ /* SECMARK reference count */
+ atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
+@@ -5428,7 +5427,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
+ 
+ #endif
+ 
+-static struct security_operations selinux_ops = {
++static struct security_operations selinux_ops __read_only = {
+ 	.name =				"selinux",
+ 
+ 	.ptrace_access_check =		selinux_ptrace_access_check,
+diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
+index 0f2fc48..44d7ba9 100644
+--- a/security/smack/smack_lsm.c
++++ b/security/smack/smack_lsm.c
+@@ -3064,7 +3064,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
+ 	return 0;
+ }
+ 
+-struct security_operations smack_ops = {
++struct security_operations smack_ops __read_only = {
+ 	.name =				"smack",
+ 
+ 	.ptrace_access_check =		smack_ptrace_access_check,
+diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
+index dedd97d..bae7977 100644
+--- a/security/tomoyo/tomoyo.c
++++ b/security/tomoyo/tomoyo.c
+@@ -235,7 +235,7 @@ static int tomoyo_sb_pivotroot(struct path *old_path, struct path *new_path)
+  * tomoyo_security_ops is a "struct security_operations" which is used for
+  * registering TOMOYO.
+  */
+-static struct security_operations tomoyo_security_ops = {
++static struct security_operations tomoyo_security_ops __read_only = {
+ 	.name                = "tomoyo",
+ 	.cred_alloc_blank    = tomoyo_cred_alloc_blank,
+ 	.cred_prepare        = tomoyo_cred_prepare,
+diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
+index 91852e4..be6fd43 100644
+--- a/sound/aoa/codecs/onyx.c
++++ b/sound/aoa/codecs/onyx.c
+@@ -54,7 +54,7 @@ struct onyx {
  				spdif_locked:1,
  				analog_locked:1,
  				original_mute:2;
@@ -55495,7 +58386,7 @@ diff -urNp linux-2.6.32.13/sound/aoa/codecs/onyx.c linux-2.6.32.13/sound/aoa/cod
  	struct codec_info	*codec_info;
  
  	/* mutex serializes concurrent access to the device
-@@ -752,7 +752,7 @@ static int onyx_open(struct codec_info_i
+@@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_item *cii,
  	struct onyx *onyx = cii->codec_data;
  
  	mutex_lock(&onyx->mutex);
@@ -55504,7 +58395,7 @@ diff -urNp linux-2.6.32.13/sound/aoa/codecs/onyx.c linux-2.6.32.13/sound/aoa/cod
  	mutex_unlock(&onyx->mutex);
  
  	return 0;
-@@ -764,8 +764,7 @@ static int onyx_close(struct codec_info_
+@@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_item *cii,
  	struct onyx *onyx = cii->codec_data;
  
  	mutex_lock(&onyx->mutex);
@@ -55514,10 +58405,11 @@ diff -urNp linux-2.6.32.13/sound/aoa/codecs/onyx.c linux-2.6.32.13/sound/aoa/cod
  		onyx->spdif_locked = onyx->analog_locked = 0;
  	mutex_unlock(&onyx->mutex);
  
-diff -urNp linux-2.6.32.13/sound/core/oss/pcm_oss.c linux-2.6.32.13/sound/core/oss/pcm_oss.c
---- linux-2.6.32.13/sound/core/oss/pcm_oss.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/sound/core/oss/pcm_oss.c	2010-05-15 13:21:18.814648703 -0400
-@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
+diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
+index aed06c9..82cdab7 100644
+--- a/sound/core/oss/pcm_oss.c
++++ b/sound/core/oss/pcm_oss.c
+@@ -2969,8 +2969,8 @@ static void snd_pcm_oss_proc_done(struct snd_pcm *pcm)
  	}
  }
  #else /* !CONFIG_SND_VERBOSE_PROCFS */
@@ -55528,10 +58420,11 @@ diff -urNp linux-2.6.32.13/sound/core/oss/pcm_oss.c linux-2.6.32.13/sound/core/o
  #endif /* CONFIG_SND_VERBOSE_PROCFS */
  
  /*
-diff -urNp linux-2.6.32.13/sound/core/seq/seq_lock.h linux-2.6.32.13/sound/core/seq/seq_lock.h
---- linux-2.6.32.13/sound/core/seq/seq_lock.h	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/sound/core/seq/seq_lock.h	2010-05-15 13:21:18.814648703 -0400
-@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
+diff --git a/sound/core/seq/seq_lock.h b/sound/core/seq/seq_lock.h
+index 54044bc..75df3ef 100644
+--- a/sound/core/seq/seq_lock.h
++++ b/sound/core/seq/seq_lock.h
+@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lock_t *lock, const char *file, int line);
  #else /* SMP || CONFIG_SND_DEBUG */
  
  typedef spinlock_t snd_use_lock_t;	/* dummy */
@@ -55546,10 +58439,11 @@ diff -urNp linux-2.6.32.13/sound/core/seq/seq_lock.h linux-2.6.32.13/sound/core/
  
  #endif /* SMP || CONFIG_SND_DEBUG */
  
-diff -urNp linux-2.6.32.13/sound/drivers/mts64.c linux-2.6.32.13/sound/drivers/mts64.c
---- linux-2.6.32.13/sound/drivers/mts64.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/sound/drivers/mts64.c	2010-05-15 13:21:18.814648703 -0400
-@@ -65,7 +65,7 @@ struct mts64 {
+diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
+index 8539ab0..62ebb7b 100644
+--- a/sound/drivers/mts64.c
++++ b/sound/drivers/mts64.c
+@@ -66,7 +66,7 @@ struct mts64 {
  	struct pardevice *pardev;
  	int pardev_claimed;
  
@@ -55558,7 +58452,7 @@ diff -urNp linux-2.6.32.13/sound/drivers/mts64.c linux-2.6.32.13/sound/drivers/m
  	int current_midi_output_port;
  	int current_midi_input_port;
  	u8 mode[MTS64_NUM_INPUT_PORTS];
-@@ -695,7 +695,7 @@ static int snd_mts64_rawmidi_open(struct
+@@ -696,7 +696,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
  {
  	struct mts64 *mts = substream->rmidi->private_data;
  
@@ -55567,7 +58461,7 @@ diff -urNp linux-2.6.32.13/sound/drivers/mts64.c linux-2.6.32.13/sound/drivers/m
  		/* We don't need a spinlock here, because this is just called 
  		   if the device has not been opened before. 
  		   So there aren't any IRQs from the device */
-@@ -703,7 +703,7 @@ static int snd_mts64_rawmidi_open(struct
+@@ -704,7 +704,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
  
  		msleep(50);
  	}
@@ -55576,7 +58470,7 @@ diff -urNp linux-2.6.32.13/sound/drivers/mts64.c linux-2.6.32.13/sound/drivers/m
  
  	return 0;
  }
-@@ -713,8 +713,7 @@ static int snd_mts64_rawmidi_close(struc
+@@ -714,8 +714,7 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
  	struct mts64 *mts = substream->rmidi->private_data;
  	unsigned long flags;
  
@@ -55586,7 +58480,7 @@ diff -urNp linux-2.6.32.13/sound/drivers/mts64.c linux-2.6.32.13/sound/drivers/m
  		/* We need the spinlock_irqsave here because we can still
  		   have IRQs at this point */
  		spin_lock_irqsave(&mts->lock, flags);
-@@ -723,8 +722,8 @@ static int snd_mts64_rawmidi_close(struc
+@@ -724,8 +723,8 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
  
  		msleep(500);
  
@@ -55597,10 +58491,11 @@ diff -urNp linux-2.6.32.13/sound/drivers/mts64.c linux-2.6.32.13/sound/drivers/m
  
  	return 0;
  }
-diff -urNp linux-2.6.32.13/sound/drivers/portman2x4.c linux-2.6.32.13/sound/drivers/portman2x4.c
---- linux-2.6.32.13/sound/drivers/portman2x4.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/sound/drivers/portman2x4.c	2010-05-15 13:21:18.818605087 -0400
-@@ -83,7 +83,7 @@ struct portman {
+diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
+index f2b0ba2..3886083 100644
+--- a/sound/drivers/portman2x4.c
++++ b/sound/drivers/portman2x4.c
+@@ -84,7 +84,7 @@ struct portman {
  	struct pardevice *pardev;
  	int pardev_claimed;
  
@@ -55609,9 +58504,10 @@ diff -urNp linux-2.6.32.13/sound/drivers/portman2x4.c linux-2.6.32.13/sound/driv
  	int mode[PORTMAN_NUM_INPUT_PORTS];
  	struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-diff -urNp linux-2.6.32.13/sound/oss/sb_audio.c linux-2.6.32.13/sound/oss/sb_audio.c
---- linux-2.6.32.13/sound/oss/sb_audio.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/sound/oss/sb_audio.c	2010-05-15 13:21:18.853427293 -0400
+diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
+index 733b014..56ce96f 100644
+--- a/sound/oss/sb_audio.c
++++ b/sound/oss/sb_audio.c
 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
  		buf16 = (signed short *)(localbuf + localoffs);
  		while (c)
@@ -55621,10 +58517,11 @@ diff -urNp linux-2.6.32.13/sound/oss/sb_audio.c linux-2.6.32.13/sound/oss/sb_aud
  			if (copy_from_user(lbuf8,
  					   userbuf+useroffs + p,
  					   locallen))
-diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_codec.c linux-2.6.32.13/sound/pci/ac97/ac97_codec.c
---- linux-2.6.32.13/sound/pci/ac97/ac97_codec.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/sound/pci/ac97/ac97_codec.c	2010-05-15 13:21:18.897182507 -0400
-@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
+diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
+index a7630e9..7383c8a 100644
+--- a/sound/pci/ac97/ac97_codec.c
++++ b/sound/pci/ac97/ac97_codec.c
+@@ -1962,7 +1962,7 @@ static int snd_ac97_dev_disconnect(struct snd_device *device)
  }
  
  /* build_ops to do nothing */
@@ -55633,10 +58530,11 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_codec.c linux-2.6.32.13/sound/pci
  
  #ifdef CONFIG_SND_AC97_POWER_SAVE
  static void do_update_power(struct work_struct *work)
-diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci/ac97/ac97_patch.c
---- linux-2.6.32.13/sound/pci/ac97/ac97_patch.c	2010-04-04 20:41:50.084493253 -0400
-+++ linux-2.6.32.13/sound/pci/ac97/ac97_patch.c	2010-05-15 13:21:18.938590352 -0400
-@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
+diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
+index e68c98e..ad8a0c9 100644
+--- a/sound/pci/ac97/ac97_patch.c
++++ b/sound/pci/ac97/ac97_patch.c
+@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spdif(struct snd_ac97 *ac97)
  	return 0;
  }
  
@@ -55645,7 +58543,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_spdif	= patch_yamaha_ymf743_build_spdif,
  	.build_3d	= patch_yamaha_ymf7x3_3d,
  };
-@@ -455,7 +455,7 @@ static int patch_yamaha_ymf753_post_spdi
+@@ -455,7 +455,7 @@ static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55654,7 +58552,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_3d	= patch_yamaha_ymf7x3_3d,
  	.build_post_spdif = patch_yamaha_ymf753_post_spdif
  };
-@@ -502,7 +502,7 @@ static int patch_wolfson_wm9703_specific
+@@ -502,7 +502,7 @@ static int patch_wolfson_wm9703_specific(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55663,7 +58561,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific = patch_wolfson_wm9703_specific,
  };
  
-@@ -533,7 +533,7 @@ static int patch_wolfson_wm9704_specific
+@@ -533,7 +533,7 @@ static int patch_wolfson_wm9704_specific(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55672,16 +58570,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific = patch_wolfson_wm9704_specific,
  };
  
-@@ -555,7 +555,7 @@ static int patch_wolfson_wm9705_specific
- 	return 0;
- }
- 
--static struct snd_ac97_build_ops patch_wolfson_wm9705_ops = {
-+static const struct snd_ac97_build_ops patch_wolfson_wm9705_ops = {
- 	.build_specific = patch_wolfson_wm9705_specific,
- };
- 
-@@ -692,7 +692,7 @@ static int patch_wolfson_wm9711_specific
+@@ -677,7 +677,7 @@ static int patch_wolfson_wm9711_specific(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55690,7 +58579,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific = patch_wolfson_wm9711_specific,
  };
  
-@@ -886,7 +886,7 @@ static void patch_wolfson_wm9713_resume 
+@@ -871,7 +871,7 @@ static void patch_wolfson_wm9713_resume (struct snd_ac97 * ac97)
  }
  #endif
  
@@ -55699,7 +58588,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific = patch_wolfson_wm9713_specific,
  	.build_3d = patch_wolfson_wm9713_3d,
  #ifdef CONFIG_PM	
-@@ -991,7 +991,7 @@ static int patch_sigmatel_stac97xx_speci
+@@ -976,7 +976,7 @@ static int patch_sigmatel_stac97xx_specific(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55708,7 +58597,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_3d	= patch_sigmatel_stac9700_3d,
  	.build_specific	= patch_sigmatel_stac97xx_specific
  };
-@@ -1038,7 +1038,7 @@ static int patch_sigmatel_stac9708_speci
+@@ -1023,7 +1023,7 @@ static int patch_sigmatel_stac9708_specific(struct snd_ac97 *ac97)
  	return patch_sigmatel_stac97xx_specific(ac97);
  }
  
@@ -55717,7 +58606,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_3d	= patch_sigmatel_stac9708_3d,
  	.build_specific	= patch_sigmatel_stac9708_specific
  };
-@@ -1267,7 +1267,7 @@ static int patch_sigmatel_stac9758_speci
+@@ -1252,7 +1252,7 @@ static int patch_sigmatel_stac9758_specific(struct snd_ac97 *ac97)
  	return 0;
  }
  
@@ -55726,7 +58615,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_3d	= patch_sigmatel_stac9700_3d,
  	.build_specific	= patch_sigmatel_stac9758_specific
  };
-@@ -1342,7 +1342,7 @@ static int patch_cirrus_build_spdif(stru
+@@ -1327,7 +1327,7 @@ static int patch_cirrus_build_spdif(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55735,7 +58624,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_spdif = patch_cirrus_build_spdif
  };
  
-@@ -1399,7 +1399,7 @@ static int patch_conexant_build_spdif(st
+@@ -1384,7 +1384,7 @@ static int patch_conexant_build_spdif(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55744,7 +58633,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_spdif = patch_conexant_build_spdif
  };
  
-@@ -1501,7 +1501,7 @@ static const struct snd_ac97_res_table a
+@@ -1486,7 +1486,7 @@ static const struct snd_ac97_res_table ad1819_restbl[] = {
  	{ AC97_VIDEO, 0x9f1f },
  	{ AC97_AUX, 0x9f1f },
  	{ AC97_PCM, 0x9f1f },
@@ -55753,7 +58642,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  };
  
  static int patch_ad1819(struct snd_ac97 * ac97)
-@@ -1575,7 +1575,7 @@ static void patch_ad1881_chained(struct 
+@@ -1560,7 +1560,7 @@ static void patch_ad1881_chained(struct snd_ac97 * ac97, int unchained_idx, int
  	}
  }
  
@@ -55762,7 +58651,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  #ifdef CONFIG_PM
  	.resume = ad18xx_resume
  #endif
-@@ -1662,7 +1662,7 @@ static int patch_ad1885_specific(struct 
+@@ -1647,7 +1647,7 @@ static int patch_ad1885_specific(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55771,7 +58660,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific = &patch_ad1885_specific,
  #ifdef CONFIG_PM
  	.resume = ad18xx_resume
-@@ -1689,7 +1689,7 @@ static int patch_ad1886_specific(struct 
+@@ -1674,7 +1674,7 @@ static int patch_ad1886_specific(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55780,7 +58669,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific = &patch_ad1886_specific,
  #ifdef CONFIG_PM
  	.resume = ad18xx_resume
-@@ -1896,7 +1896,7 @@ static int patch_ad1981a_specific(struct
+@@ -1881,7 +1881,7 @@ static int patch_ad1981a_specific(struct snd_ac97 * ac97)
  				    ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
  }
  
@@ -55789,7 +58678,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_post_spdif = patch_ad198x_post_spdif,
  	.build_specific = patch_ad1981a_specific,
  #ifdef CONFIG_PM
-@@ -1951,7 +1951,7 @@ static int patch_ad1981b_specific(struct
+@@ -1936,7 +1936,7 @@ static int patch_ad1981b_specific(struct snd_ac97 *ac97)
  				    ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
  }
  
@@ -55798,7 +58687,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_post_spdif = patch_ad198x_post_spdif,
  	.build_specific = patch_ad1981b_specific,
  #ifdef CONFIG_PM
-@@ -2090,7 +2090,7 @@ static int patch_ad1888_specific(struct 
+@@ -2075,7 +2075,7 @@ static int patch_ad1888_specific(struct snd_ac97 *ac97)
  	return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));
  }
  
@@ -55807,7 +58696,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_post_spdif = patch_ad198x_post_spdif,
  	.build_specific = patch_ad1888_specific,
  #ifdef CONFIG_PM
-@@ -2139,7 +2139,7 @@ static int patch_ad1980_specific(struct 
+@@ -2124,7 +2124,7 @@ static int patch_ad1980_specific(struct snd_ac97 *ac97)
  	return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1);
  }
  
@@ -55816,7 +58705,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_post_spdif = patch_ad198x_post_spdif,
  	.build_specific = patch_ad1980_specific,
  #ifdef CONFIG_PM
-@@ -2254,7 +2254,7 @@ static int patch_ad1985_specific(struct 
+@@ -2239,7 +2239,7 @@ static int patch_ad1985_specific(struct snd_ac97 *ac97)
  				    ARRAY_SIZE(snd_ac97_ad1985_controls));
  }
  
@@ -55825,7 +58714,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_post_spdif = patch_ad198x_post_spdif,
  	.build_specific = patch_ad1985_specific,
  #ifdef CONFIG_PM
-@@ -2546,7 +2546,7 @@ static int patch_ad1986_specific(struct 
+@@ -2531,7 +2531,7 @@ static int patch_ad1986_specific(struct snd_ac97 *ac97)
  				    ARRAY_SIZE(snd_ac97_ad1985_controls));
  }
  
@@ -55834,7 +58723,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_post_spdif = patch_ad198x_post_spdif,
  	.build_specific = patch_ad1986_specific,
  #ifdef CONFIG_PM
-@@ -2651,7 +2651,7 @@ static int patch_alc650_specific(struct 
+@@ -2636,7 +2636,7 @@ static int patch_alc650_specific(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55843,7 +58732,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific	= patch_alc650_specific,
  	.update_jacks = alc650_update_jacks
  };
-@@ -2803,7 +2803,7 @@ static int patch_alc655_specific(struct 
+@@ -2788,7 +2788,7 @@ static int patch_alc655_specific(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55852,7 +58741,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific	= patch_alc655_specific,
  	.update_jacks = alc655_update_jacks
  };
-@@ -2915,7 +2915,7 @@ static int patch_alc850_specific(struct 
+@@ -2900,7 +2900,7 @@ static int patch_alc850_specific(struct snd_ac97 *ac97)
  	return 0;
  }
  
@@ -55861,7 +58750,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific	= patch_alc850_specific,
  	.update_jacks = alc850_update_jacks
  };
-@@ -2977,7 +2977,7 @@ static int patch_cm9738_specific(struct 
+@@ -2962,7 +2962,7 @@ static int patch_cm9738_specific(struct snd_ac97 * ac97)
  	return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls));
  }
  
@@ -55870,7 +58759,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific	= patch_cm9738_specific,
  	.update_jacks = cm9738_update_jacks
  };
-@@ -3068,7 +3068,7 @@ static int patch_cm9739_post_spdif(struc
+@@ -3053,7 +3053,7 @@ static int patch_cm9739_post_spdif(struct snd_ac97 * ac97)
  	return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif));
  }
  
@@ -55879,7 +58768,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific	= patch_cm9739_specific,
  	.build_post_spdif = patch_cm9739_post_spdif,
  	.update_jacks = cm9739_update_jacks
-@@ -3242,7 +3242,7 @@ static int patch_cm9761_specific(struct 
+@@ -3227,7 +3227,7 @@ static int patch_cm9761_specific(struct snd_ac97 * ac97)
  	return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls));
  }
  
@@ -55888,7 +58777,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific	= patch_cm9761_specific,
  	.build_post_spdif = patch_cm9761_post_spdif,
  	.update_jacks = cm9761_update_jacks
-@@ -3338,7 +3338,7 @@ static int patch_cm9780_specific(struct 
+@@ -3323,7 +3323,7 @@ static int patch_cm9780_specific(struct snd_ac97 *ac97)
  	return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls));
  }
  
@@ -55897,7 +58786,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific	= patch_cm9780_specific,
  	.build_post_spdif = patch_cm9761_post_spdif	/* identical with CM9761 */
  };
-@@ -3458,7 +3458,7 @@ static int patch_vt1616_specific(struct 
+@@ -3443,7 +3443,7 @@ static int patch_vt1616_specific(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55906,7 +58795,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific	= patch_vt1616_specific
  };
  
-@@ -3812,7 +3812,7 @@ static int patch_it2646_specific(struct 
+@@ -3797,7 +3797,7 @@ static int patch_it2646_specific(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55915,7 +58804,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific	= patch_it2646_specific,
  	.update_jacks = it2646_update_jacks
  };
-@@ -3846,7 +3846,7 @@ static int patch_si3036_specific(struct 
+@@ -3831,7 +3831,7 @@ static int patch_si3036_specific(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55924,7 +58813,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific	= patch_si3036_specific,
  };
  
-@@ -3879,7 +3879,7 @@ static struct snd_ac97_res_table lm4550_
+@@ -3864,7 +3864,7 @@ static struct snd_ac97_res_table lm4550_restbl[] = {
  	{ AC97_AUX, 0x1f1f },
  	{ AC97_PCM, 0x1f1f },
  	{ AC97_REC_GAIN, 0x0f0f },
@@ -55933,7 +58822,7 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  };
  
  static int patch_lm4550(struct snd_ac97 *ac97)
-@@ -3913,7 +3913,7 @@ static int patch_ucb1400_specific(struct
+@@ -3898,7 +3898,7 @@ static int patch_ucb1400_specific(struct snd_ac97 * ac97)
  	return 0;
  }
  
@@ -55942,10 +58831,11 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci
  	.build_specific	= patch_ucb1400_specific,
  };
  
-diff -urNp linux-2.6.32.13/sound/pci/ens1370.c linux-2.6.32.13/sound/pci/ens1370.c
---- linux-2.6.32.13/sound/pci/ens1370.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/sound/pci/ens1370.c	2010-05-15 13:21:18.938590352 -0400
-@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
+diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
+index c7fba53..736f2e3 100644
+--- a/sound/pci/ens1370.c
++++ b/sound/pci/ens1370.c
+@@ -452,7 +452,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_audiopci_ids) = {
  	{ PCI_VDEVICE(ENSONIQ, 0x5880), 0, },	/* ES1373 - CT5880 */
  	{ PCI_VDEVICE(ECTIVA, 0x8938), 0, },	/* Ectiva EV1938 */
  #endif
@@ -55954,10 +58844,11 @@ diff -urNp linux-2.6.32.13/sound/pci/ens1370.c linux-2.6.32.13/sound/pci/ens1370
  };
  
  MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
-diff -urNp linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c
---- linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c	2010-05-15 13:21:18.938590352 -0400
-@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
+diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
+index 2fc5396..33ed94e 100644
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -670,10 +670,10 @@ static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)
  		cp_ready);
  
  	/* TODO */
@@ -55972,10 +58863,11 @@ diff -urNp linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.13/sound
  }
  
  
-diff -urNp linux-2.6.32.13/sound/pci/intel8x0.c linux-2.6.32.13/sound/pci/intel8x0.c
---- linux-2.6.32.13/sound/pci/intel8x0.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/sound/pci/intel8x0.c	2010-05-15 13:21:18.938590352 -0400
-@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
+diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
+index ebfa1f8..882debe 100644
+--- a/sound/pci/intel8x0.c
++++ b/sound/pci/intel8x0.c
+@@ -444,7 +444,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0_ids) = {
  	{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },	/* AMD8111 */
  	{ PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL },	/* AMD768 */
  	{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI },   /* Ali5455 */
@@ -55984,7 +58876,7 @@ diff -urNp linux-2.6.32.13/sound/pci/intel8x0.c linux-2.6.32.13/sound/pci/intel8
  };
  
  MODULE_DEVICE_TABLE(pci, snd_intel8x0_ids);
-@@ -2123,7 +2123,7 @@ static struct ac97_quirk ac97_quirks[] _
+@@ -2141,7 +2141,7 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
  		.type = AC97_TUNE_HP_ONLY
  	},
  #endif
@@ -55993,10 +58885,11 @@ diff -urNp linux-2.6.32.13/sound/pci/intel8x0.c linux-2.6.32.13/sound/pci/intel8
  };
  
  static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
-diff -urNp linux-2.6.32.13/sound/pci/intel8x0m.c linux-2.6.32.13/sound/pci/intel8x0m.c
---- linux-2.6.32.13/sound/pci/intel8x0m.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/sound/pci/intel8x0m.c	2010-05-15 13:21:18.997275588 -0400
-@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
+diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
+index 13cec1e..a2106d0 100644
+--- a/sound/pci/intel8x0m.c
++++ b/sound/pci/intel8x0m.c
+@@ -239,7 +239,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = {
  	{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },	/* AMD8111 */
  	{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI },   /* Ali5455 */
  #endif
@@ -56014,10 +58907,11 @@ diff -urNp linux-2.6.32.13/sound/pci/intel8x0m.c linux-2.6.32.13/sound/pci/intel
  };
  
  static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.32.13/usr/gen_init_cpio.c linux-2.6.32.13/usr/gen_init_cpio.c
---- linux-2.6.32.13/usr/gen_init_cpio.c	2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.13/usr/gen_init_cpio.c	2010-05-15 13:21:18.997275588 -0400
-@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
+diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
+index b2b3c2d..9905afb 100644
+--- a/usr/gen_init_cpio.c
++++ b/usr/gen_init_cpio.c
+@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, const char *location,
  	int retval;
  	int rc = -1;
  	int namesize;
@@ -56026,7 +58920,7 @@ diff -urNp linux-2.6.32.13/usr/gen_init_cpio.c linux-2.6.32.13/usr/gen_init_cpio
  
  	mode |= S_IFREG;
  
-@@ -383,9 +383,10 @@ static char *cpio_replace_env(char *new_
+@@ -386,9 +386,10 @@ static char *cpio_replace_env(char *new_location)
                         *env_var = *expanded = '\0';
                         strncat(env_var, start + 2, end - start - 2);
                         strncat(expanded, new_location, start - new_location);
@@ -56039,10 +58933,11 @@ diff -urNp linux-2.6.32.13/usr/gen_init_cpio.c linux-2.6.32.13/usr/gen_init_cpio
                 } else
                         break;
         }
-diff -urNp linux-2.6.32.13/virt/kvm/kvm_main.c linux-2.6.32.13/virt/kvm/kvm_main.c
---- linux-2.6.32.13/virt/kvm/kvm_main.c	2010-04-29 17:49:38.869035092 -0400
-+++ linux-2.6.32.13/virt/kvm/kvm_main.c	2010-05-15 13:21:19.058665704 -0400
-@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
+diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
+index dd85e29..79a5d61 100644
+--- a/virt/kvm/kvm_main.c
++++ b/virt/kvm/kvm_main.c
+@@ -1285,6 +1285,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
  	return 0;
  }
  
@@ -56050,7 +58945,7 @@ diff -urNp linux-2.6.32.13/virt/kvm/kvm_main.c linux-2.6.32.13/virt/kvm/kvm_main
  static struct file_operations kvm_vcpu_fops = {
  	.release        = kvm_vcpu_release,
  	.unlocked_ioctl = kvm_vcpu_ioctl,
-@@ -2344,6 +2345,7 @@ static int kvm_vm_mmap(struct file *file
+@@ -1739,6 +1740,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)
  	return 0;
  }
  
@@ -56058,7 +58953,7 @@ diff -urNp linux-2.6.32.13/virt/kvm/kvm_main.c linux-2.6.32.13/virt/kvm/kvm_main
  static struct file_operations kvm_vm_fops = {
  	.release        = kvm_vm_release,
  	.unlocked_ioctl = kvm_vm_ioctl,
-@@ -2431,6 +2433,7 @@ out:
+@@ -1836,6 +1838,7 @@ out:
  	return r;
  }
  
@@ -56066,7 +58961,7 @@ diff -urNp linux-2.6.32.13/virt/kvm/kvm_main.c linux-2.6.32.13/virt/kvm/kvm_main
  static struct file_operations kvm_chardev_ops = {
  	.unlocked_ioctl = kvm_dev_ioctl,
  	.compat_ioctl   = kvm_dev_ioctl,
-@@ -2440,6 +2443,9 @@ static struct miscdevice kvm_dev = {
+@@ -1845,6 +1848,9 @@ static struct miscdevice kvm_dev = {
  	KVM_MINOR,
  	"kvm",
  	&kvm_chardev_ops,
@@ -56076,12 +58971,21 @@ diff -urNp linux-2.6.32.13/virt/kvm/kvm_main.c linux-2.6.32.13/virt/kvm/kvm_main
  };
  
  static void hardware_enable(void *junk)
-@@ -2714,7 +2720,7 @@ static void kvm_sched_out(struct preempt
+@@ -1946,7 +1952,7 @@ asmlinkage void kvm_handle_fault_on_reboot(void)
+ 		/* spin while reset goes on */
+ 		local_irq_enable();
+ 		while (true)
+-			;
++			cpu_relax();
+ 	}
+ 	/* Fault while not rebooting.  We want the trace. */
+ 	BUG();
+@@ -2181,7 +2187,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
  	kvm_arch_vcpu_put(vcpu);
  }
  
--int kvm_init(void *opaque, unsigned int vcpu_size,
-+int kvm_init(const void *opaque, unsigned int vcpu_size,
+-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
++int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
  		  struct module *module)
  {
  	int r;
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index 13e508a9f9..498f17bf8e 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -1,12 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.9
-# Mon Mar 15 14:11:23 2010
+# Linux kernel version: 2.6.35.9
+# Tue Dec  7 13:46:27 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
 # CONFIG_X86_64 is not set
 CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 CONFIG_GENERIC_TIME=y
@@ -19,6 +20,8 @@ CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
+# CONFIG_NEED_DMA_MAP_STATE is not set
+CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
@@ -44,6 +47,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_EARLY_RES=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -53,7 +57,9 @@ CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_32_LAZY_GS=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_KTIME_SCALAR=y
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_CONSTRUCTORS=y
 
@@ -63,14 +69,17 @@ CONFIG_CONSTRUCTORS=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -85,19 +94,16 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
 #
 CONFIG_TREE_RCU=y
 # CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_TREE_RCU_TRACE is not set
 CONFIG_IKCONFIG=m
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_GROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_USER_SCHED=y
-# CONFIG_CGROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
@@ -107,6 +113,7 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -133,7 +140,6 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
-# CONFIG_EVENT_PROFILE is not set
 CONFIG_PERF_COUNTERS=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
@@ -143,18 +149,22 @@ CONFIG_PCI_QUIRKS=y
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_IBS is not set
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 
 #
 # GCOV-based kernel profiling
@@ -181,15 +191,43 @@ CONFIG_BLK_DEV_BSG=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=m
 CONFIG_IOSCHED_DEADLINE=m
 CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_FREEZER=y
 
 #
@@ -217,6 +255,7 @@ CONFIG_LGUEST_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_SPINLOCKS is not set
 CONFIG_PARAVIRT_CLOCK=y
+CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
@@ -246,10 +285,9 @@ CONFIG_M586=y
 # CONFIG_GENERIC_CPU is not set
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CPU=y
-CONFIG_X86_L1_CACHE_BYTES=64
-CONFIG_X86_INTERNODE_CACHE_BYTES=64
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 # CONFIG_X86_PPRO_FENCE is not set
 CONFIG_X86_WP_WORKS_OK=y
@@ -305,6 +343,7 @@ CONFIG_HIGHMEM=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -318,8 +357,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_MMU_NOTIFIER=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -357,10 +394,12 @@ CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_HIBERNATION is not set
 # CONFIG_PM_RUNTIME is not set
+CONFIG_PM_OPS=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
@@ -385,6 +424,10 @@ CONFIG_ACPI_PCI_SLOT=m
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_EINJ=m
 # CONFIG_SFI is not set
 # CONFIG_APM is not set
 
@@ -410,6 +453,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 #
 # CPUFreq processor drivers
 #
+CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_POWERNOW_K6=m
 CONFIG_X86_POWERNOW_K7=m
@@ -434,6 +478,7 @@ CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_INTEL_IDLE=m
 
 #
 # Bus options (PCI etc.)
@@ -448,6 +493,7 @@ CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_CNB20LE_QUIRK=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_PCIEAER is not set
@@ -455,10 +501,10 @@ CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
 CONFIG_PCI_STUB=m
 CONFIG_HT_IRQ=y
 # CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOAPIC=y
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 # CONFIG_EISA is not set
@@ -468,10 +514,8 @@ CONFIG_SCx200HR_TIMER=m
 # CONFIG_OLPC is not set
 CONFIG_K8_NB=y
 CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
 CONFIG_CARDBUS=y
 
 #
@@ -488,7 +532,7 @@ CONFIG_I82092=m
 CONFIG_I82365=m
 CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=m
+CONFIG_PCCARD_NONSTATIC=y
 CONFIG_HOTPLUG_PCI=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_HOTPLUG_PCI_COMPAQ=m
@@ -507,7 +551,6 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_BINFMT_ELF=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_HAVE_AOUT=y
-CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_MISC=m
 CONFIG_HAVE_ATOMIC_IOMAP=y
 CONFIG_NET=y
@@ -516,7 +559,6 @@ CONFIG_NET=y
 # Networking options
 #
 CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
@@ -543,6 +585,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 # CONFIG_IP_PIMSM_V1 is not set
 CONFIG_IP_PIMSM_V2=y
 CONFIG_ARPD=y
@@ -574,7 +617,9 @@ CONFIG_TCP_CONG_ILLINOIS=m
 # CONFIG_DEFAULT_BIC is not set
 CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_HTCP is not set
+# CONFIG_DEFAULT_HYBLA is not set
 # CONFIG_DEFAULT_VEGAS is not set
+# CONFIG_DEFAULT_VENO is not set
 # CONFIG_DEFAULT_WESTWOOD is not set
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -595,11 +640,13 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
 CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IPV6_PIMSM_V2=y
 CONFIG_NETLABEL=y
 CONFIG_NETWORK_SECMARK=y
@@ -618,6 +665,7 @@ CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_GRE=m
@@ -635,9 +683,20 @@ CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+
+#
+# Xtables targets
+#
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_HL=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
@@ -646,11 +705,16 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
@@ -660,6 +724,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_GRADM=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_HL=m
@@ -669,6 +734,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
@@ -677,7 +743,6 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_RECENT=m
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_SOCKET=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
@@ -686,7 +751,6 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_IP_VS=m
 CONFIG_IP_VS_IPV6=y
 # CONFIG_IP_VS_DEBUG is not set
@@ -700,6 +764,7 @@ CONFIG_IP_VS_PROTO_UDP=y
 CONFIG_IP_VS_PROTO_AH_ESP=y
 CONFIG_IP_VS_PROTO_ESP=y
 CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
 
 #
 # IPVS scheduler
@@ -842,8 +907,14 @@ CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
 CONFIG_STP=m
 CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
 # CONFIG_NET_DSA is not set
 CONFIG_VLAN_8021Q=m
 # CONFIG_VLAN_8021Q_GVRP is not set
@@ -926,12 +997,12 @@ CONFIG_NET_ACT_SKBEDIT=m
 # CONFIG_NET_CLS_IND is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
+CONFIG_RPS=y
 
 #
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
-# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
@@ -943,11 +1014,14 @@ CONFIG_CAN_BCM=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_DEV=m
 # CONFIG_CAN_CALC_BITTIMING is not set
+CONFIG_CAN_MCP251X=m
+CONFIG_CAN_JANZ_ICAN3=m
 CONFIG_CAN_SJA1000=m
 # CONFIG_CAN_SJA1000_ISA is not set
 CONFIG_CAN_SJA1000_PLATFORM=m
 CONFIG_CAN_EMS_PCI=m
 CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
 
 #
 # CAN USB interfaces
@@ -1013,6 +1087,7 @@ CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
 CONFIG_BT_L2CAP=m
+# CONFIG_BT_L2CAP_EXT_FEATURES is not set
 CONFIG_BT_SCO=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -1040,20 +1115,25 @@ CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
 # CONFIG_BT_MRVL is not set
+CONFIG_BT_ATH3K=m
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=m
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_CFG80211_DEFAULT_PS=y
-CONFIG_CFG80211_DEFAULT_PS_VALUE=1
 # CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS_EXT=y
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
@@ -1061,6 +1141,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m
 CONFIG_LIB80211_CRYPT_TKIP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_PID=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT_PID=y
@@ -1079,6 +1160,9 @@ CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_RDMA=m
 # CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
 
 #
 # Device Drivers
@@ -1121,6 +1205,7 @@ CONFIG_NFTL_RW=y
 CONFIG_INFTL=m
 CONFIG_RFD_FTL=m
 CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
 CONFIG_MTD_OOPS=m
 
 #
@@ -1167,6 +1252,8 @@ CONFIG_MTD_SCB2_FLASH=m
 CONFIG_MTD_NETtel=m
 CONFIG_MTD_L440GX=m
 CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
 # CONFIG_MTD_GPIO_ADDR is not set
 CONFIG_MTD_INTEL_VR_NOR=m
 CONFIG_MTD_PLATRAM=m
@@ -1202,11 +1289,16 @@ CONFIG_MTD_DOCPROBE_ADVANCED=y
 CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
 # CONFIG_MTD_DOCPROBE_HIGH is not set
 # CONFIG_MTD_DOCPROBE_55AA is not set
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
-CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_SM_COMMON=m
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
 CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
@@ -1273,6 +1365,7 @@ CONFIG_BLK_DEV_UMEM=m
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_DRBD is not set
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
@@ -1288,6 +1381,9 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_MISC_DEVICES=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
 CONFIG_IBM_ASM=m
 CONFIG_PHANTOM=m
 CONFIG_SGI_IOC4=m
@@ -1295,9 +1391,15 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
 CONFIG_HP_ILO=m
-CONFIG_DELL_LAPTOP=m
 CONFIG_ISL29003=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_DS1682=m
+CONFIG_TI_DAC7512=m
+CONFIG_VMWARE_BALLOON=m
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -1312,12 +1414,16 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
 #
 # SCSI device support
 #
+CONFIG_SCSI_MOD=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
 CONFIG_SCSI_DMA=y
@@ -1362,7 +1468,9 @@ CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
 # CONFIG_BE2ISCSI is not set
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
 CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
 CONFIG_SCSI_7000FASST=m
 CONFIG_SCSI_ACARD=m
 CONFIG_SCSI_AHA152X=m
@@ -1402,6 +1510,7 @@ CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_FLASHPOINT=y
+CONFIG_VMWARE_PVSCSI=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
@@ -1453,6 +1562,7 @@ CONFIG_SCSI_ULTRASTOR=m
 CONFIG_SCSI_NSP32=m
 CONFIG_SCSI_DEBUG=m
 # CONFIG_SCSI_PMCRAID is not set
+CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_SRP=m
 # CONFIG_SCSI_BFA_FC is not set
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
@@ -1475,30 +1585,46 @@ CONFIG_ATA=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
 CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
 CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_SIL24=m
 CONFIG_ATA_SFF=y
-CONFIG_SATA_SVW=m
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
 CONFIG_ATA_PIIX=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
 CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
 CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
-CONFIG_SATA_INIC162X=m
-CONFIG_PATA_ACPI=m
+
+#
+# PATA SFF controllers with BMDMA
+#
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
 CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATP867X=m
 CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_ATP867X=m
 CONFIG_PATA_CMD64X=m
 CONFIG_PATA_CS5520=m
 CONFIG_PATA_CS5530=m
@@ -1506,43 +1632,54 @@ CONFIG_PATA_CS5535=m
 CONFIG_PATA_CS5536=m
 CONFIG_PATA_CYPRESS=m
 CONFIG_PATA_EFAR=m
-CONFIG_ATA_GENERIC=m
 CONFIG_PATA_HPT366=m
 CONFIG_PATA_HPT37X=m
 CONFIG_PATA_HPT3X2N=m
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_ISAPNP=m
-CONFIG_PATA_IT821X=m
 CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
 CONFIG_PATA_JMICRON=m
-CONFIG_PATA_LEGACY=m
-CONFIG_PATA_TRIFLEX=m
 CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
 CONFIG_PATA_NS87415=m
-CONFIG_PATA_OPTI=m
+CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_QDI=m
 CONFIG_PATA_RADISYS=m
 CONFIG_PATA_RDC=m
-CONFIG_PATA_RZ1000=m
 CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
 CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_SIL680=m
 CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
 CONFIG_PATA_VIA=m
 CONFIG_PATA_WINBOND=m
-CONFIG_PATA_WINBOND_VLB=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_ISAPNP=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PLATFORM=m
-CONFIG_PATA_SCH=m
+CONFIG_PATA_QDI=m
+CONFIG_PATA_RZ1000=m
+CONFIG_PATA_WINBOND_VLB=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 # CONFIG_MD_AUTODETECT is not set
@@ -1585,7 +1722,7 @@ CONFIG_FUSION_CTL=m
 #
 
 #
-# See the help texts for more information.
+# The newer stack is recommended.
 #
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
@@ -1618,6 +1755,7 @@ CONFIG_IFB=m
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
 CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
 CONFIG_VETH=m
@@ -1651,6 +1789,7 @@ CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_GPIO=m
 CONFIG_NET_ETHERNET=y
@@ -1718,13 +1857,13 @@ CONFIG_PCNET32=m
 CONFIG_AMD8111_ETH=m
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_AC3200=m
+CONFIG_KSZ884X_PCI=m
 CONFIG_APRICOT=m
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
 CONFIG_B44_PCICORE_AUTOSELECT=y
 CONFIG_B44_PCI=y
 CONFIG_FORCEDETH=m
-# CONFIG_FORCEDETH_NAPI is not set
 CONFIG_CS89x0=m
 CONFIG_E100=m
 CONFIG_FEALNX=m
@@ -1789,6 +1928,8 @@ CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3_DEPENDS=y
 CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4_DEPENDS=y
+CONFIG_CHELSIO_T4=m
 CONFIG_ENIC=m
 CONFIG_IXGBE=m
 CONFIG_IXGBE_DCA=y
@@ -1805,27 +1946,16 @@ CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
 CONFIG_TEHUTI=m
 CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
 CONFIG_QLGE=m
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
 CONFIG_BE2NET=m
 # CONFIG_TR is not set
 CONFIG_WLAN=y
-CONFIG_WLAN_PRE80211=y
-CONFIG_STRIP=m
-CONFIG_ARLAN=m
-CONFIG_WAVELAN=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
 CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_AIRO=m
 CONFIG_ATMEL=m
@@ -1843,44 +1973,18 @@ CONFIG_RTL8187_LEDS=y
 CONFIG_ADM8211=m
 CONFIG_MAC80211_HWSIM=m
 CONFIG_MWL8K=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-CONFIG_P54_LEDS=y
 CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K=m
-# CONFIG_ATH9K_DEBUG is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_AR9170_USB=m
 CONFIG_AR9170_LEDS=y
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
 CONFIG_B43=m
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -1902,15 +2006,67 @@ CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 # CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLAGN=m
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWL3945=m
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+CONFIG_P54_LEDS=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT61PCI=m
+CONFIG_RT2800PCI_PCI=y
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT30XX=y
+# CONFIG_RT2800PCI_RT35XX is not set
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT30XX=y
+# CONFIG_RT2800USB_RT35XX is not set
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
@@ -1919,21 +2075,14 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
-CONFIG_HERMES=m
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_WL12XX=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL1271=m
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
+CONFIG_WL1271_SPI=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
 
 #
 # WiMAX Wireless Broadband devices
@@ -1941,6 +2090,7 @@ CONFIG_IWM=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_IWMC3200_SDIO=y
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 
 #
@@ -1955,6 +2105,7 @@ CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_EEM=m
 CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
 CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
@@ -1972,6 +2123,8 @@ CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m
@@ -2046,6 +2199,11 @@ CONFIG_ATM_HE_USE_SUNI=y
 CONFIG_ATM_SOLOS=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_CAIF_TTY=m
 CONFIG_FDDI=y
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set
@@ -2080,22 +2238,6 @@ CONFIG_VIRTIO_NET=m
 CONFIG_VMXNET3=m
 CONFIG_ISDN=y
 # CONFIG_ISDN_I4L is not set
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MISDN_NETJET is not set
-CONFIG_MISDN_IPAC=m
 CONFIG_ISDN_CAPI=m
 # CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
 # CONFIG_CAPI_TRACE is not set
@@ -2123,6 +2265,31 @@ CONFIG_ISDN_DIVAS_PRIPCI=y
 CONFIG_ISDN_DIVAS_DIVACAPI=m
 CONFIG_ISDN_DIVAS_USERIDI=m
 CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+# CONFIG_MISDN_SPEEDFAX is not set
+# CONFIG_MISDN_INFINEON is not set
+# CONFIG_MISDN_W6692 is not set
+# CONFIG_MISDN_NETJET is not set
+CONFIG_MISDN_IPAC=m
 # CONFIG_PHONE is not set
 
 #
@@ -2131,6 +2298,7 @@ CONFIG_ISDN_DIVAS_MAINT=m
 CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
 
 #
 # Userland interfaces
@@ -2149,9 +2317,10 @@ CONFIG_INPUT_EVBUG=m
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADP5588 is not set
 CONFIG_KEYBOARD_ATKBD=y
-CONFIG_QT2160=m
+# CONFIG_KEYBOARD_QT2160 is not set
 CONFIG_KEYBOARD_LKKBD=m
 CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_TCA6416=m
 CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_LM8323=m
 # CONFIG_KEYBOARD_MAX7359 is not set
@@ -2187,6 +2356,8 @@ CONFIG_TOUCHSCREEN_ADS7846=m
 CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GUNZE=m
@@ -2219,9 +2390,16 @@ CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
 CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC5UH=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_WISTRON_BTNS=m
@@ -2235,6 +2413,7 @@ CONFIG_INPUT_CM109=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WINBOND_CIR=m
 CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 
 #
@@ -2248,6 +2427,7 @@ CONFIG_SERIO_PARKBD=m
 CONFIG_SERIO_PCIPS2=m
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_GAMEPORT is not set
 
 #
@@ -2272,6 +2452,7 @@ CONFIG_SYNCLINK=m
 CONFIG_SYNCLINKMP=m
 CONFIG_SYNCLINK_GT=m
 CONFIG_N_HDLC=m
+# CONFIG_N_GSM is not set
 CONFIG_RISCOM8=m
 CONFIG_SPECIALIX=m
 CONFIG_STALDRV=y
@@ -2305,9 +2486,15 @@ CONFIG_SERIAL_8250_RSA=y
 # Non-8250 serial port support
 #
 CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 CONFIG_UNIX98_PTYS=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_LEGACY_PTYS is not set
@@ -2359,11 +2546,13 @@ CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
 CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_ALGOPCA=m
 
@@ -2401,7 +2590,9 @@ CONFIG_I2C_SCMI=m
 #
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
 
 #
 # External I2C/SMBus adapter drivers
@@ -2412,30 +2603,17 @@ CONFIG_I2C_TAOS_EVM=m
 CONFIG_I2C_TINY_USB=m
 
 #
-# Graphics adapter I2C/DDC channel drivers
-#
-CONFIG_I2C_VOODOO3=m
-
-#
 # Other I2C/SMBus bus drivers
 #
 CONFIG_I2C_PCA_ISA=m
-CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_STUB=m
 CONFIG_SCx200_I2C=m
 CONFIG_SCx200_I2C_SCL=12
 CONFIG_SCx200_I2C_SDA=13
 CONFIG_SCx200_ACB=m
-
-#
-# Miscellaneous I2C Chip support
-#
-CONFIG_DS1682=m
-CONFIG_SENSORS_TSL2550=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
 CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
 
@@ -2446,6 +2624,9 @@ CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
+# CONFIG_SPI_XILINX is not set
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_PCI=m
 
 #
 # SPI Protocol Masters
@@ -2460,22 +2641,30 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_MAX730X=m
 
 #
 # Memory mapped GPIO expanders:
 #
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
 
 #
 # I2C GPIO expanders:
 #
+CONFIG_GPIO_MAX7300=m
 CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_ADP5588=m
 
 #
 # PCI GPIO expanders:
 #
+CONFIG_GPIO_CS5535=m
 # CONFIG_GPIO_LANGWELL is not set
+CONFIG_GPIO_TIMBERDALE=y
+CONFIG_GPIO_RDC321X=m
 
 #
 # SPI GPIO expanders:
@@ -2488,6 +2677,11 @@ CONFIG_GPIO_MCP23S08=m
 # AC97 GPIO expanders:
 #
 # CONFIG_GPIO_UCB1400 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_GPIO_JANZ_TTL=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -2512,7 +2706,7 @@ CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_PDA_POWER=m
-CONFIG_WM8350_POWER=m
+CONFIG_TEST_POWER=m
 CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_BQ27x00=m
@@ -2536,11 +2730,13 @@ CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7473=m
 CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
 CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS1621=m
@@ -2558,6 +2754,7 @@ CONFIG_SENSORS_IBMPEX=m
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
 CONFIG_SENSORS_LM78=m
@@ -2580,13 +2777,18 @@ CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
 CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP401=m
 CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_VT8231=m
@@ -2598,8 +2800,8 @@ CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
-# CONFIG_SENSORS_WM8350 is not set
 CONFIG_SENSORS_HDAPS=m
+CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_SENSORS_APPLESMC=m
 
 #
@@ -2615,11 +2817,11 @@ CONFIG_WATCHDOG=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
-CONFIG_WM8350_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
+CONFIG_GEODE_WDT=m
 CONFIG_SC520_WDT=m
 # CONFIG_SBC_FITPC2_WATCHDOG is not set
 CONFIG_EUROTECH_WDT=m
@@ -2685,40 +2887,40 @@ CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=m
+CONFIG_MFD_SUPPORT=y
+CONFIG_MFD_CORE=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SM501_GPIO is not set
 CONFIG_HTC_PASIC3=m
 CONFIG_UCB1400_CORE=m
 CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_WM8400=m
-# CONFIG_MFD_WM831X is not set
-CONFIG_MFD_WM8350=m
-CONFIG_MFD_WM8350_I2C=m
 CONFIG_MFD_PCF50633=m
 # CONFIG_MFD_MC13783 is not set
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
-CONFIG_AB3100_CORE=m
-CONFIG_AB3100_OTP=m
+CONFIG_ABX500_CORE=y
 # CONFIG_EZX_PCAP is not set
+CONFIG_AB8500_CORE=y
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_DUMMY is not set
 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
 CONFIG_REGULATOR_BQ24022=m
 CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_PCF50633=m
 CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_AB3100=m
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 CONFIG_MEDIA_SUPPORT=m
@@ -2738,6 +2940,15 @@ CONFIG_VIDEO_MEDIA=m
 #
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_IR_CORE=m
+CONFIG_VIDEO_IR=m
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_IMON=m
 # CONFIG_MEDIA_ATTACH is not set
 CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
@@ -2758,15 +2969,16 @@ CONFIG_MEDIA_TUNER_XC5000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
 CONFIG_VIDEOBUF_DVB=m
 CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
@@ -2814,8 +3026,10 @@ CONFIG_VIDEO_TCM825X=m
 CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_SAA7191=m
 CONFIG_VIDEO_TVP514X=m
 CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
 CONFIG_VIDEO_VPX3220=m
 
 #
@@ -2837,15 +3051,18 @@ CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
 CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_AK881X=m
 
 #
 # Video improvement chips
 #
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
-CONFIG_VIDEO_VIVI=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_SAA5246A=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_VIDEO_ZORAN=m
@@ -2856,9 +3073,11 @@ CONFIG_VIDEO_ZORAN_DC10=m
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_SAA7134=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_CX88=m
@@ -2872,16 +3091,20 @@ CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_FB_IVTV=m
 CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
 CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_MT9M001=m
 CONFIG_SOC_CAMERA_MT9M111=m
 CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
 CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -2889,7 +3112,9 @@ CONFIG_USB_GSPCA=m
 CONFIG_USB_M5602=m
 CONFIG_USB_STV06XX=m
 CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
 CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
@@ -2897,10 +3122,12 @@ CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
 CONFIG_USB_GSPCA_OV519=m
 CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
 CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
 CONFIG_USB_GSPCA_SONIXB=m
 CONFIG_USB_GSPCA_SONIXJ=m
 CONFIG_USB_GSPCA_SPCA500=m
@@ -2912,6 +3139,7 @@ CONFIG_USB_GSPCA_SPCA561=m
 CONFIG_USB_GSPCA_SQ905=m
 CONFIG_USB_GSPCA_SQ905C=m
 CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
 CONFIG_USB_GSPCA_SUNPLUS=m
 CONFIG_USB_GSPCA_T613=m
 CONFIG_USB_GSPCA_TV8532=m
@@ -2925,6 +3153,7 @@ CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_TLG2300=m
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_ALSA=m
 CONFIG_VIDEO_CX231XX_DVB=m
@@ -2932,10 +3161,11 @@ CONFIG_VIDEO_USBVISION=m
 CONFIG_USB_ET61X251=m
 CONFIG_USB_SN9C102=m
 CONFIG_USB_ZC0301=m
-CONFIG_USB_PWC_INPUT_EVDEV=y
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_CADET=m
 CONFIG_RADIO_RTRACK=m
@@ -2945,6 +3175,7 @@ CONFIG_RADIO_GEMTEK=m
 CONFIG_RADIO_GEMTEK_PCI=m
 CONFIG_RADIO_MAXIRADIO=m
 CONFIG_RADIO_MAESTRO=m
+CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_SF16FMI=m
 CONFIG_RADIO_SF16FMR2=m
 CONFIG_RADIO_TERRATEC=m
@@ -2957,6 +3188,9 @@ CONFIG_USB_DSBR=m
 # CONFIG_RADIO_SI470X is not set
 CONFIG_USB_MR800=m
 CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -3005,6 +3239,8 @@ CONFIG_DVB_USB_DTV5100=m
 CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_CE6230=m
 # CONFIG_DVB_USB_FRIIO is not set
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_SIANO_MDTV=m
@@ -3042,6 +3278,7 @@ CONFIG_DVB_DM1105=m
 # Supported FireWire (IEEE 1394) Adapters
 #
 CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_FIREWIRE=y
 CONFIG_DVB_FIREDTV_IEEE1394=y
 CONFIG_DVB_FIREDTV_INPUT=y
 
@@ -3051,11 +3288,25 @@ CONFIG_DVB_FIREDTV_INPUT=y
 # CONFIG_DVB_PT1 is not set
 
 #
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
 # Supported DVB Frontends
 #
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
 CONFIG_DVB_CX24110=m
 CONFIG_DVB_CX24123=m
 CONFIG_DVB_MT312=m
@@ -3077,6 +3328,8 @@ CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
 CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
@@ -3092,6 +3345,7 @@ CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_TDA10021=m
 CONFIG_DVB_TDA10023=m
@@ -3108,10 +3362,13 @@ CONFIG_DVB_S5H1411=m
 CONFIG_DVB_DIB8000=m
 CONFIG_DVB_PLL=m
 CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
 CONFIG_DAB=y
 CONFIG_USB_DABUSB=m
 
@@ -3130,12 +3387,14 @@ CONFIG_AGP_SWORKS=m
 CONFIG_AGP_VIA=m
 CONFIG_AGP_EFFICEON=m
 # CONFIG_VGA_ARB is not set
+CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_TTM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_KMS is not set
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_I915=m
@@ -3222,6 +3481,7 @@ CONFIG_FB_SIS=m
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
 CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
 CONFIG_FB_3DFX=m
@@ -3249,18 +3509,22 @@ CONFIG_FB_MB862XX=m
 CONFIG_FB_BROADSHEET=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
 CONFIG_LCD_LTV350QV=m
 CONFIG_LCD_ILI9320=m
 CONFIG_LCD_TDO24M=m
 CONFIG_LCD_VGG2432A4=m
 CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_S6E63M0=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
 CONFIG_BACKLIGHT_MBP_NVIDIA=m
 CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
 
 #
 # Display device support
@@ -3344,8 +3608,6 @@ CONFIG_SND_AZT2320=m
 CONFIG_SND_CMI8330=m
 CONFIG_SND_CS4231=m
 CONFIG_SND_CS4236=m
-CONFIG_SND_DT019X=m
-CONFIG_SND_ES968=m
 CONFIG_SND_ES1688=m
 CONFIG_SND_ES18XX=m
 CONFIG_SND_SC6000=m
@@ -3354,6 +3616,7 @@ CONFIG_SND_GUSEXTREME=m
 CONFIG_SND_GUSMAX=m
 CONFIG_SND_INTERWAVE=m
 CONFIG_SND_INTERWAVE_STB=m
+CONFIG_SND_JAZZ16=m
 CONFIG_SND_OPL3SA2=m
 CONFIG_SND_OPTI92X_AD1848=m
 CONFIG_SND_OPTI92X_CS4231=m
@@ -3373,6 +3636,7 @@ CONFIG_SND_AD1889=m
 CONFIG_SND_ALS300=m
 CONFIG_SND_ALS4000=m
 CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
 CONFIG_SND_ATIIXP=m
 CONFIG_SND_ATIIXP_MODEM=m
 CONFIG_SND_AU8810=m
@@ -3412,12 +3676,14 @@ CONFIG_SND_ENS1370=m
 CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_FM801=m
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_HWDEP=y
 # CONFIG_SND_HDA_RECONFIG is not set
 CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
 CONFIG_SND_HDA_INPUT_JACK=y
 # CONFIG_SND_HDA_PATCH_LOADER is not set
 CONFIG_SND_HDA_CODEC_REALTEK=y
@@ -3445,6 +3711,7 @@ CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_LX6464ES=m
 CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
 CONFIG_SND_MIXART=m
 CONFIG_SND_NM256=m
 CONFIG_SND_PCXHR=m
@@ -3463,6 +3730,7 @@ CONFIG_SND_YMFPCI=m
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
 # CONFIG_SND_USB_CAIAQ_INPUT is not set
@@ -3475,12 +3743,15 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_ALL_CODECS=m
 CONFIG_SND_SOC_WM_HUBS=m
 CONFIG_SND_SOC_AD1836=m
-CONFIG_SND_SOC_AD1938=m
+CONFIG_SND_SOC_AD193X=m
 CONFIG_SND_SOC_AD73311=m
+CONFIG_SND_SOC_ADS117X=m
 CONFIG_SND_SOC_AK4104=m
 CONFIG_SND_SOC_AK4535=m
 CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK4671=m
 CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_DA7210=m
 CONFIG_SND_SOC_L3=m
 CONFIG_SND_SOC_PCM3008=m
 CONFIG_SND_SOC_SPDIF=m
@@ -3488,13 +3759,15 @@ CONFIG_SND_SOC_SSM2602=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC26=m
 CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320DAC33=m
 CONFIG_SND_SOC_UDA134X=m
 CONFIG_SND_SOC_UDA1380=m
-CONFIG_SND_SOC_WM8350=m
 CONFIG_SND_SOC_WM8400=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
 CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8727=m
 CONFIG_SND_SOC_WM8728=m
 CONFIG_SND_SOC_WM8731=m
 CONFIG_SND_SOC_WM8750=m
@@ -3502,16 +3775,22 @@ CONFIG_SND_SOC_WM8753=m
 CONFIG_SND_SOC_WM8776=m
 CONFIG_SND_SOC_WM8900=m
 CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
 CONFIG_SND_SOC_WM8940=m
+CONFIG_SND_SOC_WM8955=m
 CONFIG_SND_SOC_WM8960=m
 CONFIG_SND_SOC_WM8961=m
 CONFIG_SND_SOC_WM8971=m
 CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
 CONFIG_SND_SOC_WM8988=m
 CONFIG_SND_SOC_WM8990=m
 CONFIG_SND_SOC_WM8993=m
 CONFIG_SND_SOC_WM9081=m
 CONFIG_SND_SOC_MAX9877=m
+CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SOC_WM2000=m
+CONFIG_SND_SOC_WM9090=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 CONFIG_HID_SUPPORT=y
@@ -3534,26 +3813,42 @@ CONFIG_USB_MOUSE=m
 #
 # Special HID drivers
 #
+CONFIG_HID_3M_PCT=m
 # CONFIG_HID_A4TECH is not set
 # CONFIG_HID_APPLE is not set
 # CONFIG_HID_BELKIN is not set
+CONFIG_HID_CANDO=m
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
+CONFIG_HID_PRODIKEYS=m
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
+CONFIG_HID_EGALAX=m
 # CONFIG_HID_EZKEY is not set
 # CONFIG_HID_KYE is not set
 # CONFIG_HID_GYRATION is not set
 # CONFIG_HID_TWINHAN is not set
 # CONFIG_HID_KENSINGTON is not set
 # CONFIG_HID_LOGITECH is not set
+CONFIG_HID_MAGICMOUSE=m
 # CONFIG_HID_MICROSOFT is not set
+CONFIG_HID_MOSART=m
 # CONFIG_HID_MONTEREY is not set
 # CONFIG_HID_NTRIG is not set
+CONFIG_HID_ORTEK=m
 # CONFIG_HID_PANTHERLORD is not set
 # CONFIG_HID_PETALYNX is not set
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_QUANTA=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_KONE=m
 # CONFIG_HID_SAMSUNG is not set
 # CONFIG_HID_SONY is not set
+CONFIG_HID_STANTUM=m
 # CONFIG_HID_SUNPLUS is not set
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
@@ -3561,6 +3856,7 @@ CONFIG_USB_MOUSE=m
 # CONFIG_HID_THRUSTMASTER is not set
 # CONFIG_HID_WACOM is not set
 # CONFIG_HID_ZEROPLUS is not set
+CONFIG_HID_ZYDACRON=m
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
@@ -3575,8 +3871,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_MON=m
@@ -3682,11 +3976,13 @@ CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 CONFIG_USB_SERIAL_MOS7840=m
 CONFIG_USB_SERIAL_MOTOROLA=m
 CONFIG_USB_SERIAL_NAVMAN=m
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
 CONFIG_USB_SERIAL_QUALCOMM=m
 CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_HP4X=m
@@ -3698,9 +3994,12 @@ CONFIG_USB_SERIAL_SYMBOL=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
 CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
 CONFIG_USB_SERIAL_DEBUG=m
 
 #
@@ -3713,7 +4012,6 @@ CONFIG_USB_SEVSEG=m
 CONFIG_USB_RIO500=m
 # CONFIG_USB_LEGOTOWER is not set
 CONFIG_USB_LCD=m
-# CONFIG_USB_BERRY_CHARGE is not set
 CONFIG_USB_LED=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
@@ -3727,7 +4025,6 @@ CONFIG_USB_LD=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
-# CONFIG_USB_VST is not set
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
@@ -3764,11 +4061,9 @@ CONFIG_MMC_TEST=m
 #
 CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=m
+CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_ATMELMCI is not set
 CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_CB710=m
@@ -3794,6 +4089,7 @@ CONFIG_LEDS_CLASS=m
 # LED drivers
 #
 CONFIG_LEDS_NET48XX=m
+CONFIG_LEDS_NET5501=m
 CONFIG_LEDS_WRAP=m
 CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_PCA9532=m
@@ -3802,14 +4098,17 @@ CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_WM8350=m
 CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
-CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
@@ -3832,6 +4131,7 @@ CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
 CONFIG_INFINIBAND_CXGB3=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
+CONFIG_INFINIBAND_CXGB4=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_INFINIBAND_NES=m
 # CONFIG_INFINIBAND_NES_DEBUG is not set
@@ -3867,6 +4167,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
 CONFIG_RTC_DRV_RX8581=m
@@ -3896,22 +4197,25 @@ CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_M48T86=m
 CONFIG_RTC_DRV_M48T35=m
 CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
 CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
 CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_WM8350=m
 CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB3100=m
+CONFIG_RTC_DRV_AB8500=m
 
 #
 # on-CPU RTC drivers
 #
 CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
 
 #
 # DMA Devices
 #
 CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y
 CONFIG_INTEL_IOATDMA=m
+CONFIG_TIMB_DMA=m
 CONFIG_DMA_ENGINE=y
 
 #
@@ -3931,18 +4235,81 @@ CONFIG_UIO=m
 CONFIG_UIO_CIF=m
 CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_SMX=m
 CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 # CONFIG_UIO_PCI_GENERIC is not set
-
-#
-# TI VLYNQ
-#
-# CONFIG_STAGING is not set
+CONFIG_UIO_NETX=m
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_CX25821 is not set
+# CONFIG_VIDEO_TM6000 is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+# CONFIG_OTUS is not set
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+# CONFIG_R8187SE is not set
+# CONFIG_RTL8192SU is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_DRM_VMWGFX is not set
+# CONFIG_DRM_NOUVEAU is not set
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_FB_UDL is not set
+CONFIG_HYPERV=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_HYPERV_BLOCK=m
+CONFIG_HYPERV_NET=m
+CONFIG_HYPERV_UTILS=m
+# CONFIG_VME_BUS is not set
+
+#
+# RAR Register Driver
+#
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_IIO is not set
+# CONFIG_RAMZSWAP is not set
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_SAMSUNG_LAPTOP is not set
+# CONFIG_FB_SM7XX is not set
+# CONFIG_DT3155 is not set
+# CONFIG_VIDEO_DT3155 is not set
+# CONFIG_CRYSTALHD is not set
+# CONFIG_CXT1E1 is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
+# CONFIG_ST_BT is not set
+# CONFIG_ADIS16255 is not set
+# CONFIG_FB_XGI is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
@@ -3954,6 +4321,7 @@ CONFIG_COMPAL_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 # CONFIG_SONYPI_COMPAT is not set
 CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
@@ -3961,10 +4329,14 @@ CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_INTEL_MENLOW=m
 CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
 CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
 CONFIG_ACPI_ASUS=m
 # CONFIG_TOPSTAR_LAPTOP is not set
 CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
 
 #
 # Firmware Drivers
@@ -4026,7 +4398,6 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OCFS2_FS_STATS=y
 CONFIG_OCFS2_DEBUG_MASKLOG=y
 # CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_OCFS2_FS_POSIX_ACL=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_NILFS2_FS=m
@@ -4038,6 +4409,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
 CONFIG_QUOTA_TREE=m
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
@@ -4123,8 +4495,10 @@ CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBIFS_FS_DEBUG is not set
+CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_XATTRS is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
@@ -4164,6 +4538,8 @@ CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
+CONFIG_CEPH_FS=m
+# CONFIG_CEPH_FS_PRETTYDEBUG is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
@@ -4181,8 +4557,24 @@ CONFIG_CIFS_EXPERIMENTAL=y
 #
 # Partition Types
 #
-# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
 CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=m
 CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=m
@@ -4240,16 +4632,15 @@ CONFIG_FRAME_WARN=1024
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_LKDTM is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -4258,16 +4649,14 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_KMEMCHECK=y
@@ -4325,7 +4714,9 @@ CONFIG_GRKERNSEC_ACL_TIMEOUT=30
 # Filesystem Protections
 #
 CONFIG_GRKERNSEC_PROC=y
-CONFIG_GRKERNSEC_PROC_USER=y
+# CONFIG_GRKERNSEC_PROC_USER is not set
+CONFIG_GRKERNSEC_PROC_USERGROUP=y
+CONFIG_GRKERNSEC_PROC_GID=30
 CONFIG_GRKERNSEC_PROC_ADD=y
 CONFIG_GRKERNSEC_LINK=y
 CONFIG_GRKERNSEC_FIFO=y
@@ -4359,6 +4750,7 @@ CONFIG_GRKERNSEC_SIGNAL=y
 CONFIG_GRKERNSEC_FORKFAIL=y
 CONFIG_GRKERNSEC_TIME=y
 CONFIG_GRKERNSEC_PROC_IPADDR=y
+# CONFIG_GRKERNSEC_RWXMAP_LOG is not set
 # CONFIG_GRKERNSEC_AUDIT_TEXTREL is not set
 
 #
@@ -4411,7 +4803,7 @@ CONFIG_PAX_PAGEEXEC=y
 # CONFIG_PAX_SEGMEXEC is not set
 CONFIG_PAX_EMUTRAMP=y
 CONFIG_PAX_MPROTECT=y
-CONFIG_PAX_NOELFRELOCS=y
+# CONFIG_PAX_ELFRELOCS is not set
 CONFIG_PAX_KERNEXEC=y
 CONFIG_PAX_KERNEXEC_MODULE_TEXT=4
 
@@ -4435,9 +4827,13 @@ CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_NETWORK is not set
 # CONFIG_SECURITY_PATH is not set
-CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -4465,8 +4861,10 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_MANAGER_TESTS is not set
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
@@ -4561,21 +4959,23 @@ CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
+CONFIG_VHOST_NET=m
 CONFIG_LGUEST=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_RING=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
-CONFIG_BINARY_PRINTF=y
+# CONFIG_BINARY_PRINTF is not set
 
 #
 # Library routines
 #
-CONFIG_BITREVERSE=m
+CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
@@ -4583,16 +4983,17 @@ CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
 CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=m
+CONFIG_CRC32=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=m
+CONFIG_LZO_DECOMPRESS=y
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
@@ -4600,6 +5001,7 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64
new file mode 100644
index 0000000000..d730addc70
--- /dev/null
+++ b/main/linux-grsec/kernelconfig.x86_64
@@ -0,0 +1,4807 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.35.9
+# Tue Dec 21 08:49:30 2010
+#
+CONFIG_64BIT=y
+# CONFIG_X86_32 is not set
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_EARLY_RES=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FAST_NO_HZ=y
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+# CONFIG_CGROUPS is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+CONFIG_PERF_COUNTERS=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_SLOW_WORK_DEBUG is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+# CONFIG_SPARSE_IRQ is not set
+CONFIG_X86_MPPARSE=y
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_VSMP is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_PARAVIRT_GUEST=y
+# CONFIG_XEN is not set
+CONFIG_KVM_CLOCK=y
+CONFIG_KVM_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_CLOCK=y
+CONFIG_NO_BOOTMEM=y
+# CONFIG_MEMTEST is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M686 is not set
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+CONFIG_CALGARY_IOMMU=y
+CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+CONFIG_AMD_IOMMU=y
+# CONFIG_AMD_IOMMU_STATS is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_IOMMU_API=y
+CONFIG_NR_CPUS=8
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
+# CONFIG_X86_MCE is not set
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+# CONFIG_NUMA is not set
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW_64K=y
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+# CONFIG_SECCOMP is not set
+# CONFIG_CC_STACKPROTECTOR is not set
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_NVS=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
+# CONFIG_PM_RUNTIME is not set
+CONFIG_PM_OPS=y
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+# CONFIG_ACPI_POWER_METER is not set
+CONFIG_ACPI_SYSFS_POWER=y
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_EINJ=m
+# CONFIG_SFI is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# CPUFreq processor drivers
+#
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_INTEL_IDLE=m
+
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_CNB20LE_QUIRK=y
+# CONFIG_DMAR is not set
+# CONFIG_INTR_REMAP is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=m
+# CONFIG_PCIEAER is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOAPIC=y
+CONFIG_ISA_DMA_API=y
+CONFIG_K8_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI_FAKE=m
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=m
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+# CONFIG_IP_PIMSM_V1 is not set
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+# CONFIG_DEFAULT_BIC is not set
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_HTCP is not set
+# CONFIG_DEFAULT_HYBLA is not set
+# CONFIG_DEFAULT_VEGAS is not set
+# CONFIG_DEFAULT_VENO is not set
+# CONFIG_DEFAULT_WESTWOOD is not set
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_NETLABEL=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_GRADM=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+
+#
+# DECnet: Netfilter Configuration
+#
+CONFIG_DECNET_NF_GRABULATOR=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_CCID3_RTO=100
+CONFIG_IP_DCCP_TFRC_LIB=y
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+CONFIG_SCTP_HMAC_SHA1=y
+# CONFIG_SCTP_HMAC_MD5 is not set
+CONFIG_RDS=m
+# CONFIG_RDS_RDMA is not set
+# CONFIG_RDS_TCP is not set
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_DECNET=m
+CONFIG_DECNET_ROUTER=y
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_ECONET=m
+CONFIG_ECONET_AUNUDP=y
+CONFIG_ECONET_NATIVE=y
+CONFIG_WAN_ROUTER=m
+CONFIG_PHONET=m
+CONFIG_IEEE802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_RPS=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+# CONFIG_HAMRADIO is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_DEV=m
+# CONFIG_CAN_CALC_BITTIMING is not set
+CONFIG_CAN_MCP251X=m
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+
+#
+# CAN USB interfaces
+#
+# CONFIG_CAN_EMS_USB is not set
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+# CONFIG_BT_L2CAP_EXT_FEATURES is not set
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+# CONFIG_BT_MRVL is not set
+CONFIG_BT_ATH3K=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_PID=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
+CONFIG_MAC80211_RC_DEFAULT="pid"
+# CONFIG_MAC80211_MESH is not set
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+# CONFIG_RFKILL_INPUT is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
+CONFIG_STANDALONE=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_FW_LOADER=m
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=m
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_HAVE_MTD_OTP=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+# CONFIG_MTD_GPIO_ADDR is not set
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
+CONFIG_MTD_M25P80=m
+CONFIG_M25PXX_USE_FAST_READ=y
+# CONFIG_MTD_SST25L is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOC2000=m
+CONFIG_MTD_DOC2001=m
+CONFIG_MTD_DOC2001PLUS=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+CONFIG_MTD_DOCPROBE_ADVANCED=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
+# CONFIG_MTD_DOCPROBE_HIGH is not set
+# CONFIG_MTD_DOCPROBE_55AA is not set
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+CONFIG_MTD_SM_COMMON=m
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_ALAUDA=m
+CONFIG_MTD_ONENAND=m
+# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
+# CONFIG_MTD_ONENAND_GENERIC is not set
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_ONENAND_SIM=m
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+
+#
+# UBI - Unsorted block images
+#
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+# CONFIG_PARPORT_1284 is not set
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=m
+# CONFIG_PARIDE is not set
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_DRBD is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_UB=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_MISC_DEVICES=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_ISL29003=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_DS1682=m
+CONFIG_TI_DAC7512=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=m
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+# CONFIG_BE2ISCSI is not set
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+CONFIG_AIC7XXX_DEBUG_ENABLE=y
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC7XXX_OLD=m
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
+CONFIG_AIC79XX_DEBUG_ENABLE=y
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+CONFIG_SCSI_MVSAS_DEBUG=y
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+CONFIG_SCSI_DEBUG=m
+# CONFIG_SCSI_PMCRAID is not set
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_SRP=m
+# CONFIG_SCSI_BFA_FC is not set
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+# CONFIG_MD_AUTODETECT is not set
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_RAID6_PQ=m
+# CONFIG_ASYNC_RAID6_TEST is not set
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+# CONFIG_DM_UEVENT is not set
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# You can enable one or both FireWire driver stacks.
+#
+
+#
+# The newer stack is recommended.
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_IEEE1394=m
+CONFIG_IEEE1394_OHCI1394=m
+CONFIG_IEEE1394_PCILYNX=m
+CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_DV1394=m
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=m
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_NET_SB1000=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=m
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ETHOC=m
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_HP100=m
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_FORCEDETH=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R6040=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_SC92031=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_ATL2=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_R8169_VLAN=y
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
+CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3_DEPENDS=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4_DEPENDS=y
+CONFIG_CHELSIO_T4=m
+CONFIG_ENIC=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+# CONFIG_IXGBEVF is not set
+CONFIG_IXGB=m
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_BE2NET=m
+# CONFIG_TR is not set
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_AR9170_USB=m
+CONFIG_AR9170_LEDS=y
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLAGN=m
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWL3945=m
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI_PCI=y
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT30XX=y
+# CONFIG_RT2800PCI_RT35XX is not set
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT30XX=y
+# CONFIG_RT2800USB_RT35XX is not set
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WL12XX=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL1271=m
+CONFIG_WL1271_SPI=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_IWMC3200_SDIO=y
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_WANXL_BUILD_FIRMWARE is not set
+CONFIG_PC300TOO=m
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+CONFIG_DSCC4_PCISYNC=y
+CONFIG_DSCC4_PCI_RST=y
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_WAN_ROUTER_DRIVERS=m
+CONFIG_CYCLADES_SYNC=m
+CONFIG_CYCLOMX_X25=y
+CONFIG_LAPBETHER=m
+CONFIG_X25_ASY=m
+CONFIG_SBNI=m
+CONFIG_SBNI_MULTILINE=y
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_CAIF_TTY=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_NET_FC is not set
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
+CONFIG_ISDN=y
+# CONFIG_ISDN_I4L is not set
+CONFIG_ISDN_CAPI=m
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_CAPI_TRACE is not set
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+# CONFIG_MISDN_SPEEDFAX is not set
+# CONFIG_MISDN_INFINEON is not set
+# CONFIG_MISDN_W6692 is not set
+# CONFIG_MISDN_NETJET is not set
+CONFIG_MISDN_IPAC=m
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVBUG=m
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT2160 is not set
+CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+# CONFIG_KEYBOARD_MAX7359 is not set
+CONFIG_KEYBOARD_NEWTON=m
+# CONFIG_KEYBOARD_OPENCORES is not set
+CONFIG_KEYBOARD_STOWAWAY=m
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC5UH=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_WINBOND_CIR=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_COMPUTONE=m
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_DIGIEPCA=m
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_ISI=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+# CONFIG_N_GSM is not set
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+CONFIG_STALDRV=y
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_NOZOMI=m
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_PC8736x_GPIO=m
+CONFIG_NSC_GPIO=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+# CONFIG_SPI_XILINX is not set
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_PCI=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_TLE62X0=m
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO expanders:
+#
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_ADP5588=m
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=m
+# CONFIG_GPIO_LANGWELL is not set
+CONFIG_GPIO_TIMBERDALE=y
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI GPIO expanders:
+#
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MCP23S08=m
+# CONFIG_GPIO_MC33880 is not set
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_GPIO_UCB1400 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_THERMAL=y
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+# CONFIG_HP_WATCHDOG is not set
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_MFD_SUPPORT=y
+CONFIG_MFD_CORE=y
+CONFIG_MFD_SM501=m
+# CONFIG_MFD_SM501_GPIO is not set
+CONFIG_HTC_PASIC3=m
+CONFIG_UCB1400_CORE=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_PCF50633=m
+# CONFIG_MFD_MC13783 is not set
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_ABX500_CORE=y
+# CONFIG_EZX_PCAP is not set
+CONFIG_AB8500_CORE=y
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_DUMMY is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_BQ24022=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_LP3971=m
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+# CONFIG_VIDEO_ALLOW_V4L1 is not set
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_IR_CORE=m
+CONFIG_VIDEO_IR=m
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_IMON=m
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA9875=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_TCM825X=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_SAA7191=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_AK881X=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_SAA5246A=m
+CONFIG_VIDEO_SAA5249=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_USB_ET61X251=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_ZC0301=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_GEMTEK_PCI=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MAESTRO=m
+# CONFIG_I2C_SI4713 is not set
+# CONFIG_RADIO_SI4713 is not set
+CONFIG_USB_DSBR=m
+# CONFIG_RADIO_SI470X is not set
+CONFIG_USB_MR800=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_CE6230=m
+# CONFIG_DVB_USB_FRIIO is not set
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+CONFIG_SMS_USB_DRV=m
+CONFIG_SMS_SDIO_DRV=m
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+CONFIG_DVB_PLUTO2=m
+
+#
+# Supported SDMC DM1105 Adapters
+#
+CONFIG_DVB_DM1105=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_FIREWIRE=y
+CONFIG_DVB_FIREDTV_IEEE1394=y
+CONFIG_DVB_FIREDTV_INPUT=y
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+# CONFIG_DVB_PT1 is not set
+
+#
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
+# Supported DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_S5H1411=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DAB=y
+CONFIG_USB_DABUSB=m
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+# CONFIG_VGA_ARB is not set
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_TTM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_KMS is not set
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+# CONFIG_DRM_I915_KMS is not set
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=m
+# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FB_DDC=m
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_IMAGEBLIT=m
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+CONFIG_FB_PM2_FIFO_DISCONNECT=y
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_ARC=m
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+# CONFIG_FB_HGA_ACCEL is not set
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+CONFIG_FB_SM501=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+# CONFIG_FB_MB862XX_PCI_GDC is not set
+CONFIG_FB_BROADSHEET=m
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_S6E63M0=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=m
+
+#
+# Display hardware drivers
+#
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_LOGO is not set
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_PCSP=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_FM801=m
+# CONFIG_SND_FM801_TEA575X_BOOL is not set
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+# CONFIG_SND_HDA_RECONFIG is not set
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_INPUT_JACK=y
+# CONFIG_SND_HDA_PATCH_LOADER is not set
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_ATIHDMI=y
+CONFIG_SND_HDA_CODEC_NVHDMI=y
+CONFIG_SND_HDA_CODEC_INTELHDMI=y
+CONFIG_SND_HDA_ELD=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+# CONFIG_SND_HDA_POWER_SAVE is not set
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_HIFIER=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+# CONFIG_SND_USB_CAIAQ_INPUT is not set
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_ALL_CODECS=m
+CONFIG_SND_SOC_WM_HUBS=m
+CONFIG_SND_SOC_AD1836=m
+CONFIG_SND_SOC_AD193X=m
+CONFIG_SND_SOC_AD73311=m
+CONFIG_SND_SOC_ADS117X=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4535=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK4671=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_DA7210=m
+CONFIG_SND_SOC_L3=m
+CONFIG_SND_SOC_PCM3008=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC26=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320DAC33=m
+CONFIG_SND_SOC_UDA134X=m
+CONFIG_SND_SOC_UDA1380=m
+CONFIG_SND_SOC_WM8400=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8727=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8900=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8940=m
+CONFIG_SND_SOC_WM8955=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8961=m
+CONFIG_SND_SOC_WM8971=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8988=m
+CONFIG_SND_SOC_WM8990=m
+CONFIG_SND_SOC_WM8993=m
+CONFIG_SND_SOC_WM9081=m
+CONFIG_SND_SOC_MAX9877=m
+CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SOC_WM2000=m
+CONFIG_SND_SOC_WM9090=m
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_3M_PCT=m
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+CONFIG_HID_CANDO=m
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+CONFIG_HID_PRODIKEYS=m
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+CONFIG_HID_EGALAX=m
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LOGITECH is not set
+CONFIG_HID_MAGICMOUSE=m
+# CONFIG_HID_MICROSOFT is not set
+CONFIG_HID_MOSART=m
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_NTRIG is not set
+CONFIG_HID_ORTEK=m
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_QUANTA=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_KONE=m
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+CONFIG_HID_STANTUM=m
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_ZEROPLUS is not set
+CONFIG_HID_ZYDACRON=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_SSB=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_LIBUSUAL=y
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+# CONFIG_USB_LEGOTOWER is not set
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+# CONFIG_USB_TRANCEVIBRATOR is not set
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_WLP=m
+CONFIG_UWB_I1480U=m
+CONFIG_UWB_I1480U_WLP=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+CONFIG_MMC_TEST=m
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
+
+#
+# LED drivers
+#
+CONFIG_LEDS_NET5501=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_ACCESSIBILITY=y
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+# CONFIG_INFINIBAND_IPATH is not set
+# CONFIG_INFINIBAND_QIB is not set
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_ISER=m
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_DS3234=m
+CONFIG_RTC_DRV_PCF2123=m
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_AB8500=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y
+CONFIG_INTEL_IOATDMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_PCI_GENERIC is not set
+CONFIG_UIO_NETX=m
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_CX25821 is not set
+# CONFIG_VIDEO_TM6000 is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+# CONFIG_OTUS is not set
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+# CONFIG_R8187SE is not set
+# CONFIG_RTL8192SU is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_DRM_VMWGFX is not set
+# CONFIG_DRM_NOUVEAU is not set
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_FB_UDL is not set
+CONFIG_HYPERV=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_HYPERV_BLOCK=m
+CONFIG_HYPERV_NET=m
+CONFIG_HYPERV_UTILS=m
+# CONFIG_VME_BUS is not set
+
+#
+# RAR Register Driver
+#
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_IIO is not set
+# CONFIG_RAMZSWAP is not set
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_SAMSUNG_LAPTOP is not set
+# CONFIG_FB_SM7XX is not set
+# CONFIG_DT3155 is not set
+# CONFIG_VIDEO_DT3155 is not set
+# CONFIG_CRYSTALHD is not set
+# CONFIG_CXT1E1 is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
+# CONFIG_ST_BT is not set
+# CONFIG_ADIS16255 is not set
+# CONFIG_FB_XGI is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+# CONFIG_SONYPI_COMPAT is not set
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_ACPI_ASUS=m
+# CONFIG_TOPSTAR_LAPTOP is not set
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+# CONFIG_ISCSI_IBFT_FIND is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT2_FS_XIP=y
+CONFIG_EXT3_FS=m
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_FS_XIP=y
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+# CONFIG_REISERFS_FS_SECURITY is not set
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS_FS=m
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_FSCACHE_HISTOGRAM=y
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=m
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_ECRYPT_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_RUBIN=y
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_XATTR is not set
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_XATTRS is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+# CONFIG_QNX4FS_FS is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_FSCACHE is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+CONFIG_CEPH_FS=m
+# CONFIG_CEPH_FS_PRETTYDEBUG is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_UPCALL is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_EXPERIMENTAL=y
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_MEMORY_INIT is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_LKDTM is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_RING_BUFFER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_STRICT_DEVMEM=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_EARLY_PRINTK is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_OPTIMIZE_INLINING is not set
+
+#
+# Security options
+#
+
+#
+# Grsecurity
+#
+CONFIG_GRKERNSEC=y
+# CONFIG_GRKERNSEC_LOW is not set
+# CONFIG_GRKERNSEC_MEDIUM is not set
+# CONFIG_GRKERNSEC_HIGH is not set
+CONFIG_GRKERNSEC_CUSTOM=y
+
+#
+# Address Space Protection
+#
+CONFIG_GRKERNSEC_KMEM=y
+# CONFIG_GRKERNSEC_IO is not set
+CONFIG_GRKERNSEC_PROC_MEMMAP=y
+# CONFIG_GRKERNSEC_BRUTE is not set
+# CONFIG_GRKERNSEC_MODHARDEN is not set
+# CONFIG_GRKERNSEC_HIDESYM is not set
+
+#
+# Role Based Access Control Options
+#
+# CONFIG_GRKERNSEC_NO_RBAC is not set
+CONFIG_GRKERNSEC_ACL_HIDEKERN=y
+CONFIG_GRKERNSEC_ACL_MAXTRIES=3
+CONFIG_GRKERNSEC_ACL_TIMEOUT=30
+
+#
+# Filesystem Protections
+#
+CONFIG_GRKERNSEC_PROC=y
+# CONFIG_GRKERNSEC_PROC_USER is not set
+CONFIG_GRKERNSEC_PROC_USERGROUP=y
+CONFIG_GRKERNSEC_PROC_GID=30
+CONFIG_GRKERNSEC_PROC_ADD=y
+CONFIG_GRKERNSEC_LINK=y
+CONFIG_GRKERNSEC_FIFO=y
+# CONFIG_GRKERNSEC_ROFS is not set
+CONFIG_GRKERNSEC_CHROOT=y
+CONFIG_GRKERNSEC_CHROOT_MOUNT=y
+CONFIG_GRKERNSEC_CHROOT_DOUBLE=y
+CONFIG_GRKERNSEC_CHROOT_PIVOT=y
+CONFIG_GRKERNSEC_CHROOT_CHDIR=y
+CONFIG_GRKERNSEC_CHROOT_CHMOD=y
+CONFIG_GRKERNSEC_CHROOT_FCHDIR=y
+CONFIG_GRKERNSEC_CHROOT_MKNOD=y
+CONFIG_GRKERNSEC_CHROOT_SHMAT=y
+CONFIG_GRKERNSEC_CHROOT_UNIX=y
+CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
+CONFIG_GRKERNSEC_CHROOT_NICE=y
+CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
+CONFIG_GRKERNSEC_CHROOT_CAPS=y
+
+#
+# Kernel Auditing
+#
+# CONFIG_GRKERNSEC_AUDIT_GROUP is not set
+# CONFIG_GRKERNSEC_EXECLOG is not set
+CONFIG_GRKERNSEC_RESLOG=y
+# CONFIG_GRKERNSEC_CHROOT_EXECLOG is not set
+# CONFIG_GRKERNSEC_AUDIT_PTRACE is not set
+# CONFIG_GRKERNSEC_AUDIT_CHDIR is not set
+# CONFIG_GRKERNSEC_AUDIT_MOUNT is not set
+CONFIG_GRKERNSEC_SIGNAL=y
+CONFIG_GRKERNSEC_FORKFAIL=y
+CONFIG_GRKERNSEC_TIME=y
+CONFIG_GRKERNSEC_PROC_IPADDR=y
+# CONFIG_GRKERNSEC_RWXMAP_LOG is not set
+# CONFIG_GRKERNSEC_AUDIT_TEXTREL is not set
+
+#
+# Executable Protections
+#
+CONFIG_GRKERNSEC_EXECVE=y
+# CONFIG_GRKERNSEC_DMESG is not set
+CONFIG_GRKERNSEC_HARDEN_PTRACE=y
+# CONFIG_GRKERNSEC_TPE is not set
+
+#
+# Network Protections
+#
+CONFIG_GRKERNSEC_RANDNET=y
+# CONFIG_GRKERNSEC_BLACKHOLE is not set
+# CONFIG_GRKERNSEC_SOCKET is not set
+
+#
+# Sysctl support
+#
+CONFIG_GRKERNSEC_SYSCTL=y
+CONFIG_GRKERNSEC_SYSCTL_ON=y
+
+#
+# Logging Options
+#
+CONFIG_GRKERNSEC_FLOODTIME=10
+CONFIG_GRKERNSEC_FLOODBURST=4
+
+#
+# PaX
+#
+CONFIG_PAX_PER_CPU_PGD=y
+CONFIG_TASK_SIZE_MAX_SHIFT=42
+CONFIG_PAX=y
+
+#
+# PaX Control
+#
+CONFIG_PAX_SOFTMODE=y
+# CONFIG_PAX_EI_PAX is not set
+CONFIG_PAX_PT_PAX_FLAGS=y
+# CONFIG_PAX_NO_ACL_FLAGS is not set
+CONFIG_PAX_HAVE_ACL_FLAGS=y
+# CONFIG_PAX_HOOK_ACL_FLAGS is not set
+
+#
+# Non-executable pages
+#
+CONFIG_PAX_NOEXEC=y
+CONFIG_PAX_PAGEEXEC=y
+CONFIG_PAX_EMUTRAMP=y
+CONFIG_PAX_MPROTECT=y
+# CONFIG_PAX_ELFRELOCS is not set
+CONFIG_PAX_KERNEXEC=y
+
+#
+# Address Space Layout Randomization
+#
+CONFIG_PAX_ASLR=y
+CONFIG_PAX_RANDUSTACK=y
+CONFIG_PAX_RANDMMAP=y
+
+#
+# Miscellaneous hardening features
+#
+# CONFIG_PAX_MEMORY_SANITIZE is not set
+# CONFIG_PAX_MEMORY_UDEREF is not set
+CONFIG_PAX_REFCOUNT=y
+# CONFIG_PAX_USERCOPY is not set
+CONFIG_KEYS=y
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+# CONFIG_SECURITY_NETWORK is not set
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_FIPS=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_MANAGER_TESTS is not set
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_AES_X86_64 is not set
+# CONFIG_CRYPTO_AES_NI_INTEL is not set
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+# CONFIG_CRYPTO_SALSA20_X86_64 is not set
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_VHOST_NET=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_NLATTR=y
diff --git a/main/linux-grsec/r8169-add-gro-support.patch b/main/linux-grsec/r8169-add-gro-support.patch
new file mode 100644
index 0000000000..d8ca8d3ad6
--- /dev/null
+++ b/main/linux-grsec/r8169-add-gro-support.patch
@@ -0,0 +1,52 @@
+- Use napi_gro_receive() and vlan_gro_receive()
+- Enable GRO by default
+
+Tested on a RTL8111/8168 adapter
+
+Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
+CC: Francois Romieu <romieu@fr.zoreil.com>
+---
+ drivers/net/r8169.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
+index 56a11e2..ddff42b 100644
+--- a/drivers/net/r8169.c
++++ b/drivers/net/r8169.c
+@@ -1076,7 +1076,12 @@ static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc,
+ 	int ret;
+ 
+ 	if (vlgrp && (opts2 & RxVlanTag)) {
+-		__vlan_hwaccel_rx(skb, vlgrp, swab16(opts2 & 0xffff), polling);
++		u16 vtag = swab16(opts2 & 0xffff);
++
++		if (polling)
++			vlan_gro_receive(&tp->napi, vlgrp, vtag, skb);
++		else
++			__vlan_hwaccel_rx(skb, vlgrp, vtag, polling);
+ 		ret = 0;
+ 	} else
+ 		ret = -1;
+@@ -3186,6 +3191,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+ #ifdef CONFIG_R8169_VLAN
+ 	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+ #endif
++	dev->features |= NETIF_F_GRO;
+ 
+ 	tp->intr_mask = 0xffff;
+ 	tp->align = cfg->align;
+@@ -4561,7 +4567,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
+ 
+ 			if (rtl8169_rx_vlan_skb(tp, desc, skb, polling) < 0) {
+ 				if (likely(polling))
+-					netif_receive_skb(skb);
++					napi_gro_receive(&tp->napi, skb);
+ 				else
+ 					netif_rx(skb);
+ 			}
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe netdev" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/main/linux-grsec/setlocalversion.patch b/main/linux-grsec/setlocalversion.patch
new file mode 100644
index 0000000000..d82eb170ab
--- /dev/null
+++ b/main/linux-grsec/setlocalversion.patch
@@ -0,0 +1,11 @@
+--- ./scripts/setlocalversion.orig
++++ ./scripts/setlocalversion
+@@ -43,7 +43,7 @@
+ 	fi
+ 
+ 	# Check for git and a git repo.
+-	if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
++	if [ -d "$srctree"/.git ] && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
+ 
+ 		# If we are at a tagged commit (like "v2.6.30-rc6"), we ignore
+ 		# it, because this version is defined in the top level Makefile.
diff --git a/main/linux-grsec/xfrm-cache-size-revert.patch b/main/linux-grsec/xfrm-cache-size-revert.patch
deleted file mode 100644
index c8fcbd0d79..0000000000
--- a/main/linux-grsec/xfrm-cache-size-revert.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
-index 74fb2eb..e158860 100644
---- a/net/ipv4/xfrm4_policy.c
-+++ b/net/ipv4/xfrm4_policy.c
-@@ -308,7 +308,6 @@ void __init xfrm4_init(int rt_max_size)
- 	 * That will let us store an ipsec connection per route table entry,
- 	 * and start cleaning when were 1/2 full
- 	 */
--	xfrm4_dst_ops.gc_thresh = rt_max_size/2;
- #ifdef CONFIG_SYSCTL
- 	sysctl_hdr = register_net_sysctl_table(&init_net, net_ipv4_ctl_path,
- 						xfrm4_policy_table);
diff --git a/main/linux-grsec/xfrm-fix-gre-key-endianess.patch b/main/linux-grsec/xfrm-fix-gre-key-endianess.patch
new file mode 100644
index 0000000000..362484a76a
--- /dev/null
+++ b/main/linux-grsec/xfrm-fix-gre-key-endianess.patch
@@ -0,0 +1,43 @@
+From aa285b1740f5b13e5a2606a927f3129954583d78 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Tue, 23 Nov 2010 04:03:45 +0000
+Subject: [PATCH] xfrm: fix gre key endianess
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+fl->fl_gre_key is network byte order contrary to fl->fl_icmp_*.
+Make xfrm_flowi_{s|d}port return network byte order values for gre
+key too.
+
+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ include/net/xfrm.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/net/xfrm.h b/include/net/xfrm.h
+index 54b2832..7fa5b00 100644
+--- a/include/net/xfrm.h
++++ b/include/net/xfrm.h
+@@ -806,7 +806,7 @@ __be16 xfrm_flowi_sport(struct flowi *fl)
+ 		port = htons(fl->fl_mh_type);
+ 		break;
+ 	case IPPROTO_GRE:
+-		port = htonl(fl->fl_gre_key) >> 16;
++		port = htons(ntohl(fl->fl_gre_key) >> 16);
+ 		break;
+ 	default:
+ 		port = 0;	/*XXX*/
+@@ -830,7 +830,7 @@ __be16 xfrm_flowi_dport(struct flowi *fl)
+ 		port = htons(fl->fl_icmp_code);
+ 		break;
+ 	case IPPROTO_GRE:
+-		port = htonl(fl->fl_gre_key) & 0xffff;
++		port = htons(ntohl(fl->fl_gre_key) & 0xffff);
+ 		break;
+ 	default:
+ 		port = 0;	/*XXX*/
+-- 
+1.7.3.2
+
diff --git a/main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch b/main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch
deleted file mode 100644
index 25dc0dcdc2..0000000000
--- a/main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index 31f4ba4..f4ea3a0 100644
---- a/net/xfrm/xfrm_policy.c
-+++ b/net/xfrm/xfrm_policy.c
-@@ -1805,7 +1805,7 @@ restart:
- 			/* EREMOTE tells the caller to generate
- 			 * a one-shot blackhole route. */
- 			dst_release(dst);
--			xfrm_pols_put(pols, num_pols);
-+			xfrm_pols_put(pols, drop_pols);
- 			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES);
- 			return -EREMOTE;
- 		}
-